libceph: ceph-msgr workqueue needs a resque worker
authorIlya Dryomov <idryomov@redhat.com>
Fri, 10 Oct 2014 12:39:05 +0000 (16:39 +0400)
committerSage Weil <sage@redhat.com>
Tue, 14 Oct 2014 19:57:04 +0000 (12:57 -0700)
Commit f363e45fd118 ("net/ceph: make ceph_msgr_wq non-reentrant")
effectively removed WQ_MEM_RECLAIM flag from ceph_msgr_wq.  This is
wrong - libceph is very much a memory reclaim path, so restore it.

Cc: stable@vger.kernel.org # needs backporting for < 3.12
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Tested-by: Micha Krause <micha@krausam.de>
Reviewed-by: Sage Weil <sage@redhat.com>
net/ceph/messenger.c

index 9764c771cfb16a50b92e35a8e1ccdfa3ade5a27d..559c9f619c2027e33f733469b2a8a59eda582f89 100644 (file)
@@ -292,7 +292,11 @@ int ceph_msgr_init(void)
        if (ceph_msgr_slab_init())
                return -ENOMEM;
 
-       ceph_msgr_wq = alloc_workqueue("ceph-msgr", 0, 0);
+       /*
+        * The number of active work items is limited by the number of
+        * connections, so leave @max_active at default.
+        */
+       ceph_msgr_wq = alloc_workqueue("ceph-msgr", WQ_MEM_RECLAIM, 0);
        if (ceph_msgr_wq)
                return 0;