From patchwork Mon Aug 9 14:29:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 493869 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:396:0:0:0:0 with SMTP id y22csp2977144jap; Mon, 9 Aug 2021 07:38:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiFdTos4LFO7ouLo9kaRuDZcmY7MT8ST9JdaLtLhtJx1Knr0O15NWLje/amUb8G7IvhOvv X-Received: by 2002:a02:698f:: with SMTP id e137mr23283716jac.89.1628519882238; Mon, 09 Aug 2021 07:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628519882; cv=none; d=google.com; s=arc-20160816; b=OsX+g47PuPRBcPLiVrnOIHtSNpeen1WxPb49DHrQM1R+sl4i9dowY15FgHpiRj3I87 pFQdl+mgBt/8FI1w4J0Oh3nxLUMFPK+mWENlc91tNjOWWTcy/9dWk2ANl9189t+ajCKd Qljm+xYRujCwaDMJ03fpr6NP/Jmu4hVp/IXMk9eDQzNOpN9pN6JzRiBkv/43P3s0t7yd WCJ0qsWOsEqKc6GuG/8YGGlnD3CmEZoYdBrf79GyV5EmfwSC2ktgw8MklRxXRlwCxpb4 Gp7bI3bA4X3u4WZJcZbjm9iozDKEpstpmsZ3aMEfzsyFVXCDHO7TzhIeKx5VO7gseumq mr6A== 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=FSzGJZCsm7n+Gs9oOY6e8+pqiQ5+3tUXczEltde/ZOw=; b=0EYWOIEqx75Jf5pIK6jcc2hBbMPDPBIyeON+gxXpQcDIMbjXoCIP7T7cIejj59j1C8 3KTjlxzyODk/cyf84Wm4zIXKqU7GDI0U/2UrixUr5PRWgEsiBGT51IGZb2LEeki5RDRT DmnEaY/k0jKrJUDpyoddvtpqcdsm2Vw+9Dxl+4Tpc8AIdC8WpcSkwbK5pi9It5P/5J7I 7AMbQ6bK12LmqG8RbH/dKGWt1Gy9CufgTkv3k+vaNQg8oEx3swydBZlSVd8g0o9+UzVz C1GrpB8O98Q3XC+IRvC10361r/zzx8ZjgzphxF0HBhsZhR2el7Rm4e6B5EIpOjfZVxw8 ozkw== 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.02 for ; Mon, 09 Aug 2021 07:38:02 -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 S235365AbhHIOhh (ORCPT ); Mon, 9 Aug 2021 10:37:37 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3607 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235249AbhHIOfA (ORCPT ); Mon, 9 Aug 2021 10:35:00 -0400 Received: from fraeml737-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Gjz9L3kDjz6C9Mp; Mon, 9 Aug 2021 22:33:58 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml737-chm.china.huawei.com (10.206.15.218) 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:27 +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:24 +0100 From: John Garry To: , , CC: , , , , , , John Garry Subject: [PATCH v2 01/11] blk-mq: Change rqs check in blk_mq_free_rqs() Date: Mon, 9 Aug 2021 22:29:28 +0800 Message-ID: <1628519378-211232-2-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 The original code in commit 24d2f90309b23 ("blk-mq: split out tag initialization, support shared tags") would check tags->rqs is non-NULL and then dereference tags->rqs[]. Then in commit 2af8cbe30531 ("blk-mq: split tag ->rqs[] into two"), we started to dereference tags->static_rqs[], but continued to check non-NULL tags->rqs. Check tags->static_rqs as non-NULL instead, which is more logical. Signed-off-by: John Garry Reviewed-by: Ming Lei --- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.2 diff --git a/block/blk-mq.c b/block/blk-mq.c index 2c4ac51e54eb..ae28f470893c 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2348,7 +2348,7 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, { struct page *page; - if (tags->rqs && set->ops->exit_request) { + if (tags->static_rqs && set->ops->exit_request) { int i; for (i = 0; i < tags->nr_tags; i++) {