From patchwork Fri Mar 31 20:48:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9657289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 81277601D2 for ; Fri, 31 Mar 2017 20:49:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72B4728709 for ; Fri, 31 Mar 2017 20:49:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66BB12870D; Fri, 31 Mar 2017 20:49:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD04028709 for ; Fri, 31 Mar 2017 20:49:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541AbdCaUtg (ORCPT ); Fri, 31 Mar 2017 16:49:36 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:33932 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753430AbdCaUtf (ORCPT ); Fri, 31 Mar 2017 16:49:35 -0400 Received: by mail-pg0-f41.google.com with SMTP id 21so81405370pgg.1 for ; Fri, 31 Mar 2017 13:49:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E6mSH+2Ia+7G2GVPsUwMmjV90CHlmZu+fIELyUl/HfU=; b=OcfSThRoh2j7qs5qUpXclBcVTgfto4esAKSmUMvobYNTvuprs7T3lqWjz8el1tNrW0 l2YTQpQnF9yAa8E4iaKneehMVi0v4Ck2NShYg6LaseGmL3i/xNXsJRkyme1+LnQ1LZLm bwxSLiQZK045Ec8//l1UZDPBCwC/ffe8J5hOW71BOLt4+UgSmZkDbTsLkes957gE8QhL L+WxLnRaW2BiNctTnDfqfzkbSWgTQzthF1Vujmd9VBGsnN/4TwKVaOG2D3RTjPlz5WG5 Is/W1129+uY2zieJTRRbjsCfmBJfJvS/IlKWpnjlldtv3abaC7sCr2TdWTKQNjlN0kxN +lHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E6mSH+2Ia+7G2GVPsUwMmjV90CHlmZu+fIELyUl/HfU=; b=Pc5dqzhRfm4QxRxCbqXUXol3LVAilat6TjuMaEH5kzOzvvm3BkLyNOnOtXKejDE4an do0mvcmdmeLEMrHJCcsuOYZRNjzgLkJftsauuM1ngohS6lX86TB2yqO0n7KRMdpn9Wzx yHFGZLvLwcCqh+MaTcZ918xZV/Ja7wyNGdW/I6AGdBKEMzzdnQZNQPWXvEGgKopF9R55 htGH44C22+AC7JQn9wfX62n3zidS6S9G/e40GaOlWdyMUkKvvn+BUFIbOxgYtZcbBuAT HA09pebzY5aMU9eWhljWsEaXmTmH21HgiOWzeq8zW7qcQN9VgQOyVCpX7mTSDdgbVwVH dqkA== X-Gm-Message-State: AFeK/H1Wn+SCEvoi4XY5cPuH6DJCQApHbU8Wih9djzgPkUUvdmU0oFBj06uYZRQLGmwtk5xI X-Received: by 10.98.87.216 with SMTP id i85mr4552005pfj.151.1490993375125; Fri, 31 Mar 2017 13:49:35 -0700 (PDT) Received: from localhost.localdomain ([2601:602:8801:8110:e6a7:a0ff:fe0b:c9a8]) by smtp.gmail.com with ESMTPSA id u198sm12194366pgb.45.2017.03.31.13.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 13:49:34 -0700 (PDT) From: Omar Sandoval To: Jens Axboe , linux-block@vger.kernel.org Cc: Christoph Hellwig , Keith Busch , Josef Bacik , kernel-team@fb.com Subject: [PATCH v3] blk-mq: remap queues when adding/removing hardware queues Date: Fri, 31 Mar 2017 13:48:35 -0700 Message-Id: <9753ebd0c51a9d49f110a6d0d00888170905d97a.1490993257.git.osandov@fb.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170331204603.GB11462@vader> References: <20170331204603.GB11462@vader> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval blk_mq_update_nr_hw_queues() used to remap hardware queues, which is the behavior that drivers expect. However, commit 4e68a011428a changed blk_mq_queue_reinit() to not remap queues for the case of CPU hotplugging, inadvertently making blk_mq_update_nr_hw_queues() not remap queues as well. This breaks, for example, NBD's multi-connection mode, leaving the added hardware queues unused. Fix it by making blk_mq_update_nr_hw_queues() explicitly remap the queues. Fixes: 4e68a011428a ("blk-mq: don't redistribute hardware queues on a CPU hotplug event") Signed-off-by: Omar Sandoval Reviewed-by: Keith Busch Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg --- block/blk-mq.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 061fc2cc88d3..dbc0f2f745e3 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2478,6 +2478,14 @@ static int blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) return 0; } +static int blk_mq_update_queue_map(struct blk_mq_tag_set *set) +{ + if (set->ops->map_queues) + return set->ops->map_queues(set); + else + return blk_mq_map_queues(set); +} + /* * Alloc a tag set to be associated with one or more request queues. * May fail with EINVAL for various error conditions. May adjust the @@ -2532,10 +2540,7 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set) if (!set->mq_map) goto out_free_tags; - if (set->ops->map_queues) - ret = set->ops->map_queues(set); - else - ret = blk_mq_map_queues(set); + ret = blk_mq_update_queue_map(set); if (ret) goto out_free_mq_map; @@ -2627,6 +2632,7 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues) blk_mq_freeze_queue(q); set->nr_hw_queues = nr_hw_queues; + blk_mq_update_queue_map(set); list_for_each_entry(q, &set->tag_list, tag_set_list) { blk_mq_realloc_hw_ctxs(set, q); blk_mq_queue_reinit(q, cpu_online_mask);