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, adakopou@redhat.com,
lduncan@suse.com, Karan Tilak Kumar <kartilak@cisco.com>,
Hannes Reinecke <hare@kernel.org>
Subject: [PATCH v5 12/13] scsi: fnic: Expose NVMe transport state in debugfs
Date: Tue, 23 Jun 2026 21:43:33 -0700 [thread overview]
Message-ID: <20260624044334.3079-13-kartilak@cisco.com> (raw)
In-Reply-To: <20260624044334.3079-1-kartilak@cisco.com>
Create an NVMe debugfs directory with a per-host nvmef_info file.
Report local-port and target-port identifiers for NVMe initiator
instances, and initialize and remove the debugfs entries with the NVMe
probe and teardown paths.
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>
---
Changes between v2 and v3:
Limit nvmef_info debugfs output to the allocated buffer.
Changes between v4 and v5:
Incorporate review comments from Sashiko:
Clean up NVMe debugfs on probe errors
---
drivers/scsi/fnic/fnic.h | 5 ++
drivers/scsi/fnic/fnic_debugfs.c | 94 ++++++++++++++++++++++++++++++++
drivers/scsi/fnic/fnic_main.c | 4 ++
drivers/scsi/fnic/fnic_nvme.c | 30 ++++++++++
drivers/scsi/fnic/fnic_nvme.h | 1 +
drivers/scsi/fnic/fnic_stats.h | 7 +++
6 files changed, 141 insertions(+)
diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 86293e112b34..507c22d21882 100644
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -478,6 +478,8 @@ struct fnic {
/*** FIP related data members -- end ***/
/* NVME data members */
+ struct dentry *fnic_nvmef_debugfs_host;
+ struct dentry *fnic_nvmef_debugfs_file;
struct sbitmap nvfnic_tag_map;
struct work_struct nvme_io_cmpl_work;
atomic_t nvme_io_event_queued;
@@ -551,6 +553,9 @@ void fnic_log_q_error(struct fnic *fnic);
void fnic_handle_link_event(struct fnic *fnic);
int fnic_stats_debugfs_init(struct fnic *fnic);
void fnic_stats_debugfs_remove(struct fnic *fnic);
+void fnic_nvmef_debugfs_init(struct fnic *fnic);
+void fnic_nvmef_debugfs_remove(struct fnic *fnic);
+int nvfnic_get_nvmef_info(struct fnic *fnic, struct fnic_nvmef_info *info);
int fnic_is_abts_pending(struct fnic *, struct scsi_cmnd *);
void fnic_handle_fip_frame(struct work_struct *work);
diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index 467fba29ea5f..61f167e20574 100644
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -10,10 +10,19 @@
extern int fnic_get_debug_info(struct stats_debug_info *debug_buffer,
struct fnic *fnic);
+static int fnic_nvmef_debugfs_open(struct inode *inode,
+ struct file *file);
+static ssize_t fnic_nvmef_debugfs_read(struct file *file,
+ char __user *ubuf,
+ size_t nbytes, loff_t *pos);
+static int fnic_nvmef_debugfs_release(struct inode *inode,
+ struct file *file);
+
static struct dentry *fnic_trace_debugfs_root;
static struct dentry *fnic_trace_debugfs_file;
static struct dentry *fnic_trace_enable;
static struct dentry *fnic_stats_debugfs_root;
+static struct dentry *fnic_nvmef_debugfs_root;
static struct dentry *fnic_fc_trace_debugfs_file;
static struct dentry *fnic_fc_rdata_trace_debugfs_file;
@@ -46,6 +55,9 @@ int fnic_debugfs_init(void)
fnic_stats_debugfs_root = debugfs_create_dir("statistics",
fnic_trace_debugfs_root);
+ fnic_nvmef_debugfs_root = debugfs_create_dir("nvme_info",
+ fnic_trace_debugfs_root);
+
/* Allocate memory to structure */
fc_trc_flag = vmalloc(sizeof(struct fc_trace_flag_type));
@@ -70,6 +82,9 @@ int fnic_debugfs_init(void)
*/
void fnic_debugfs_terminate(void)
{
+ debugfs_remove(fnic_nvmef_debugfs_root);
+ fnic_nvmef_debugfs_root = NULL;
+
debugfs_remove(fnic_stats_debugfs_root);
fnic_stats_debugfs_root = NULL;
@@ -669,6 +684,13 @@ static const struct file_operations fnic_reset_debugfs_fops = {
.release = fnic_reset_stats_release,
};
+static const struct file_operations fnic_nvmef_debugfs_fops = {
+ .owner = THIS_MODULE,
+ .open = fnic_nvmef_debugfs_open,
+ .read = fnic_nvmef_debugfs_read,
+ .release = fnic_nvmef_debugfs_release,
+};
+
/*
* fnic_stats_init - Initialize stats struct and create stats file per fnic
*
@@ -722,3 +744,75 @@ void fnic_stats_debugfs_remove(struct fnic *fnic)
debugfs_remove(fnic->fnic_stats_debugfs_host);
fnic->fnic_stats_debugfs_host = NULL;
}
+
+void fnic_nvmef_debugfs_init(struct fnic *fnic)
+{
+ char name[16];
+
+ snprintf(name, sizeof(name), "host%d", fnic->fnic_num);
+
+ fnic->fnic_nvmef_debugfs_host = debugfs_create_dir(name,
+ fnic_nvmef_debugfs_root);
+ fnic->fnic_nvmef_debugfs_file = debugfs_create_file("nvmef_info",
+ S_IFREG | 0444,
+ fnic->fnic_nvmef_debugfs_host,
+ fnic,
+ &fnic_nvmef_debugfs_fops);
+}
+
+static int fnic_nvmef_debugfs_open(struct inode *inode, struct file *file)
+{
+
+ struct fnic *fnic = inode->i_private;
+ struct fnic_nvmef_info *info;
+ int buf_size = 2 * PAGE_SIZE;
+
+ info = kzalloc_obj(struct fnic_nvmef_info, GFP_KERNEL);
+ if (!info)
+ return -ENOMEM;
+
+ info->info_buffer = vmalloc(buf_size);
+ if (!info->info_buffer) {
+ kfree(info);
+ return -ENOMEM;
+ }
+
+ info->buf_size = buf_size;
+ memset((void *)info->info_buffer, 0, buf_size);
+ info->buffer_len = nvfnic_get_nvmef_info(fnic, info);
+
+ file->private_data = info;
+
+ return 0;
+}
+
+static ssize_t fnic_nvmef_debugfs_read(struct file *file,
+ char __user *ubuf,
+ size_t nbytes, loff_t *pos)
+{
+ struct fnic_nvmef_info *info = file->private_data;
+
+ return simple_read_from_buffer(ubuf, nbytes, pos,
+ info->info_buffer, info->buffer_len);
+}
+
+static int fnic_nvmef_debugfs_release(struct inode *inode, struct file *file)
+{
+ struct fnic_nvmef_info *info = file->private_data;
+
+ vfree(info->info_buffer);
+ kfree(info);
+ return 0;
+}
+
+void fnic_nvmef_debugfs_remove(struct fnic *fnic)
+{
+ if (!fnic)
+ return;
+
+ debugfs_remove(fnic->fnic_nvmef_debugfs_file);
+ fnic->fnic_nvmef_debugfs_file = NULL;
+
+ debugfs_remove(fnic->fnic_nvmef_debugfs_host);
+ fnic->fnic_nvmef_debugfs_host = NULL;
+}
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index df8c8ebbc32b..245db1b992b5 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -933,6 +933,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err = -EOPNOTSUPP;
goto err_out_fnic_role;
case VFCF_FC_NVME_INITIATOR:
+ fnic_nvmef_debugfs_init(fnic);
fnic->role = FNIC_ROLE_NVME_INITIATOR;
dev_info(&fnic->pdev->dev, "fnic: %d is NVME initiator\n",
fnic->fnic_num);
@@ -1207,6 +1208,8 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_out_fnic_alloc_vnic_res:
fnic_clear_intr_mode(fnic);
err_out_fnic_set_intr_mode:
+ if (IS_FNIC_NVME_INITIATOR(fnic))
+ fnic_nvmef_debugfs_remove(fnic);
if (IS_FNIC_FCP_INITIATOR(fnic))
scsi_host_put(fnic->host);
err_out_fnic_role:
@@ -1277,6 +1280,7 @@ static void fnic_remove(struct pci_dev *pdev)
if ((fnic_fdmi_support == 1) && (fnic->iport.fabric.fdmi_pending > 0))
timer_delete_sync(&fnic->iport.fabric.fdmi_timer);
+ fnic_nvmef_debugfs_remove(fnic);
fnic_stats_debugfs_remove(fnic);
/*
diff --git a/drivers/scsi/fnic/fnic_nvme.c b/drivers/scsi/fnic/fnic_nvme.c
index e322dd4dcb78..a19dd9cf76cf 100644
--- a/drivers/scsi/fnic/fnic_nvme.c
+++ b/drivers/scsi/fnic/fnic_nvme.c
@@ -188,6 +188,36 @@ void nvfnic_release_nvme_ioreq_buf(struct fnic_iport_s *iport,
fnic->io_sgl_pool[io_req->sgl_type]);
}
+int nvfnic_get_nvmef_info(struct fnic *fnic, struct fnic_nvmef_info *info)
+{
+ int len = 0;
+ struct fnic_iport_s *iport = &fnic->iport;
+ int buf_size = info->buf_size;
+ struct fnic_tport_s *tport;
+ struct fnic_tport_s *next;
+ unsigned long flags;
+
+ if (buf_size <= 0)
+ return 0;
+
+ len += scnprintf(info->info_buffer + len, buf_size - len,
+ "lport wwpn 0x%llx wwnn 0x%llx fcid 0x%06x\n",
+ iport->wwpn, iport->wwnn, iport->fcid);
+
+ spin_lock_irqsave(&fnic->fnic_lock, flags);
+ list_for_each_entry_safe(tport, next, &iport->tport_list, links) {
+ if (len >= buf_size - 1)
+ break;
+
+ len += scnprintf(info->info_buffer + len, buf_size - len,
+ "tport wwpn 0x%llx wwnn 0x%llx fcid 0x%06x\n",
+ tport->wwpn, tport->wwnn, tport->fcid);
+ }
+ spin_unlock_irqrestore(&fnic->fnic_lock, flags);
+
+ return len;
+}
+
inline int nvfnic_queue_wq_nvme_copy_desc(struct fnic *fnic,
struct vnic_wq_copy *wq,
struct fnic_io_req *io_req,
diff --git a/drivers/scsi/fnic/fnic_nvme.h b/drivers/scsi/fnic/fnic_nvme.h
index ebdaf6930f8e..62e2a3e68449 100644
--- a/drivers/scsi/fnic/fnic_nvme.h
+++ b/drivers/scsi/fnic/fnic_nvme.h
@@ -133,6 +133,7 @@ void nvfnic_terminate_tport_admin_ios(struct fnic *fnic,
struct fnic_tport_s *tport);
void nvfnic_cleanup_tport_io(struct fnic *fnic, struct fnic_tport_s *tport);
void nvfnic_nvme_unload(struct fnic *fnic);
+int nvfnic_get_nvmef_info(struct fnic *fnic, struct fnic_nvmef_info *info);
void nvfnic_exch_reset(struct fnic_iport_s *iport, struct fnic_tport_s *tport);
void nvfnic_nvme_iodone_work(struct work_struct *work);
#else
diff --git a/drivers/scsi/fnic/fnic_stats.h b/drivers/scsi/fnic/fnic_stats.h
index fc81e4a7e29e..a3ddd7b55729 100644
--- a/drivers/scsi/fnic/fnic_stats.h
+++ b/drivers/scsi/fnic/fnic_stats.h
@@ -191,6 +191,13 @@ struct stats_debug_info {
int buffer_len;
};
+struct fnic_nvmef_info {
+ char *info_buffer;
+ void *i_private;
+ int buf_size;
+ int buffer_len;
+};
+
int fnic_get_stats_data(struct stats_debug_info *, struct fnic_stats *);
const char *fnic_role_to_str(unsigned int role);
#endif /* _FNIC_STATS_H_ */
--
2.47.1
next prev parent reply other threads:[~2026-06-24 4:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-24 4:43 [PATCH v5 00/13] Introduce functionality for NVMe initiator Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 01/13] scsi: fnic: Make debug logging protocol independent Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 02/13] scsi: fnic: Use fnic_num for non-SCSI identifiers Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 03/13] scsi: fnic: Decode firmware role configuration Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 04/13] scsi: fnic: Advertise NVMe initiator service parameters Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 05/13] scsi: fnic: Add FDLS role handling for NVMe initiators Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 06/13] scsi: fnic: Add the NVMe/FC transport path Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 07/13] scsi: fnic: Route completions and resets by initiator role Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 08/13] scsi: fnic: Handle NVMe LS frames in FDLS Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 09/13] scsi: fnic: Send NVMe LS requests through FDLS Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 10/13] scsi: fnic: Abort timed-out NVMe LS requests Karan Tilak Kumar
2026-06-24 4:43 ` [PATCH v5 11/13] scsi: fnic: Track NVMe transport statistics Karan Tilak Kumar
2026-06-24 4:43 ` Karan Tilak Kumar [this message]
2026-06-24 4:43 ` [PATCH v5 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=20260624044334.3079-13-kartilak@cisco.com \
--to=kartilak@cisco.com \
--cc=adakopou@redhat.com \
--cc=aeasi@cisco.com \
--cc=arulponn@cisco.com \
--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®