From nobody Mon Feb 9 19:05:34 2026 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 44A7C34F48D for ; Thu, 30 Oct 2025 10:05:52 +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=1761818753; cv=none; b=XL3kymEqb/wyDhyFsEWO9cGGM+nZseTiHQ13erT2RFnOeLD7DBmxD8wKZ/9bg4ubu8krEcXdj2oOdS3tW8dNIaFzMShnSau2JbVYculUe+dujZdGmX/m8BXK8gOGZb+3F64cA+WKXFKOOAgSMQY26j1VeXpCGJWowwGfiOmQXBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761818753; c=relaxed/simple; bh=SP1ioKSaDdMcidA7eYCAEjoEi4/LMlq8R1no50L2IRg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kLWrzasDzq28IHEmXQI6HdDCTKOzp2cPJXcvEUYPRn/oxS5HJ6CmykdLSWUtFNwkwVb3fMxjJhWbhn8saG4Kbozl60PpNhQHZJIxbNLWuOPesi/uNHEpOxezM+GWM8o1ruE1+N4+PEnBLOI48cqZMLdd0/BP+Lsr++3sqjjPSUY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=et4SFdyI; 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="et4SFdyI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7862EC4CEFD; Thu, 30 Oct 2025 10:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761818752; bh=SP1ioKSaDdMcidA7eYCAEjoEi4/LMlq8R1no50L2IRg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=et4SFdyIawUd5x6LQxcCM6jCvAN/uXHLEyMWIlaC4VyTGkZRcaPeeDLbkXNfw5dLH Bby/g7oU0w5wQEoOUG0snaFyx65o/GXWYDCwpbEt+muwXO6r55NCBpPxSKzMSMBODn 1wEgn5gz+QowarVYi0wyR2SCXPs8flL52iw38RPCPy2O7pH6yoqxVsyp6kGhOHivJF NeHvL/coZjmUAe+iuVI/UI2gLxfkc7NqnT02tAXO0sBVMVaeelr9f+lAjupUhqdMDZ p3drvSxZksygoVw62F/4rTgcR14aWIUmxkvfzQ3HKFJURvWfpf7MwpfFy4SIFmrzpp JqGJU/wahqrsA== From: Daniel Wagner Date: Thu, 30 Oct 2025 11:05:45 +0100 Subject: [PATCH v2 1/5] nvme-fc: don't hold rport lock when putting ctrl Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251030-nvmet-fcloop-fixes-v2-1-b8d66a322c51@kernel.org> References: <20251030-nvmet-fcloop-fixes-v2-0-b8d66a322c51@kernel.org> In-Reply-To: <20251030-nvmet-fcloop-fixes-v2-0-b8d66a322c51@kernel.org> To: Justin Tee , Christoph Hellwig , Keith Busch Cc: James Smart , Jens Axboe , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Wagner X-Mailer: b4 0.14.3 nvme_fc_ctrl_put can acquire the rport lock when freeing the ctrl object: nvme_fc_ctrl_put nvme_fc_ctrl_free spin_lock_irqsave(rport->lock) Thus we can't hold the rport lock when calling nvme_fc_ctrl_put. Justin suggested use the safe list iterator variant because nvme_fc_ctrl_put will also modify the rport->list. Cc: Justin Tee Reviewed-by: Christoph Hellwig Signed-off-by: Daniel Wagner --- drivers/nvme/host/fc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 03987f497a5b..3ff70e6e8131 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -1468,14 +1468,14 @@ nvme_fc_match_disconn_ls(struct nvme_fc_rport *rpor= t, { struct fcnvme_ls_disconnect_assoc_rqst *rqst =3D &lsop->rqstbuf->rq_dis_assoc; - struct nvme_fc_ctrl *ctrl, *ret =3D NULL; + struct nvme_fc_ctrl *ctrl, *tmp, *ret =3D NULL; struct nvmefc_ls_rcv_op *oldls =3D NULL; u64 association_id =3D be64_to_cpu(rqst->associd.association_id); unsigned long flags; =20 spin_lock_irqsave(&rport->lock, flags); =20 - list_for_each_entry(ctrl, &rport->ctrl_list, ctrl_list) { + list_for_each_entry_safe(ctrl, tmp, &rport->ctrl_list, ctrl_list) { if (!nvme_fc_ctrl_get(ctrl)) continue; spin_lock(&ctrl->lock); @@ -1488,7 +1488,9 @@ nvme_fc_match_disconn_ls(struct nvme_fc_rport *rport, if (ret) /* leave the ctrl get reference */ break; + spin_unlock_irqrestore(&rport->lock, flags); nvme_fc_ctrl_put(ctrl); + spin_lock_irqsave(&rport->lock, flags); } =20 spin_unlock_irqrestore(&rport->lock, flags); --=20 2.51.1