From patchwork Mon Aug 9 14:29:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 493876 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp2977217jap; Mon, 9 Aug 2021 07:38:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdk95YLNidpTJBi5mOKEfAyWm2x1YScOOg5ScDonB0z3M7E+v9znWmW0dugVuwwfhSOANg X-Received: by 2002:a05:6e02:128a:: with SMTP id y10mr94600ilq.161.1628519886140; 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=i1znvjNSx70TqjrCD1b+P0Majn+8IxZ0PYZn3y6d9WAfgjusz6lMEnHA5EWTWDuE6U rNnNbB2UClgLlKmMnEjuGseJ/ZBze6tmpi7KRURr3lNfTZuia0ZziKHSJRwbLkkcCxCO sX3DGuC9PAGza4cJ6j8i5kBkcuMRimYCeik/V21rV7/NGFzZejDXpmmUlifIUFqnZCeR vhaqcoebAeYBKqMa2s6EwLJfHjKvD8IzIXAfLEtF28fVFEympQD7d+RVU7TfcFt1+Jtw +ZAcV7YZoNkUOLLnElA+eCMGWdR3YNpx7FXsbm9dkWL9ufNO9brAQR9SBB8XvhOSaWd6 3nfA== 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=ygdyXnVi6i0z3TdW1kqtPHMeZvbfXMCghhmfEAOhEx4=; b=qgail3BaomTCrhPr/MHuQucCc6qwVxy84FOl70+074f/PP8eDc99QDCFdQfQn3pm1b uOpUGkFSIPZP234PednQgx7vy8IKaerWIcsQro2hl4A7reQWpZ21Bo+Dqqylws0/4Qlr gN+EUf5RPUJXNVw7LKm7er3+3YciHu/9Qd7SzXZ6qXIo7gqL8oLXZWs2cPEpkftQ2aIC 6z3qKp/m3deG9p/UV8aIJLoj11L8CUNvyXT94CvXYKzndInRPMjTJMuUB5+9+EgXAMli TnHqv7Y1FCYROs+qKPwsRXjKkYl5GYmOzSsdNaC6JkBcQ1JK2Uk4X0hFMnxvRLoSjNoC G43A== 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 S235505AbhHIOiP (ORCPT ); Mon, 9 Aug 2021 10:38:15 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3612 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234244AbhHIOgR (ORCPT ); Mon, 9 Aug 2021 10:36:17 -0400 Received: from fraeml715-chm.china.huawei.com (unknown [172.18.147.206]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Gjz9c6gdbz6CB0L; Mon, 9 Aug 2021 22:34:12 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml715-chm.china.huawei.com (10.206.15.34) 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:42 +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:39 +0100 From: John Garry To: , , CC: , , , , , , John Garry Subject: [PATCH v2 06/11] blk-mq: Pass driver tags to blk_mq_clear_rq_mapping() Date: Mon, 9 Aug 2021 22:29:33 +0800 Message-ID: <1628519378-211232-7-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 Function blk_mq_clear_rq_mapping() will be used for shared sbitmap tags in future, so pass a driver tags pointer instead of the tagset container and HW queue index. Signed-off-by: John Garry --- block/blk-mq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.26.2 Reported-by: kernel test robot Reported-by: kernel test robot diff --git a/block/blk-mq.c b/block/blk-mq.c index 42c4b8d1a570..0bb596f4d061 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2310,10 +2310,9 @@ static size_t order_to_size(unsigned int order) } /* called before freeing request pool in @tags */ -static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set, - struct blk_mq_tags *tags, unsigned int hctx_idx) +void blk_mq_clear_rq_mapping(struct blk_mq_tags *drv_tags, + struct blk_mq_tags *tags) { - struct blk_mq_tags *drv_tags = set->tags[hctx_idx]; struct page *page; unsigned long flags; @@ -2322,7 +2321,7 @@ static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set, unsigned long end = start + order_to_size(page->private); int i; - for (i = 0; i < set->queue_depth; i++) { + for (i = 0; i < drv_tags->nr_tags; i++) { struct request *rq = drv_tags->rqs[i]; unsigned long rq_addr = (unsigned long)rq; @@ -2346,8 +2345,11 @@ static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set, void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, unsigned int hctx_idx) { + struct blk_mq_tags *drv_tags; struct page *page; + drv_tags = set->tags[hctx_idx]; + if (tags->static_rqs && set->ops->exit_request) { int i; @@ -2361,7 +2363,7 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, } } - blk_mq_clear_rq_mapping(set, tags, hctx_idx); + blk_mq_clear_rq_mapping(drv_tags, tags); while (!list_empty(&tags->page_list)) { page = list_first_entry(&tags->page_list, struct page, lru);