From patchwork Fri Oct 10 18:27:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 5066741 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5110AC11AC for ; Fri, 10 Oct 2014 18:27:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F3EA20212 for ; Fri, 10 Oct 2014 18:27:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD31E2018E for ; Fri, 10 Oct 2014 18:27:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751819AbaJJS1T (ORCPT ); Fri, 10 Oct 2014 14:27:19 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:50417 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbaJJS1S (ORCPT ); Fri, 10 Oct 2014 14:27:18 -0400 Received: by mail-la0-f49.google.com with SMTP id q1so3778645lam.22 for ; Fri, 10 Oct 2014 11:27:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZW7QYu/kpOv8RSSENNaoWNiDXwSnI1sQ73kB9VOArp4=; b=S6CItlueZuE4S4+0SRpc4n9dvXjbdLz1oMR08ZP5Otb9dQcC24pz749V3uDxl1hTNG DqVNlY9Hnk5ZFXvcFbblDXd2CfG1BkW2Sh8GhHQb1pyAkQNq/WBIRBif1vSBfwycBtcG GHR5TlqIrGZSm4uf+OTDjHIQBR0nN6bb/68u+RSUhPr20BYKkYPonX+BOq4dVH75ToqV GDqy7U8kQYaUPg+HgRYjHdBN9vJTWaOCJJtjwldqd9kyaGQ8mxmOKmFtL/mNy18Qcijv kCw1SmnG45KEPafvnnCuug/C0G+zIz8Qda87nE9kgnSFbcQvq9opZ6Ggf6+6OR/C7eNU 5JEA== X-Gm-Message-State: ALoCoQk2ege/3AOHfa1yiOq6noQYhssvckci63XqGw96NzXxtels00xkccRrY3kTdM5llcduzu8e X-Received: by 10.152.8.194 with SMTP id t2mr6721243laa.85.1412965637177; Fri, 10 Oct 2014 11:27:17 -0700 (PDT) Received: from localhost ([109.110.67.138]) by mx.google.com with ESMTPSA id w2sm2024166lad.30.2014.10.10.11.27.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 10 Oct 2014 11:27:16 -0700 (PDT) From: Ilya Dryomov X-Google-Original-From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Micha Krause Subject: [PATCH 1/3] libceph: ceph-msgr workqueue needs a resque worker Date: Fri, 10 Oct 2014 22:27:04 +0400 Message-Id: <1412965626-11165-2-git-send-email-idryomov@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1412965626-11165-1-git-send-email-idryomov@redhat.com> References: <1412965626-11165-1-git-send-email-idryomov@redhat.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: Micha Krause Reviewed-by: Sage Weil --- 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 9764c771cfb1..559c9f619c20 100644 --- 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;