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 A52F92676FA; Mon, 24 Feb 2025 11:19:05 +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=1740395945; cv=none; b=gB3xniQVxTOHFABYVcr4v4WB7qYAvG42NOe/5mE74gtVEo2DKGQqtG141RzulmNm3/8s46NOwDm4auEwv7ez1paOHORPo6ObcwXbClEsVFwV/h5/2gmHwSLti1ttSNjKdJocrs+gQAwEQUpgfezGJphEhSISfmPWMNwhTfX3vjE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740395945; c=relaxed/simple; bh=YraLUL1E4en8RrwpRZQJCcyy5k+RrW+AX4PIqGJxFWw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pKhH7UXr4HPpzbCs7ZBHJd/xkfCmm0phFrx6OV3KldpzfyWwO24GlqFqb74Dx7/A/C6v0njlqjZ4oP4U5S6pvPCEYJw1NIjus/6BQ/a8IWWbj3Hg+SFtcdMuosxOKozEumB+xfxO0jL4negyh+CLN65PxDVA/brrctmKeR2qNNY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lgkcsu0O; 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="Lgkcsu0O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 950FBC4CED6; Mon, 24 Feb 2025 11:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740395945; bh=YraLUL1E4en8RrwpRZQJCcyy5k+RrW+AX4PIqGJxFWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lgkcsu0OdHoB6SZSYhAe4m5ZtEhepcHmhS3ZR4IVqfGjmTay/xM3wyRcQV2DTZW7X Kn3PGdTgjLLOiS5q1SsXniYKGUoFtrejpTSVr3wRYjixZv91BwOfr8dWiAXhLy46XG Da3aDarmFSwg58SIQwaAnx6ealLLr1onRXZ69vRzP/edrZlb4HYwEDVTbETiAkYSpV ysnmmUVtBd1PdjKgo9dcMlz9L0OThuUtPT52xR78/hPhSuJvNRsLT2vvHb4oz+8pN0 ouxK9bymO0mx3Z1JhCS+itvIXhgFGdv1OKRq2cU0/QcYkhOqOi7iEscu8bw95pk73L pTuWswgjAsvVg== 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 6.12 23/28] nvmet-rdma: recheck queue state is LIVE in state lock in recv done Date: Mon, 24 Feb 2025 06:17:54 -0500 Message-Id: <20250224111759.2213772-23-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224111759.2213772-1-sashal@kernel.org> References: <20250224111759.2213772-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.12.16 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 1afd93026f9bf..2a4536ef61848 100644 --- a/drivers/nvme/target/rdma.c +++ b/drivers/nvme/target/rdma.c @@ -996,6 +996,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 = @@ -1038,17 +1059,9 @@ static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc) rsp->n_rdma = 0; rsp->invalidate_rkey = 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