Received: by 2002:ab2:6d45:0:b0:1fb:d597:ff75 with SMTP id d5csp266386lqr; Wed, 5 Jun 2024 05:42:01 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVZjm8gmBbD7VrkrHn2ftrvOOXnPXVvQsMR4QDubg5JxRPqoxvE+uwDyGzC19upid14CDE+VyqpBNRHlqPDmRDXxfPk7ab0iniLs1CCtA== X-Google-Smtp-Source: AGHT+IFw+MCaED8VVi5WWZxAi1QJwuYrURlPa4IoIOJBDmGqFdUZ+/jataqTQzl+xzgomypczoDh X-Received: by 2002:a37:e112:0:b0:795:238f:7816 with SMTP id af79cd13be357-795240e2bd1mr237356785a.74.1717591320787; Wed, 05 Jun 2024 05:42:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717591320; cv=pass; d=google.com; s=arc-20160816; b=qzJZhfgOYrBbuTyLSb2hzu9fSHiztZeOvHM4wf29sc99mQJZiyE8YT2rqfq6uZTFlz ky7GThAlTtS4XgmKTipvcWXJ6z+3clT6LNyqpGBCTavNl6c9hhDFUSrig0VcdtcZ96vq KDXbjqwXqS/L4jYHpymoHeWFAE5mRdM1Cpjk9WAxnJIP1LNt9iUAga73ooF92XHl3wV6 LwUfoMdgyQsFA5BdbQ3QtuFFF9TnwX6xfiLH4St+INVxWxslyFEq/eSVZUp0hwjVnLrB xw3WxReRLRtmZ9SN8Qok3t6DZ891PXPw3GzUY36YK29eEapaGT/L7AM/UehhwzESt1jG 57AQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=usn/IEZqsUKt+AxlTdVvP5AEnoZhccyZivpkNfLZGCg=; fh=iav3B1CAOEy6iCNWh6y5lIIjxc95kB2tL9iN7vqMeAE=; b=RIM56sGSjGSyGY/H4lHk0zfnbWRpna2Nf0DKnq7r3H3QY0VrcJRn2d1XTeWIXdsr1d Zvqs6XNx37UqKmpmpM7GOkocPLGkO6aY5lciOv7PF3dYWBGY+i1a/0NAo10udCc9tDBf RXc2wHxdG2ouKSkWfXofhqZ+WcozWQcdhuTtmyUFffGruNXOyrRwbqsFHFGTuvnGbu6N g5wabmUhRfyeZPfge8BwKJWbHKH6/4wWJn8UXXx/3ZG8YYn4f0bhuMt4xGZEMWMYVtVi 6uHYW89FUvcz8XeeBzkXpNeSz2tyd38WAPSBR9lAG7jMzdr3AjS7ye5mEKdBcPDLfatC 6/gA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jlaVDT7V; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-202504-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-202504-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id af79cd13be357-79512b96f91si517686885a.514.2024.06.05.05.42.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 05:42:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-202504-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jlaVDT7V; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-202504-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-202504-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 82B2B1C23C4B for ; Wed, 5 Jun 2024 12:42:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 48A1E1AB51E; Wed, 5 Jun 2024 12:04:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jlaVDT7V" 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 687511AB508; Wed, 5 Jun 2024 12:04: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=1717589066; cv=none; b=h9jsf29AbWL6JQBch9P7tqDid7rI0MdpIK/WKDsuAeVy5n6/DDyYfeM7Hi3nt993hFwrGmpgD/uRFwSRBVzuansM+ZuV4rUyLlLcwjKAw7kMNiJCBCKoU1wdUFZ23Qd/f7AuthzD1rh1WHlXcLXHPTTDtmN7B4jx3c1HmSpkC9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717589066; c=relaxed/simple; bh=a0IUHi3QPBEIuScy9rVloZzudGAPwQlvdVMXjKCB25w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tuT/LtimS2K/DjxfHcGYB7e0uAAtZDqMVByjpfdvZ2WENK40juHQB0RyQN+4bAN61r9/iPPE3G/F1fzMsDSJ6nvkYRjfjj9Us94u6Ci0MGChRS5EAmFoBoF25BkcVNQ5sqZbS6y2oKKiZEuB4X6lHt0tbaNM+oDY72fOI3fPlvY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jlaVDT7V; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49663C32781; Wed, 5 Jun 2024 12:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717589066; bh=a0IUHi3QPBEIuScy9rVloZzudGAPwQlvdVMXjKCB25w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jlaVDT7Vnx33FFktYLKVgLJwoll0aGmLLM18terZNtVwAzZjOffaNghzuqtAQcTiE v5R6M8PzALFAlfLZu1Jia1ecBlDjm+FAWWCBXmhKKzR8itZ9n48yQrcAPgVtIo/6Fk oxyLJk3AUSkiR4PSjhTHoZLwwWkJBT/JVpndwUoc64UjhDq/13EuN6GRoVM3qj7yhP v1l/YeeYbvFyA2f1I0SsgM9Klv3C7uCbnoKXkRpiEXg6jfTv1KF3SApM+dXdMJ73Ew jtwePPSoC1D41O1YgGVcMVja0uNGqYXhi9VuzM95AoR4l62TuN86GziA8Ct1k1lnX4 +Q+2jsljOkRYw== 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.6 10/18] nvmet: fix a possible leak when destroy a ctrl during qp establishment Date: Wed, 5 Jun 2024 08:03:49 -0400 Message-ID: <20240605120409.2967044-10-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120409.2967044-1-sashal@kernel.org> References: <20240605120409.2967044-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.32 Content-Transfer-Encoding: 8bit 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 3935165048e74..8af930e05d96c 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -803,6 +803,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