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 73188C4332F for ; Sun, 29 Oct 2023 22:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231402AbjJ2W7y (ORCPT ); Sun, 29 Oct 2023 18:59:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231335AbjJ2W7Q (ORCPT ); Sun, 29 Oct 2023 18:59:16 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3119A46B2; Sun, 29 Oct 2023 15:58:37 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 016E0C433CA; Sun, 29 Oct 2023 22:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620276; bh=XK8VooXnurc1BFxsLPqCnhiM8Mdfh0R1ydlPC0bcP2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lNHYZadAHiCl5I0S7AOC6z3lz4nwG5a00/9KGM2Xo5v4ke60TKNECwjF1lVjixNNO 8Wum4uVsLXk4mFTeCKNy8r8p0vvSMSQhu19HNE3nNb+HMbglESoQz+Mc548MTtvch0 5iHVWUZYPI5rOxxiUTskhmfZD3+/gYSjs+eu7d++/VOQ58BQJM+rIEZS/EGPVy1ZIA t5+ePe6oNxzLG0yNYhloiMrL0T1UNt0IYd85D71Vz0h6MOh5lqTh7DUEhTSAn0sjUf +eA90Hc95pISVy1IlnwxmZdsOIn9oYmrsNfGx/LTlAq6Naxnio1ALayreudfn3zzul 0nIes5EEtrQjg== 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 6.1 12/39] nvme-rdma: do not try to stop unallocated queues Date: Sun, 29 Oct 2023 18:56:44 -0400 Message-ID: <20231029225740.790936-12-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225740.790936-1-sashal@kernel.org> References: <20231029225740.790936-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.60 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 c478480f54aa2..aa1734e2fd44e 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -643,6 +643,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