From: Karan Tilak Kumar <kartilak@cisco.com>
To: sebaddel@cisco.com
Cc: arulponn@cisco.com, djhawar@cisco.com, gcboffa@cisco.com,
mkai2@cisco.com, satishkh@cisco.com, aeasi@cisco.com,
jejb@linux.ibm.com, martin.petersen@oracle.com,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
jmeneghi@redhat.com, revers@redhat.com, dan.carpenter@linaro.org,
adakopou@redhat.com, lduncan@suse.com,
Karan Tilak Kumar <kartilak@cisco.com>,
Hannes Reinecke <hare@kernel.org>
Subject: [PATCH 09/13] scsi: fnic: Send NVMe LS requests through FDLS
Date: Thu, 21 May 2026 11:04:54 -0700 [thread overview]
Message-ID: <20260521180458.5448-10-kartilak@cisco.com> (raw)
In-Reply-To: <20260521180458.5448-1-kartilak@cisco.com>
Add the FC frame wrapper for NVMe LS requests and build LS request frames
from the NVMe-FC transport callback.
Allocate OXIDs, track outstanding LS requests on the target port, arm
request timers, and register the LS request callback in the NVMe FC port
template.
Reviewed-by: Sesidhar Baddela <sebaddel@cisco.com>
Reviewed-by: Arulprabhu Ponnusamy <arulponn@cisco.com>
Reviewed-by: Gian Carlo Boffa <gcboffa@cisco.com>
Reviewed-by: Arun Easi <aeasi@cisco.com>
Reviewed-by: Hannes Reinecke <hare@kernel.org>
Reviewed-by: Lee Duncan <lduncan@suse.com>
Signed-off-by: Karan Tilak Kumar <kartilak@cisco.com>
Co-developed-by: Hannes Reinecke <hare@kernel.org>
---
drivers/scsi/fnic/fdls_fc.h | 8 +++
drivers/scsi/fnic/fnic_nvme.c | 110 +++++++++++++++++++++++++++++++++-
drivers/scsi/fnic/fnic_nvme.h | 3 +
3 files changed, 120 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/fnic/fdls_fc.h b/drivers/scsi/fnic/fdls_fc.h
index a7b8b969f019..381b87d549dd 100644
--- a/drivers/scsi/fnic/fdls_fc.h
+++ b/drivers/scsi/fnic/fdls_fc.h
@@ -30,6 +30,9 @@
#include <linux/if_ether.h>
#include <scsi/fc/fc_encaps.h>
#include <scsi/fc/fc_fcoe.h>
+#include <linux/nvme.h>
+#include <linux/nvme-fc.h>
+#include <linux/nvme-fc-driver.h>
#define FDLS_MIN_FRAMES (32)
#define FDLS_MIN_FRAME_ELEM (4)
@@ -251,6 +254,11 @@ struct fc_std_logo {
struct fc_els_logo els;
} __packed;
+struct fc_std_ls_req {
+ struct fc_frame_header fchdr;
+ struct nvmefc_ls_req ls_req;
+} __packed;
+
#define FNIC_ETH_FCOE_HDRS_OFFSET \
(sizeof(struct ethhdr) + sizeof(struct fcoe_hdr))
diff --git a/drivers/scsi/fnic/fnic_nvme.c b/drivers/scsi/fnic/fnic_nvme.c
index 26d4cbb06f50..83a43df28956 100644
--- a/drivers/scsi/fnic/fnic_nvme.c
+++ b/drivers/scsi/fnic/fnic_nvme.c
@@ -1244,6 +1244,114 @@ void nvfnic_ls_req_timeout(struct timer_list *t)
ls_req->done(ls_req, -ETIMEDOUT);
}
+/**
+ * nvfnic_ls_req_send - Send NVMe FC link service (LS) request
+ * @lport: Pointer to local NVMe FC port structure
+ * @rport: Pointer to remote NVMe FC port structure
+ * @ls_req: Pointer to the link service request structure
+ *
+ * This function is used to send link service (LS) commands to an NVMe
+ * Discovery Controller for discovery operations, as well as to regular
+ * NVMe subsystems during association. It encapsulates the logic for
+ * transmitting LS requests over the NVMe over Fabrics (NVMe-oF) FC
+ * transport.
+ *
+ * Returns: 0 on success, or a negative error code on failure.
+ */
+int nvfnic_ls_req_send(struct nvme_fc_local_port *lport,
+ struct nvme_fc_remote_port *rport,
+ struct nvmefc_ls_req *ls_req)
+{
+ int timeout;
+ uint8_t *frame;
+ uint8_t fcid[3];
+ unsigned long flags = 0;
+ struct fnic_iport_s *iport = lport->private;
+ struct nvmefc_ls_req *pls_req;
+ struct fnic *fnic = iport->fnic;
+ struct fc_std_ls_req *pfc_std_ls_req;
+ struct nvfnic_ls_req *nvfnic_ls_req = ls_req->private;
+ uint16_t frame_size = FNIC_ETH_FCOE_HDRS_OFFSET +
+ sizeof(struct fc_frame_header) + ls_req->rqstlen;
+ struct fnic_tport_s *tport;
+
+ spin_lock_irqsave(&fnic->fnic_lock, flags);
+
+ tport = (struct fnic_tport_s *)rport->private;
+ INIT_LIST_HEAD(&nvfnic_ls_req->list);
+
+ if (!nvfnic_transport_ready(iport, tport)) {
+ FNIC_NVME_DBG(KERN_INFO, fnic,
+ "iport: 0x%x tport: 0x%x transport not ready\n",
+ iport->fcid, tport->fcid);
+ spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+ return -ENOLINK;
+ }
+
+ frame = fdls_alloc_frame(iport);
+ if (frame == NULL) {
+ FNIC_NVME_DBG(KERN_ERR, fnic,
+ "Failed to allocate frame to send NVME LS REQ");
+ spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+ return -ENOMEM;
+ }
+
+ if (fdls_alloc_oxid(iport, FNIC_FRAME_TYPE_NVME_LS,
+ &nvfnic_ls_req->oxid) == FNIC_UNASSIGNED_OXID) {
+ FNIC_FCS_DBG(KERN_INFO, fnic,
+ "0x%x: Failed to allocate OXID to send NVME LS REQ",
+ iport->fcid);
+ mempool_free(frame, fnic->frame_pool);
+ spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+ return -EAGAIN;
+ }
+
+ timer_setup(&nvfnic_ls_req->ls_req_timer, nvfnic_ls_req_timeout,
+ 0UL);
+
+ nvfnic_ls_req->fnic = fnic;
+ nvfnic_ls_req->tport = tport;
+ nvfnic_ls_req->state = FNIC_LS_REQ_CMD_INIT;
+ nvfnic_ls_req->ls_req = ls_req;
+
+ pfc_std_ls_req = (struct fc_std_ls_req *) (frame +
+ FNIC_ETH_FCOE_HDRS_OFFSET);
+ *pfc_std_ls_req = (struct fc_std_ls_req) {
+ .fchdr = {.fh_r_ctl = FC_RCTL_ELS4_REQ,
+ .fh_type = FC_TYPE_NVME,
+ .fh_f_ctl = {FNIC_ELS_REQ_FCTL, 0, 0},
+ .fh_rx_id = cpu_to_be16(FNIC_UNASSIGNED_RXID)}
+ };
+
+ hton24(fcid, iport->fcid);
+ FNIC_STD_SET_S_ID(pfc_std_ls_req->fchdr, fcid);
+
+ hton24(fcid, tport->fcid);
+ FNIC_STD_SET_D_ID(pfc_std_ls_req->fchdr, fcid);
+
+ FNIC_STD_SET_OX_ID(pfc_std_ls_req->fchdr, nvfnic_ls_req->oxid);
+
+ pls_req = (struct nvmefc_ls_req *) (frame + FNIC_ETH_FCOE_HDRS_OFFSET +
+ sizeof(struct fc_frame_header));
+ memcpy(pls_req, ls_req->rqstaddr, ls_req->rqstlen);
+
+ FNIC_NVME_DBG(KERN_INFO, fnic,
+ "0x%x: NVME send ls req with oxid: 0x%x type: 0x%02x len: %d",
+ iport->fcid, nvfnic_ls_req->oxid, *((uint8_t *) ls_req->rqstaddr),
+ ls_req->rqstlen);
+
+ list_add_tail(&nvfnic_ls_req->list, &tport->ls_req_list);
+ nvfnic_ls_req->state = FNIC_LS_REQ_CMD_PENDING;
+ spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+ fnic_send_fcoe_frame(iport, frame, frame_size);
+ timeout = FNIC_LS_REQ_TMO_MSECS(ls_req->timeout);
+ mod_timer(&nvfnic_ls_req->ls_req_timer,
+ round_jiffies(jiffies + msecs_to_jiffies(timeout)));
+
+ return 0;
+}
+
void nvfnic_local_port_delete(struct nvme_fc_local_port *lport)
{
struct fnic_iport_s *iport = (struct fnic_iport_s *) lport->private;
@@ -1544,7 +1652,7 @@ nvme_fc_port_template nvfnic_port = {
.remoteport_delete = nvfnic_remote_port_delete,
.create_queue = nvfnic_create_queue,
.delete_queue = NULL,
- .ls_req = NULL,
+ .ls_req = nvfnic_ls_req_send,
.ls_abort = nvfnic_ls_req_abort,
.fcp_io = nvfnic_fcpio_send,
.fcp_abort = nvfnic_fcpio_abort,
diff --git a/drivers/scsi/fnic/fnic_nvme.h b/drivers/scsi/fnic/fnic_nvme.h
index 22d69f40cd65..8cf9beb8c997 100644
--- a/drivers/scsi/fnic/fnic_nvme.h
+++ b/drivers/scsi/fnic/fnic_nvme.h
@@ -109,6 +109,9 @@ void nvfnic_ls_req_abort(struct nvme_fc_local_port *lport,
struct nvmefc_ls_req *lsreq);
int nvfnic_create_queue(struct nvme_fc_local_port *lport, unsigned int idx,
u16 size, void **handle);
+int nvfnic_ls_req_send(struct nvme_fc_local_port *lport,
+ struct nvme_fc_remote_port *rport,
+ struct nvmefc_ls_req *ls_req);
void nvfnic_ls_req_timeout(struct timer_list *t);
uint16_t nvfnic_alloc_ls_req_oxid(struct fnic_iport_s *iport);
struct nvfnic_ls_req *nvfnic_find_ls_req(struct fnic_tport_s *tport,
--
2.47.1
next prev parent reply other threads:[~2026-05-21 18:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-21 18:04 [PATCH 00/13] Introduce functionality for NVMe initiator Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 01/13] scsi: fnic: Make debug logging protocol independent Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 02/13] scsi: fnic: Use fnic_num for non-SCSI identifiers Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 03/13] scsi: fnic: Decode firmware role configuration Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 04/13] scsi: fnic: Advertise NVMe initiator service parameters Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 05/13] scsi: fnic: Add FDLS role handling for NVMe initiators Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 06/13] scsi: fnic: Add the NVMe/FC transport path Karan Tilak Kumar
2026-05-27 9:00 ` Marco Crivellari
2026-05-27 18:17 ` Karan Tilak Kumar (kartilak)
2026-05-21 18:04 ` [PATCH 07/13] scsi: fnic: Route completions and resets by initiator role Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 08/13] scsi: fnic: Handle NVMe LS frames in FDLS Karan Tilak Kumar
2026-05-21 18:04 ` Karan Tilak Kumar [this message]
2026-05-21 18:04 ` [PATCH 10/13] scsi: fnic: Abort timed-out NVMe LS requests Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 11/13] scsi: fnic: Track NVMe transport statistics Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 12/13] scsi: fnic: Expose NVMe transport state in debugfs Karan Tilak Kumar
2026-05-21 18:04 ` [PATCH 13/13] scsi: fnic: Bump up version number Karan Tilak Kumar
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=20260521180458.5448-10-kartilak@cisco.com \
--to=kartilak@cisco.com \
--cc=adakopou@redhat.com \
--cc=aeasi@cisco.com \
--cc=arulponn@cisco.com \
--cc=dan.carpenter@linaro.org \
--cc=djhawar@cisco.com \
--cc=gcboffa@cisco.com \
--cc=hare@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=jmeneghi@redhat.com \
--cc=lduncan@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mkai2@cisco.com \
--cc=revers@redhat.com \
--cc=satishkh@cisco.com \
--cc=sebaddel@cisco.com \
/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®