From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Maurizio Lombardi <mlombard@redhat.com>,
Sagi Grimberg <sagi@grimberg.me>, Yi Zhang <yi.zhang@redhat.com>,
Keith Busch <kbusch@kernel.org>, Sasha Levin <sashal@kernel.org>,
linux-nvme@lists.infradead.org
Subject: [PATCH AUTOSEL 5.10 03/16] nvme-rdma: do not try to stop unallocated queues
Date: Sun, 29 Oct 2023 18:59:49 -0400 [thread overview]
Message-ID: <20231029230014.792490-3-sashal@kernel.org> (raw)
In-Reply-To: <20231029230014.792490-1-sashal@kernel.org>
From: Maurizio Lombardi <mlombard@redhat.com>
[ Upstream commit 3820c4fdc247b6f0a4162733bdb8ddf8f2e8a1e4 ]
Trying to stop a queue which hasn't been allocated will result
in a warning due to calling mutex_lock() against an uninitialized mutex.
DEBUG_LOCKS_WARN_ON(lock->magic != lock)
WARNING: CPU: 4 PID: 104150 at kernel/locking/mutex.c:579
Call trace:
RIP: 0010:__mutex_lock+0x1173/0x14a0
nvme_rdma_stop_queue+0x1b/0xa0 [nvme_rdma]
nvme_rdma_teardown_io_queues.part.0+0xb0/0x1d0 [nvme_rdma]
nvme_rdma_delete_ctrl+0x50/0x100 [nvme_rdma]
nvme_do_delete_ctrl+0x149/0x158 [nvme_core]
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/rdma.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 825c961c6fd50..ecc3f822df244 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -644,6 +644,9 @@ static void __nvme_rdma_stop_queue(struct nvme_rdma_queue *queue)
static void nvme_rdma_stop_queue(struct nvme_rdma_queue *queue)
{
+ if (!test_bit(NVME_RDMA_Q_ALLOCATED, &queue->flags))
+ return;
+
mutex_lock(&queue->queue_lock);
if (test_and_clear_bit(NVME_RDMA_Q_LIVE, &queue->flags))
__nvme_rdma_stop_queue(queue);
--
2.42.0
next prev parent reply other threads:[~2023-10-29 23:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 22:59 [PATCH AUTOSEL 5.10 01/16] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 02/16] spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 Sasha Levin
2023-10-29 22:59 ` Sasha Levin [this message]
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 04/16] net: ipv6: fix return value check in esp_remove_trailer Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 05/16] net: ipv4: " Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 06/16] Bluetooth: vhci: Fix race when opening vhci device Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 07/16] netfilter: nfnetlink_log: silence bogus compiler warning Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 08/16] ASoC: rt5650: fix the wrong result of key button Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 09/16] fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 10/16] fbdev: core: cfbcopyarea: fix sloppy typing Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 11/16] fbdev: core: syscopyarea: " Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 12/16] scsi: mpt3sas: Fix in error path Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.10 13/16] platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e Sasha Levin
2023-10-29 23:00 ` [PATCH AUTOSEL 5.10 14/16] platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events Sasha Levin
2023-10-29 23:00 ` [PATCH AUTOSEL 5.10 15/16] platform/mellanox: mlxbf-tmfifo: Fix a warning message Sasha Levin
2023-10-29 23:00 ` [PATCH AUTOSEL 5.10 16/16] nvme-pci: add BOGUS_NID for Intel 0a54 device Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231029230014.792490-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mlombard@redhat.com \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
--cc=yi.zhang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®