From: Jesse Taube <jtaubepe@redhat.com>
To: linux-scsi@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@kernel.dk>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Justin Tee <justin.tee@broadcom.com>,
Naresh Gottumukkala <nareshgottumukkala83@gmail.com>,
Paul Ely <paul.ely@broadcom.com>,
Chaitanya Kulkarni <kch@nvidia.com>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Nilesh Javali <njavali@marvell.com>,
GR-QLogic-Storage-Upstream@marvell.com,
Hannes Reinecke <hare@suse.de>, Jesse Taube <jtaubepe@redhat.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
John Meneghini <jmeneghi@redhat.com>,
Bryan Gurney <bgurney@redhat.com>,
Chris Leech <cleech@redhat.com>,
"Ewan D . Milne" <emilne@redhat.com>,
shinichiro.kawasaki@wdc.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-block@vger.kernel.org
Subject: [PATCH 08/13] scsi: scsi_transport_fc: user support for clearing NVME_CTRL_MARGINAL
Date: Wed, 12 Aug 2026 14:12:55 -0400 [thread overview]
Message-ID: <20260812181300.3712426-9-jtaubepe@redhat.com> (raw)
In-Reply-To: <20260812181300.3712426-1-jtaubepe@redhat.com>
From: John Meneghini <jmeneghi@redhat.com>
Refactor and fc_rport_set_marginal_state smp safe by holding
`shost->host_lock` around all `rport->port_state` accesses.
Call nvme_fc_modify_rport_fpin_state() when FC_PORTSTATE_MARGINAL is set
or cleared. This allows the user to quickly set or clear the
NVME_CTRL_MARGINAL state from sysfs.
E.g.:
echo "Marginal" > /sys/class/fc_remote_ports/rport-13:0-5/port_state
echo "Online" > /sys/class/fc_remote_ports/rport-13:0-5/port_state
Note: nvme_fc_modify_rport_fpin_state() will only affect rports that
have FC_PORT_ROLE_NVME_TARGET set.
Signed-off-by: John Meneghini <jmeneghi@redhat.com>
---
V10 -> V11:
- No change
---
drivers/scsi/scsi_transport_fc.c | 42 +++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 9 deletions(-)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index df1edf3c23fa..af309a7bdc22 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -1251,34 +1251,58 @@ static ssize_t fc_rport_set_marginal_state(struct device *dev,
const char *buf, size_t count)
{
struct fc_rport *rport = transport_class_to_rport(dev);
+ struct Scsi_Host *shost = rport_to_shost(rport);
+ struct fc_internal *i = to_fc_internal(shost->transportt);
enum fc_port_state port_state;
int ret = 0;
+ unsigned long flags;
ret = get_fc_port_state_match(buf, &port_state);
if (ret)
return -EINVAL;
- if (port_state == FC_PORTSTATE_MARGINAL) {
+
+ spin_lock_irqsave(shost->host_lock, flags);
+
+ switch (port_state) {
+ case FC_PORTSTATE_MARGINAL:
/*
* Change the state to Marginal only if the
* current rport state is Online
* Allow only Online->Marginal
*/
- if (rport->port_state == FC_PORTSTATE_ONLINE)
+ if (rport->port_state == FC_PORTSTATE_ONLINE) {
rport->port_state = port_state;
- else if (port_state != rport->port_state)
- return -EINVAL;
- } else if (port_state == FC_PORTSTATE_ONLINE) {
+ spin_unlock_irqrestore(shost->host_lock, flags);
+ if (i->f->set_rport_marginal)
+ i->f->set_rport_marginal(rport, true);
+ return count;
+ }
+ break;
+
+ case FC_PORTSTATE_ONLINE:
/*
* Change the state to Online only if the
* current rport state is Marginal
* Allow only Marginal->Online
*/
- if (rport->port_state == FC_PORTSTATE_MARGINAL)
+ if (rport->port_state == FC_PORTSTATE_MARGINAL) {
rport->port_state = port_state;
- else if (port_state != rport->port_state)
- return -EINVAL;
- } else
+ spin_unlock_irqrestore(shost->host_lock, flags);
+ if (i->f->set_rport_marginal)
+ i->f->set_rport_marginal(rport, false);
+ return count;
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (port_state != rport->port_state) {
+ spin_unlock_irqrestore(shost->host_lock, flags);
return -EINVAL;
+ }
+
+ spin_unlock_irqrestore(shost->host_lock, flags);
return count;
}
--
2.54.0
next prev parent reply other threads:[~2026-08-12 18:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-12 18:12 [PATCH 00/13] nvme-fc: FPIN link integrity handling Jesse Taube
2026-08-12 18:12 ` [PATCH 01/13] fc_els: use 'union fc_tlv_desc' Jesse Taube
2026-08-12 18:12 ` [PATCH 02/13] nvme: add NVME_CTRL_MARGINAL flag Jesse Taube
2026-08-12 18:12 ` [PATCH 03/13] nvme-multipath: numa support for marginal paths Jesse Taube
2026-08-12 18:12 ` [PATCH 04/13] nvme-multipath: queue-depth " Jesse Taube
2026-08-12 18:12 ` [PATCH 05/13] nvme-multipath: round-robin " Jesse Taube
2026-08-12 18:12 ` [PATCH 06/13] nvme: sysfs: emit the marginal path state in show_state() Jesse Taube
2026-08-12 18:12 ` [PATCH 07/13] scsi: scsi_transport_fc: Add set_rport_marginal to fc_function_template Jesse Taube
2026-08-12 18:12 ` Jesse Taube [this message]
2026-08-12 18:12 ` [PATCH 09/13] nvme-fc: add nvme_fc_set_remoteport_fpin() Jesse Taube
2026-08-12 18:12 ` [PATCH 10/13] scsi: qla2xxx: enable FPIN notification for NVMe Jesse Taube
2026-08-12 18:12 ` [PATCH 11/13] scsi: lpfc: " Jesse Taube
2026-08-12 18:12 ` [PATCH 12/13] nvme: fcloop: Add set_rport_marginal to sysfs Jesse Taube
2026-08-12 18:34 ` Jesse Taube
2026-08-12 18:13 ` [PATCH 13/13] docs: nvme-multipath: Add FC-NVMe marginal state Jesse Taube
2026-08-12 18:46 ` Randy Dunlap
2026-08-12 18:50 ` Randy Dunlap
2026-08-13 4:53 ` [EXTERNAL] [PATCH 00/13] nvme-fc: FPIN link integrity handling Nilesh Javali
2026-08-13 16:24 ` Jesse Taube
2026-08-14 6:36 ` Christoph Hellwig
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=20260812181300.3712426-9-jtaubepe@redhat.com \
--to=jtaubepe@redhat.com \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=axboe@kernel.dk \
--cc=bgurney@redhat.com \
--cc=cleech@redhat.com \
--cc=corbet@lwn.net \
--cc=emilne@redhat.com \
--cc=gustavoars@kernel.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jmeneghi@redhat.com \
--cc=justin.tee@broadcom.com \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=nareshgottumukkala83@gmail.com \
--cc=njavali@marvell.com \
--cc=paul.ely@broadcom.com \
--cc=sagi@grimberg.me \
--cc=shinichiro.kawasaki@wdc.com \
--cc=skhan@linuxfoundation.org \
/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®