Received: by 2002:ab2:6d45:0:b0:1fb:d597:ff75 with SMTP id d5csp270641lqr; Wed, 5 Jun 2024 05:50:34 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV3nreUDxqYJkMNNngN1iB+uZwdqbtdl0TNy5coAWsngXqa2ywudq1nODjqU7EryJFRHwkfzoVZXOOVwf0fBfS8RvazrB9PMY46FZr/wA== X-Google-Smtp-Source: AGHT+IHLhMgOvHJwxI0bZSTTRbzNiC+VL/FAj62jubT71OfiwZA9L2bFyffnyLlwbluINyiPRN4v X-Received: by 2002:a05:620a:4957:b0:792:c13e:2996 with SMTP id af79cd13be357-79523d5bb67mr256635885a.29.1717591834064; Wed, 05 Jun 2024 05:50:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717591834; cv=pass; d=google.com; s=arc-20160816; b=B16hwE+KMXOcIKo0npXd+/8HzcbT6Xhg01oeb+gxB+UwB9NNYT2TE28g4F6ybqzwSq 6GWUM4+j8aBt4+MqwMOa8YnAP8hV2/ztNf1umZpG90b5LRmzbrLl7yCPDEZcgJGfUw5W gj8yAWZhFbbf9NL8o12IDSMq+Kzn1OMURbmgsJjlhZ3Vnp3U3OImlRNZCUCK7AVrHrOC m/O3RcxEQpyLyFlSstTZZKgQUmhgtSLsvvZLM4DYB9yJAXQDNIqh32Zw5DadkPpo+a5Z +PlUvZYp+LhXprkKi2rPdSd32F9VAKS1w5Hj56Jy9hQ9EN2w1GblbViSPmRreOF/n3vE WWIA== 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=Yu8WZy6FOXpdjegyEM9M+PupwOmvBcnFm2y6GjrrC64=; fh=iav3B1CAOEy6iCNWh6y5lIIjxc95kB2tL9iN7vqMeAE=; b=c4VgA11P3NLiwtdxcpi7CXsx5CPPm7UoihxA67TTrLximpeOnBVH6gKuTYRg2bEiyW qqbVStqroF+uRiIrMUv1WYUyexxfDrJcFAKnlBkfIhJog1+rGveGRQ5lpLDIpvEXi8jU BHA56BUu6R1Fbi1D+z2VeqqaIy8QDNZWk3778RKhKIKQIXsQ20sFp+mDKWNWJ+vaxTjW 16YmIE14s+mcVCojZfnztSQOAVvS58f+XoUNnRLARZVy52pvUKqZwjuZxoBCePe9igFa rhj5JQtT0XcSQzlc+Co5Fmcn7MUTR1suThUkko9ZaFAbCQ4ACVYObORqhurfHLv4SvCF mBKA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ntiqb7sd; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-202536-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-202536-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-79522a58750si234977885a.590.2024.06.05.05.50.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jun 2024 05:50:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-202536-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=ntiqb7sd; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-202536-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-202536-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 C879F1C22CC8 for ; Wed, 5 Jun 2024 12:50:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8F4871CF881; Wed, 5 Jun 2024 12:05:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ntiqb7sd" 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 B53BB1CF10F; Wed, 5 Jun 2024 12:05:44 +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=1717589144; cv=none; b=uMzERByPL5Wh7TdXdLpXQ1BN/XW7AF1XG3QL7h4rF+B4ycSgn0siDA6rprbRc4gK1q7BSV3IHXpDI8j/Om7E/VvjJ5FAn2u/DBnpNf0ZqFMKJeRvvVSlXH6ulynBoqLk2Foo9ZQR3rDfZiPPNKzm6SY0A0u4Zp6jU2tPSxsz2DU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717589144; c=relaxed/simple; bh=9+I3qk58P2Tix1QmChv9y7ZaEhThCOAIIu7ewW9ZtCw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QWk0Og2Ut2rJjAgA9DD2hG+TY2EWirU3amI/cgGlM/LqGwvIsYx+zNRbsrjjAwHnMzD+fzy2dwGm2cz2gZ7UuNiHvZfrp8RdLAQW+83BWpKIeL6ckfk/mbSx1oyAi/7/eoHda+Mk3BMiSDJgHL1b38mNI/8u0q/fQqgws7O2tXg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ntiqb7sd; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F897C32781; Wed, 5 Jun 2024 12:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717589144; bh=9+I3qk58P2Tix1QmChv9y7ZaEhThCOAIIu7ewW9ZtCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ntiqb7sdOtqKeY4i0szQRof4wur3l4q1h2VymufQXGk0F1GjMXdYyzqp2vq3T5klV wBrbdni+au7wBspwm8OZqGE9dZXYvzorqSN4dWerVDBZkABdx/3Bz+FXt/T2CBJdh0 o0NyOhCN+bRUV5Wvacct+/tNEm0z4RqY6ALVJdtlrVFn+m1GubHHz1sNvpFhUzGN6C rqJzua/Th5F82as6Lemj01VQ476GFripe3v+2GzoFzkcUdIzfGDbOlD+yioAGfSJ9G RIlfm9qwiS4ZFBfdn+W7bM3UPQj7HidGmwl6+cEWBSDWm+0xgHljeRca+NbkOUw50F d2/wlxD6educg== 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 5.15 09/12] nvmet: fix a possible leak when destroy a ctrl during qp establishment Date: Wed, 5 Jun 2024 08:05:19 -0400 Message-ID: <20240605120528.2967750-9-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120528.2967750-1-sashal@kernel.org> References: <20240605120528.2967750-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 5.15.160 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 2c44d5a95c8d6..ef2e500bccfdf 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -801,6 +801,15 @@ void nvmet_sq_destroy(struct nvmet_sq *sq) wait_for_completion(&sq->free_done); percpu_ref_exit(&sq->ref); + /* + * 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