From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96792238D57; Tue, 22 Jul 2025 13:50:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753192226; cv=none; b=tcipr7qEAFlA0/Vs3gX4AGO069C/yp+zNr0gKzQgFDj0xGMc3FXXwpzYdtEABbC7D7wPbfhJhT8y5ARTvBwOYIAD8SK6sDb/YxKZhj0J2rUElRs6ZKxJwlKYNL1BSxWo0hleJkG+nKepv6ijf/WbFkaAj5oMBnbuUw+3MHcj4hg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753192226; c=relaxed/simple; bh=jqZrRbUfK0AJo7kx2QXcBYR0JdUSvhIQ/AoWQAwa3Kg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sVXXGKnaiuLBx+rUbfVKZ4QKvf9viQnf6TC+HMMTn6S9ilXd8FPcZirpe06km7naAdbuZRHlQMZW7pBewzlCyb54DVZNK9HVOxycOwkMazkaopk8QB35a26NMQmNinT3HXhQX2MapMh5gZicWP4JXe16qELn0424b5boe81xYAo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cghMRLPw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cghMRLPw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06B51C4CEEB; Tue, 22 Jul 2025 13:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1753192226; bh=jqZrRbUfK0AJo7kx2QXcBYR0JdUSvhIQ/AoWQAwa3Kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cghMRLPws+beUcEt77OXYBZTN3z9tDEOtevsbxuEs8Qt6coKOxbs8aNfBxil3+xOM GPzqtbgypwbdwidG6+Cib2TfiY9/X/v8xkGxnpoBfAnMErmxAZ/wmi8ZOc4FQBfeWb SeJYkCfMjIg+MAb/0SEgEPVaK+JgeDA2UZf0HyCs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yi Zhang , Yu Kuai , Christoph Hellwig , Sasha Levin Subject: [PATCH 6.1 48/79] nvme: fix misaccounting of nvme-mpath inflight I/O Date: Tue, 22 Jul 2025 15:44:44 +0200 Message-ID: <20250722134330.145804366@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250722134328.384139905@linuxfoundation.org> References: <20250722134328.384139905@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yu Kuai [ Upstream commit 71257925e83eae1cb6913d65ca71927d2220e6d1 ] Procedures for nvme-mpath IO accounting: 1) initialize nvme_request and clear flags; 2) set NVME_MPATH_IO_STATS and increase inflight counter when IO started; 3) check NVME_MPATH_IO_STATS and decrease inflight counter when IO is done; However, for the case nvme_fail_nonready_command(), both step 1) and 2) are skipped, and if old nvme_request set NVME_MPATH_IO_STATS and then request is reused, step 3) will still be executed, causing inflight I/O counter to be negative. Fix the problem by clearing nvme_request in nvme_fail_nonready_command(). Fixes: ea5e5f42cd2c ("nvme-fabrics: avoid double completions in nvmf_fail_nonready_command") Reported-by: Yi Zhang Closes: https://lore.kernel.org/all/CAHj4cs_+dauobyYyP805t33WMJVzOWj=7+51p4_j9rA63D9sog@mail.gmail.com/ Signed-off-by: Yu Kuai Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index fbe3fb4fbe95f..7d3759f875b23 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -706,6 +706,10 @@ blk_status_t nvme_fail_nonready_command(struct nvme_ctrl *ctrl, !test_bit(NVME_CTRL_FAILFAST_EXPIRED, &ctrl->flags) && !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH)) return BLK_STS_RESOURCE; + + if (!(rq->rq_flags & RQF_DONTPREP)) + nvme_clear_nvme_request(rq); + return nvme_host_path_error(rq); } EXPORT_SYMBOL_GPL(nvme_fail_nonready_command); -- 2.39.5