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 E16DC254873; Mon, 24 Feb 2025 11:21:19 +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=1740396080; cv=none; b=I7xk2sAhqFOHV9rCu0c5V2q65nq3a1EgCdquNI0BLikpKoz/Fq+AE9krS6jvAQycTNXmmP3iIz8J8//3W8egcWgebwzPFfu90fhNyGBlzpumb3BMMER2l45wlyaviIeAekzxzdwgnBwDT9tgLqVdM7KlbLDn4PtQdQNp5pIWajI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396080; c=relaxed/simple; bh=tU9PL4B2+Kt5WzENqM6ZfE/zAnAPrKbYsHwiA8PEfjk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QEP0pXlNI0pg8NMz2yWro8IhxEwxB8f7MnKxovWIrogc7jY0KHJlNzxadyPTbM3G76qj/zcjkZ58Jod5wmBWQIcYwZcr6yjqv+ImT64QikinvF91cRCFE/2/FWfkJDr9B49LtiHXu1nubpZ3ogW2P1XdGzjv/c/za3q4Q/0ZTMo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o+LRhU4j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="o+LRhU4j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B885C4CEE6; Mon, 24 Feb 2025 11:21:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740396079; bh=tU9PL4B2+Kt5WzENqM6ZfE/zAnAPrKbYsHwiA8PEfjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o+LRhU4j3Pt5Ok2OyMRGF89PG/FFj2ctmIUuoK7UcfpNUiOUg+3EDlBSazYuR+//B D8/lPpUo2ZnSjoxDPrZkp56x3+CwicGwbs8D07pdU6uzxjTefhdNfHTa/sfeDMvKl0 xa+v3WEi6wwE7zIfGN5a5DH6djY6+JyyHt3MrkdL2eI1Qq+Ul2SRdkD1tL17gL1N+S D7gWMlSPFRogwJgooQU9GJEi0AUdQcAAhqiJmy2lWhR4lUUpdnYF7PBN1l6wysRWL0 N+68Ygy/XZ54R7W4BfWIafAynItPtAK1CyMbwq4PED+2GVKKD/dFATs1i7nb3/TsbS zpG+S+0TS4dYQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ruozhu Li , Sagi Grimberg , Keith Busch , Sasha Levin , kch@nvidia.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 2/4] nvmet-rdma: recheck queue state is LIVE in state lock in recv done Date: Mon, 24 Feb 2025 06:21:10 -0500 Message-Id: <20250224112115.2215137-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224112115.2215137-1-sashal@kernel.org> References: <20250224112115.2215137-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.4.290 Content-Transfer-Encoding: 8bit From: Ruozhu Li [ Upstream commit 3988ac1c67e6e84d2feb987d7b36d5791174b3da ] The queue state checking in nvmet_rdma_recv_done is not in queue state lock.Queue state can transfer to LIVE in cm establish handler between state checking and state lock here, cause a silent drop of nvme connect cmd. Recheck queue state whether in LIVE state in state lock to prevent this issue. Signed-off-by: Ruozhu Li Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/target/rdma.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c index ae41b6001c7e2..b6d84b6493e14 100644 --- a/drivers/nvme/target/rdma.c +++ b/drivers/nvme/target/rdma.c @@ -777,6 +777,27 @@ static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue, nvmet_req_complete(&cmd->req, status); } +static bool nvmet_rdma_recv_not_live(struct nvmet_rdma_queue *queue, + struct nvmet_rdma_rsp *rsp) +{ + unsigned long flags; + bool ret = true; + + spin_lock_irqsave(&queue->state_lock, flags); + /* + * recheck queue state is not live to prevent a race condition + * with RDMA_CM_EVENT_ESTABLISHED handler. + */ + if (queue->state == NVMET_RDMA_Q_LIVE) + ret = false; + else if (queue->state == NVMET_RDMA_Q_CONNECTING) + list_add_tail(&rsp->wait_list, &queue->rsp_wait_list); + else + nvmet_rdma_put_rsp(rsp); + spin_unlock_irqrestore(&queue->state_lock, flags); + return ret; +} + static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc) { struct nvmet_rdma_cmd *cmd = @@ -818,17 +839,9 @@ static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc) rsp->req.port = queue->port; rsp->n_rdma = 0; - if (unlikely(queue->state != NVMET_RDMA_Q_LIVE)) { - unsigned long flags; - - spin_lock_irqsave(&queue->state_lock, flags); - if (queue->state == NVMET_RDMA_Q_CONNECTING) - list_add_tail(&rsp->wait_list, &queue->rsp_wait_list); - else - nvmet_rdma_put_rsp(rsp); - spin_unlock_irqrestore(&queue->state_lock, flags); + if (unlikely(queue->state != NVMET_RDMA_Q_LIVE) && + nvmet_rdma_recv_not_live(queue, rsp)) return; - } nvmet_rdma_handle_command(queue, rsp); } -- 2.39.5