Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056922; b=iPXyM7BZKWUJW75pSk7jI1tnfO83MySJh4t2GV7eT/wVFo/b0hREXYzjDcHpSG4NMER8 ifgUnR12bxwO8xJ+1d8glFdBSiflLXYLdmHf9cpeI4m85MtEJXvZLZtl4pdAU987NypmR gHOSAgTkS/mdvU6GVsbAdeA67R0Bf3uBFmNlM4dt2Bf3tgAXr6wgU6aGWO5sc11x6jMPC gQJoq+zsFn3Q+ImtwKxAWaWhWgoUWoctWGrP18g8t88BvhDQJmETM3o9Mb0A2Ah7zA+JS HGuYgunUE4BDQXr2IUYq515hM+2S1CopczPUGVlO5d6f8qEwkf+ljAtMI4zMVWr+ZyQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056922; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Mxi6+CZRjJ5iOLl3HIDkHXXVMx3fNe8nm1sYN1/SjkA=; b=xoF5bt3dX6Jv+32z42ajx74VtN72CHAq82GOexCf+cPEEGKo3J2xP/+Wnfw2yqZTmuvC 9v9aQqRvHIrht9RyJv7KONO46CMTEjyd3n+qsaN1cleG3ifQiL/KFdW03SZq8I/8YcX3L 4221fiKQOggVPfVdL1HbDXRXvrLk70NuudhTqJZT75N86JdyPRmEPjkw8HY+zZLuvFC1H s8E2Bq73m7oF0mrbtU1hZ9AJhMYPXt19lOx61GAGEt4r9t7QTs6j2WtPgqmZuL9KEfgpd QxWb4eYN5oArcr06TxvHm4XWqj3hRXD2cSCiVFeCFsNi7CdsczDgm3qeEToUbbnxcMg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BJNnKLf4; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23096606A320; Thu, 19 Nov 2026 02:55:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BJNnKLf4 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F7531F000C4; Thu, 19 Nov 2026 02:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056922; bh=Mxi6+CZRjJ5iOLl3HIDkHXXVMx3fNe8nm1sYN1/SjkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BJNnKLf4PP4P1dthFBlxhvOICxkyqH6HkrHilzyfiZIt1klKo7kvfPRBkZEoSZ4XE p3EZt6Wf0JSEL2nxGBfKe4Gjvp4/GVA1xRHJ7ZlFLdWPIGg9arry3S82mZ3hEHQMvQ rA6HpdoEU9TgTH0xMQIgGTbiMgQVKbZ5Pkb3RJ84= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni , Chris Mason , Jens Axboe , Keith Busch , Sasha Levin Subject: [PATCH 5.15 2159/2214] nvmet-rdma: disable interrupts under rsp_wr_wait_lock Date: Wed, 18 Nov 2026 16:03:55 +0100 Message-ID: <20261118150136.815298805@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Mason [ Upstream commit 14e4e09443ac2b5cd90c1e313ee3c0bdd4928e0d ] rsp_wr_wait_lock protects the list of commands waiting for room in the send queue, and it's taken with plain spin_lock(). But nvmet_rdma_queue_response() calls nvmet_rdma_release_rsp() directly if ib_post_send() fails, and that processes the wait list. The call chain starts in nvmet_req_complete(), which for a block device namespace runs from the bio end_io callback, which can be in hard interrupt context. An interrupt that completes a command on a CPU holding the lock for the same queue spins forever. Lockdep over siw with a null_blk namespace: inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage Use spin_lock_irqsave() for both takers. The processing loop still drops the lock, and restores the caller's interrupt state, around nvmet_rdma_execute_command(). Fixes: 8f000cac6e7a ("nvmet-rdma: add a NVMe over Fabrics RDMA target driver") Cc: Christoph Hellwig Cc: Sagi Grimberg Cc: Chaitanya Kulkarni Signed-off-by: Chris Mason Signed-off-by: Jens Axboe Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/target/rdma.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c index a321df21c2a61..b911b33bb15c0 100644 --- a/drivers/nvme/target/rdma.c +++ b/drivers/nvme/target/rdma.c @@ -513,7 +513,9 @@ static int nvmet_rdma_post_recv(struct nvmet_rdma_device *ndev, static void nvmet_rdma_process_wr_wait_list(struct nvmet_rdma_queue *queue) { - spin_lock(&queue->rsp_wr_wait_lock); + unsigned long flags; + + spin_lock_irqsave(&queue->rsp_wr_wait_lock, flags); while (!list_empty(&queue->rsp_wr_wait_list)) { struct nvmet_rdma_rsp *rsp; bool ret; @@ -522,16 +524,16 @@ static void nvmet_rdma_process_wr_wait_list(struct nvmet_rdma_queue *queue) struct nvmet_rdma_rsp, wait_list); list_del(&rsp->wait_list); - spin_unlock(&queue->rsp_wr_wait_lock); + spin_unlock_irqrestore(&queue->rsp_wr_wait_lock, flags); ret = nvmet_rdma_execute_command(rsp); - spin_lock(&queue->rsp_wr_wait_lock); + spin_lock_irqsave(&queue->rsp_wr_wait_lock, flags); if (!ret) { list_add(&rsp->wait_list, &queue->rsp_wr_wait_list); break; } } - spin_unlock(&queue->rsp_wr_wait_lock); + spin_unlock_irqrestore(&queue->rsp_wr_wait_lock, flags); } static u16 nvmet_rdma_check_pi_status(struct ib_mr *sig_mr) @@ -979,6 +981,7 @@ static bool nvmet_rdma_execute_command(struct nvmet_rdma_rsp *rsp) static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue, struct nvmet_rdma_rsp *cmd) { + unsigned long flags; u16 status; ib_dma_sync_single_for_cpu(queue->dev->device, @@ -997,9 +1000,9 @@ static void nvmet_rdma_handle_command(struct nvmet_rdma_queue *queue, goto out_err; if (unlikely(!nvmet_rdma_execute_command(cmd))) { - spin_lock(&queue->rsp_wr_wait_lock); + spin_lock_irqsave(&queue->rsp_wr_wait_lock, flags); list_add_tail(&cmd->wait_list, &queue->rsp_wr_wait_list); - spin_unlock(&queue->rsp_wr_wait_lock); + spin_unlock_irqrestore(&queue->rsp_wr_wait_lock, flags); } return; -- 2.53.0