From patchwork Mon Aug 9 14:29:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 493878 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp2977221jap; Mon, 9 Aug 2021 07:38:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3JRO7h6/2NKfMYBrV/V2WCHzrZ3U1wxtGeZT8oaRWwKnIKIQRsxseuOeFMwEBQUrb1eaG X-Received: by 2002:a02:698f:: with SMTP id e137mr23284009jac.89.1628519886597; Mon, 09 Aug 2021 07:38:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628519886; cv=none; d=google.com; s=arc-20160816; b=cc86E1zfSnyRyRQF7EEJ854zKKgGSRQAtppQS9a8M2qAr0kYQcHM1tMyM1IL4V6PYv RM2wVmziRKC712EEMpsPb2QgFOveUSkWxx0H6LtqgH9mZhAauQgL3s6ZCWosfNYvHo4m qaMvEnxEbz47paOCRUz4k1g1I6kFmDz2kK0SyDUqiM0UsIpobYYE0xTFFZhB77BMpMf+ cZMjZEDZhBAhsqF19bYe6sW2NDvk3ELJvgu2+u6/tNjLyHVIteRhUgIPErYrIAH0ipMk qASe9UL+N2dBVx7/UK5tLK5Fry1KSEL3Zg3qqOfwSD8P4tMIKpqj6QarZ4Ovg3baDSpX yG5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=RrjcEoxElDaNt5R4V024lIwoW/BIqtb62oYpDGbFLh4=; b=ArT1o/9VXbr3RMdx5Yy/fC5l4IVwx3GNlVTcSd+HnHDLGfd8xKY6krWw2P6ptOSAr8 cjc8Gwf7wZZRKtmCaWirdO0yVK+/e2ZZatHmZuN6E9Cd3oYIhW+5yOeNYbrR78+t/YDL LRk1l0CJR/SvI3RxwuxddXp6ZQDhUGRHJCn3WhZzKnaLPs5aTBkw5RHw9bIkx7RKRB56 OJ6JPH9knTN3PJFhy00qSLxxdRD+SOflZRm1K35tkWinVKHnLM+7TFul/JSgNEpxF7b3 QU+KebmCenqtsTkOfV8g0g0muYttdpvPShL9V+hXOKY+ezE6aKK13J2P6qVjmHRghtvi 6ojQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si21191782iov.104.2021.08.09.07.38.06 for ; Mon, 09 Aug 2021 07:38:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235536AbhHIOiQ (ORCPT ); Mon, 9 Aug 2021 10:38:16 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3613 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234378AbhHIOgR (ORCPT ); Mon, 9 Aug 2021 10:36:17 -0400 Received: from fraeml710-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Gjz9k06cVz6D9Ll; Mon, 9 Aug 2021 22:34:18 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml710-chm.china.huawei.com (10.206.15.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Mon, 9 Aug 2021 16:34:45 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 15:34:42 +0100 From: John Garry To: , , CC: , , , , , , John Garry Subject: [PATCH v2 07/11] blk-mq: Add blk_mq_tag_update_sched_shared_sbitmap() Date: Mon, 9 Aug 2021 22:29:34 +0800 Message-ID: <1628519378-211232-8-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1628519378-211232-1-git-send-email-john.garry@huawei.com> References: <1628519378-211232-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Put the functionality to update the sched shared sbitmap size in a common function. Since the same formula is always used to resize, and it can be got from the request queue argument, so just pass the request queue pointer. Signed-off-by: John Garry --- block/blk-mq-sched.c | 3 +-- block/blk-mq-tag.c | 6 ++++++ block/blk-mq-tag.h | 1 + block/blk-mq.c | 3 +-- 4 files changed, 9 insertions(+), 4 deletions(-) -- 2.26.2 Reviewed-by: Ming Lei diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index b4d7ad9a7a60..ac0408ebcd47 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -575,8 +575,7 @@ static int blk_mq_init_sched_shared_sbitmap(struct request_queue *queue) &queue->sched_breserved_tags; } - sbitmap_queue_resize(&queue->sched_bitmap_tags, - queue->nr_requests - set->reserved_tags); + blk_mq_tag_update_sched_shared_sbitmap(queue); return 0; } diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 86f87346232a..5f06ad6efc8f 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -634,6 +634,12 @@ void blk_mq_tag_resize_shared_sbitmap(struct blk_mq_tag_set *set, unsigned int s sbitmap_queue_resize(&set->__bitmap_tags, size - set->reserved_tags); } +void blk_mq_tag_update_sched_shared_sbitmap(struct request_queue *q) +{ + sbitmap_queue_resize(&q->sched_bitmap_tags, + q->nr_requests - q->tag_set->reserved_tags); +} + /** * blk_mq_unique_tag() - return a tag that is unique queue-wide * @rq: request for which to compute a unique tag diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h index 8ed55af08427..88f3c6485543 100644 --- a/block/blk-mq-tag.h +++ b/block/blk-mq-tag.h @@ -48,6 +48,7 @@ extern int blk_mq_tag_update_depth(struct blk_mq_hw_ctx *hctx, unsigned int depth, bool can_grow); extern void blk_mq_tag_resize_shared_sbitmap(struct blk_mq_tag_set *set, unsigned int size); +extern void blk_mq_tag_update_sched_shared_sbitmap(struct request_queue *q); extern void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool); void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn, diff --git a/block/blk-mq.c b/block/blk-mq.c index 0bb596f4d061..f14cc2705f9b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -3645,8 +3645,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr) q->nr_requests = nr; if (blk_mq_is_sbitmap_shared(set->flags)) { if (q->elevator) - sbitmap_queue_resize(&q->sched_bitmap_tags, - nr - set->reserved_tags); + blk_mq_tag_update_sched_shared_sbitmap(q); else blk_mq_tag_resize_shared_sbitmap(set, nr); }