| From f9865f06f7f18c6661c88d0511f05c48612319cc Mon Sep 17 00:00:00 2001 |
| From: Ilya Dryomov <idryomov@redhat.com> |
| Date: Fri, 10 Oct 2014 16:39:05 +0400 |
| Subject: libceph: ceph-msgr workqueue needs a resque worker |
| |
| From: Ilya Dryomov <idryomov@redhat.com> |
| |
| commit f9865f06f7f18c6661c88d0511f05c48612319cc upstream. |
| |
| 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. |
| |
| Signed-off-by: Ilya Dryomov <idryomov@redhat.com> |
| Tested-by: Micha Krause <micha@krausam.de> |
| Reviewed-by: Sage Weil <sage@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/ceph/messenger.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/net/ceph/messenger.c |
| +++ b/net/ceph/messenger.c |
| @@ -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; |
| |
