From mboxrd@z Thu Jan 1 00:00:00 1970 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 1E0362B9AD; Tue, 14 May 2024 11:11:11 +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=1715685071; cv=none; b=nZ8eWaeMo/js9gpMnwLqjS+e1MUIner3NZrfVhjBrE+1naCr477CxqGphaac2ek2t5zurrOkI67q9GR45BMobzs8neIK+ee9rfcjMW3NBAL5QZDZ83gsYefYuwHYRjd6cyfiaZ5kNajve8o15229sBUY3dF14GKET0RFHBf+C+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715685071; c=relaxed/simple; bh=nXNDJ/TcoDHGae1ZWlMNCb4CEPPS44Qg6OLKJl9PeDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MYiYhr2ZybkxHd59vgGbQazs5SACA29gIYZGUQNMU6bJbUQ7XwsfVXuafsKZc0HdULJXjmMDLW9axIHs8gbTjqky4XfZ8+QbmKb+AaX2n2nAkggtM+52M38izlA+Qin95u2/jxs2UObr6dR1mND8o6i9JOu0Xp7iIPZ4+xQI1Dg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dQVJPCaG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dQVJPCaG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4A85C2BD10; Tue, 14 May 2024 11:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715685071; bh=nXNDJ/TcoDHGae1ZWlMNCb4CEPPS44Qg6OLKJl9PeDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dQVJPCaGn1TZPFHbRCdo4h2q6Z641g/uypP4WcP218EwV/2Zm1vm4GmeTQ268p9g3 RPZY1ttfmtVew7qamZEYnqZ2WYMSJg/kOF8yQs9uG+C9sx/Avrs3QoutQYwE3RuWqU hEo/7eB/yoXF4iQjLzmfX+USw8/6jMKPqaaNiL/Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Justin Tee , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.6 100/301] scsi: lpfc: Replace hbalock with ndlp lock in lpfc_nvme_unregister_port() Date: Tue, 14 May 2024 12:16:11 +0200 Message-ID: <20240514101036.026939443@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Justin Tee [ Upstream commit d11272be497e48a8e8f980470eb6b70e92eed0ce ] The ndlp object update in lpfc_nvme_unregister_port() should be protected by the ndlp lock rather than hbalock. Signed-off-by: Justin Tee Link: https://lore.kernel.org/r/20240305200503.57317-6-justintee8345@gmail.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/lpfc/lpfc_nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 96e11a26c297e..a7479258e8055 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -2614,9 +2614,9 @@ lpfc_nvme_unregister_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) /* No concern about the role change on the nvme remoteport. * The transport will update it. */ - spin_lock_irq(&vport->phba->hbalock); + spin_lock_irq(&ndlp->lock); ndlp->fc4_xpt_flags |= NVME_XPT_UNREG_WAIT; - spin_unlock_irq(&vport->phba->hbalock); + spin_unlock_irq(&ndlp->lock); /* Don't let the host nvme transport keep sending keep-alives * on this remoteport. Vport is unloading, no recovery. The -- 2.43.0