From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 483C4C27C53 for ; Wed, 5 Jun 2024 12:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nMtsk21kwsKYBuA4DAWn+yjyCAHbAMmkdaoIGGbRS3s=; b=35hNdfNpLVL8th2HhzVCR/jIN4 2mS2vsIo/VA2PAMX/xwY5hYE/HytrKjqjUfrurujbepnXhPigSkW6nugrAo4yq6QTve8VvArYwnf/ deuhx+M7Y6VTuD6/KwxrFgS4V17c+D2fY/RI63rnc66uw8TVN8n/kOhYMgHycDhe2fl4gi/hQDJTC Cy3O6+GtOqaWtBtLt0wiGfm/1CGQj2e+Z3+TWEQeEXl/eBVhFBmvTBmu1c7sLUGC2fHPHR4k1FpN0 TxCFAop5NswejdJWsdXl5j/kr2N83jjSr/0z7KBmjAGULfT7UDvIuVM8gE1u++qtPoHkKwTQ7SMH0 5esqZCUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEpOJ-00000005rc0-2NO1; Wed, 05 Jun 2024 12:05:19 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEpOD-00000005rYB-1yvU for linux-nvme@lists.infradead.org; Wed, 05 Jun 2024 12:05:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 98E7BCE1764; Wed, 5 Jun 2024 12:05:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC0BBC3277B; Wed, 5 Jun 2024 12:05:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717589110; bh=1RbxT/6OSTDCO1lrHIY3cQWVCBAg91gJZtNuWLxq+Lg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUHN7vbwEFuKf6tNBBko4yWH1H0+PpdN1QsivhfTDoxVm6wbW1Xqg5o3vuyd6GPk4 zII0JXKvyswJXsrwrGBwwlyxobJ3cMkWzECIkLtfbwF+kggE2k6apUIC9Vtpa742fE D0rADZjYuAluI495+QrockfjIjeqgFqfbPaV1odWqax8a1orKHIfbx6tmcAa9PV+vd +AlCdhISaqceQh9WDZkKsMLix1VkRrU5DnA/QVW1zbvlFjjW21+4VhdThkA9KRHiW1 0UfZyquT2XeAFY+utcMeMlqrxFA1indcSORhiYVZxTZ+5Z3A8LyGcyPJ8IjsxDriAb jGCTAWjXi6Y2A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sagi Grimberg , Alex Turin , Christoph Hellwig , Keith Busch , Sasha Levin , kch@nvidia.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 09/14] nvmet: fix a possible leak when destroy a ctrl during qp establishment Date: Wed, 5 Jun 2024 08:04:42 -0400 Message-ID: <20240605120455.2967445-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120455.2967445-1-sashal@kernel.org> References: <20240605120455.2967445-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.92 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240605_050513_838117_37C6266C X-CRM114-Status: GOOD ( 15.15 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Sagi Grimberg [ Upstream commit c758b77d4a0a0ed3a1292b3fd7a2aeccd1a169a4 ] In nvmet_sq_destroy we capture sq->ctrl early and if it is non-NULL we know that a ctrl was allocated (in the admin connect request handler) and we need to release pending AERs, clear ctrl->sqs and sq->ctrl (for nvme-loop primarily), and drop the final reference on the ctrl. However, a small window is possible where nvmet_sq_destroy starts (as a result of the client giving up and disconnecting) concurrently with the nvme admin connect cmd (which may be in an early stage). But *before* kill_and_confirm of sq->ref (i.e. the admin connect managed to get an sq live reference). In this case, sq->ctrl was allocated however after it was captured in a local variable in nvmet_sq_destroy. This prevented the final reference drop on the ctrl. Solve this by re-capturing the sq->ctrl after all inflight request has completed, where for sure sq->ctrl reference is final, and move forward based on that. This issue was observed in an environment with many hosts connecting multiple ctrls simoutanuosly, creating a delay in allocating a ctrl leading up to this race window. Reported-by: Alex Turin Signed-off-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/target/core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index 3235baf7cc6b1..c7c8dedf1f47b 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -802,6 +802,15 @@ void nvmet_sq_destroy(struct nvmet_sq *sq) percpu_ref_exit(&sq->ref); nvmet_auth_sq_free(sq); + /* + * we must reference the ctrl again after waiting for inflight IO + * to complete. Because admin connect may have sneaked in after we + * store sq->ctrl locally, but before we killed the percpu_ref. the + * admin connect allocates and assigns sq->ctrl, which now needs a + * final ref put, as this ctrl is going away. + */ + ctrl = sq->ctrl; + if (ctrl) { /* * The teardown flow may take some time, and the host may not -- 2.43.0