Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4251150pxv; Tue, 27 Jul 2021 02:39:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQaCA6QC1VT2lhZgYPJQhRAxGk/r3BFzGOBepni+w8Jc5G7RPUm8qPNV2Kn4ug0ySKpFJo X-Received: by 2002:a05:6638:1490:: with SMTP id j16mr20645237jak.27.1627378751476; Tue, 27 Jul 2021 02:39:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627378751; cv=none; d=google.com; s=arc-20160816; b=KU5F1qez1Vmr0jA3rwc5pjXHJz+bY1PqFP48SwbyoL0UG5NtsBrz2gepH0O+VPNrfP o2Pm9G3jSmoZmRd0X8az+s73dgySBTug4LmD9c39ZwhUosCRMQsvvhDLPa5yzTjeE6JF 3ELAYB1UcLmIQRutLxWLQ1mnvpYiExJJKPxZqZf041m0lNbRohAKgad1au3OERzFh2K5 0T2idP7Trnx3cOTHQcy8Y2aawxeqpx1CM4YKrGE4laReaMjRv1S1qnQtDbvoADsYZJhX 8J33G2vcq0X9XrUtAcvYJ3zc40V8o2+ZlCyULcKFf+q3nRdBvBaAXDUMvTvnPq8WtJXj xoWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=pFtkHIfftepAuCWl5JbNCR1Oa5m9VYLlha+Onm2YnYw=; b=mAiOgq+YYIkFhXUSE6YwtGsfwIAC6W5jb3RfC10ojlfACeznQA+FFyH3iQz0zTYaS+ 58lWLus7XsFfvwveDBT9cFJpuW7K9/1MmYvAIKdQChWLARVHIHC/+W8bBq8m2N/OtJcV gtlVzEIrb1/k/1clq6FICtbLsiRCPiRRQUq83MEdUim0rWgP0kX1rDrTDINt7Ujr+c34 y7ql5r7DVOBQSCk18zKSt5rB+TEWVoCSmVr68vYXQ8zlHqzCxd+OQENtT1HZf07dOOgv fRRwWRgUKO6OPAdIqvyactadB9QDH7bgR/gGfqjn+l4BpVmZ51IiS6Lo7Na3vqUgXnOP AwjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 x6si2558006ilj.25.2021.07.27.02.38.59; Tue, 27 Jul 2021 02:39:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S236054AbhG0Jhj (ORCPT + 99 others); Tue, 27 Jul 2021 05:37:39 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3498 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235970AbhG0Jhi (ORCPT ); Tue, 27 Jul 2021 05:37:38 -0400 Received: from fraeml712-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GYrxm1wx6z6L9ks; Tue, 27 Jul 2021 17:25:48 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml712-chm.china.huawei.com (10.206.15.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 27 Jul 2021 11:37:37 +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; Tue, 27 Jul 2021 10:37:35 +0100 From: John Garry To: CC: , , , , John Garry Subject: [PATCH] blk-mq-sched: Fix blk_mq_sched_alloc_tags() error handling Date: Tue, 27 Jul 2021 17:32:53 +0800 Message-ID: <1627378373-148090-1-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 MIME-Version: 1.0 Content-Type: text/plain 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-kernel@vger.kernel.org If the blk_mq_sched_alloc_tags() -> blk_mq_alloc_rqs() call fails, then we call blk_mq_sched_free_tags() -> blk_mq_free_rqs(). It is incorrect to do so, as any rqs would have already been freed in the blk_mq_alloc_rqs() call. Fix by calling blk_mq_free_rq_map() only directly. Fixes: 6917ff0b5bd41 ("blk-mq-sched: refactor scheduler initialization") Signed-off-by: John Garry diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index c838d81ac058..0f006cabfd91 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -515,17 +515,6 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx, percpu_ref_put(&q->q_usage_counter); } -static void blk_mq_sched_free_tags(struct blk_mq_tag_set *set, - struct blk_mq_hw_ctx *hctx, - unsigned int hctx_idx) -{ - if (hctx->sched_tags) { - blk_mq_free_rqs(set, hctx->sched_tags, hctx_idx); - blk_mq_free_rq_map(hctx->sched_tags, set->flags); - hctx->sched_tags = NULL; - } -} - static int blk_mq_sched_alloc_tags(struct request_queue *q, struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx) @@ -539,8 +528,10 @@ static int blk_mq_sched_alloc_tags(struct request_queue *q, return -ENOMEM; ret = blk_mq_alloc_rqs(set, hctx->sched_tags, hctx_idx, q->nr_requests); - if (ret) - blk_mq_sched_free_tags(set, hctx, hctx_idx); + if (ret) { + blk_mq_free_rq_map(hctx->sched_tags, set->flags); + hctx->sched_tags = NULL; + } return ret; } -- 2.26.2