lkml.org 
[lkml]   [2014]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 095/105] libceph: ceph-msgr workqueue needs a resque worker
    Date
    3.13.11.10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    net/ceph/messenger.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
    index 94e21b9..057017b 100644
    --- a/net/ceph/messenger.c
    +++ b/net/ceph/messenger.c
    @@ -290,7 +290,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;

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-27 20:41    [W:3.333 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site