From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAD65C4332F for ; Sun, 29 Oct 2023 23:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232494AbjJ2Xa5 (ORCPT ); Sun, 29 Oct 2023 19:30:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232518AbjJ2Xa1 (ORCPT ); Sun, 29 Oct 2023 19:30:27 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC78F5FCD; Sun, 29 Oct 2023 16:00:52 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56098C433B7; Sun, 29 Oct 2023 22:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620373; bh=mfutkbzhl3xkRVSBDt388tSkZwdwIZdy7DDdvPlTclo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pQBeqinCDWEj6/ZL48CHD6M8dsUwEEfISA1t7nfXCnzooTk/WWC6P6tgdrzX35ESn W6/6f5eybyHWiEddlkH6GEV9bbb6f/dBRyj1kzUxXlFXaGKrQUw+fU/qO92cy8n5JA SuRHQFtW+auS7Jiqa9dyZVAiXWQ/Zv3HlK+jg9OHDH8bv+Fzu2pDGt6vetDYiZWTes +3CPfMaf7RH4ELzgTeOT72V4Tfc5s9i5DsgjdznXTh30Sjt2sDt6XwiGF/JoIlYRTA FSQ0bdCZ5HQSY9nbiOjHIKJd4p3S1VF9l+8ecLh9VOl2eMcxk0UB99ghEfJRT1c6jM dDbmf2JB6vLLw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maurizio Lombardi , Sagi Grimberg , Yi Zhang , Keith Busch , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 12/28] nvme-rdma: do not try to stop unallocated queues Date: Sun, 29 Oct 2023 18:58:47 -0400 Message-ID: <20231029225916.791798-12-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225916.791798-1-sashal@kernel.org> References: <20231029225916.791798-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.137 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maurizio Lombardi [ 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 Reviewed-by: Sagi Grimberg Tested-by: Yi Zhang Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- 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 b76e1d4adcc77..6e92bdf459fe4 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -645,6 +645,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