From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from rcdn-iport-8.cisco.com (rcdn-iport-8.cisco.com [173.37.86.79]) (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 CCEDD1E7660; Thu, 21 May 2026 18:12:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.37.86.79 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779387157; cv=none; b=BBamWVgnmUB0lFcZNE0iApNQstgGWJHzTQCB3rEUR6MBQlQ6W7MCTGSjgB54OhCKiFibNvSwvuO81BQA4I7MNXH2V2gtUDsH61r+wC0gUW0E0kVk8H8VflEGPJBIZlz+5svwtLudkfhvSVR4ssl60BzNpdJp7YOrNtlYHOiu8ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779387157; c=relaxed/simple; bh=yDrUyH6gJhKXxjoAoMvjnCu1IHIyGYzKVA5rUdzQDeY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IheY2IZd1i5NkJxqLrVXYBD4yJrTAh33pzrSDyVF9/EJXUWUtIqPQTnrWWsVCCO2+hQ/bA2pjQJD+lxiHdmh+T3CmQ8sz/pcR3gX+tDbBbfjtr3xHcHBb38dog5ednaWwhdVatZnJ6MMJ/LKH753m8/WhguKC7eaHTQ+SriMl8Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cisco.com; spf=pass smtp.mailfrom=cisco.com; dkim=pass (2048-bit key) header.d=cisco.com header.i=@cisco.com header.b=JKlFzmmV; arc=none smtp.client-ip=173.37.86.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cisco.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cisco.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cisco.com header.i=@cisco.com header.b="JKlFzmmV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cisco.com; i=@cisco.com; l=9314; q=dns/txt; s=iport01; t=1779387155; x=1780596755; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4tPPyHKjcfzJ9xbbgFsx++3ImOG25vrRbed8OUdI14k=; b=JKlFzmmV4t64clsyzMO1UEOPbLHzuaFKrmqFLamq24aWDRZu6jI7rutQ JxjfbkXysOjNPUSbaipZyGxLo28uCqQ7C95DCmbLXL1pzkWM/ZpfMlH8R n0VLzDsSJ6giCmgnVrRSj/5yGZ+5BxK9UkiGCgxDBwZvNlYsn7dRXGxZW xAnAD4hIrm4bGBy0drDORgnBytuyoJVnGIHwP2OqdM/qfm0lOx11eL/2R v4Ve6SoGj2Kwxto9pNGHQYYv42PwSegTlq6I6IcCjrLX2GDnTtgJyACP/ c33m6dRp4C6xrlVbpnZXpehKttKBiQ800GE030SyWCU0sOOY5zcIvBJFI A==; X-CSE-ConnectionGUID: Xb/7CVA0QfyGBN341rZB8A== X-CSE-MsgGUID: MrjlgAxlSze/f6jbikxseQ== X-IPAS-Result: =?us-ascii?q?A0BDAgCeSg9q/5L/Ja1aglmCV4FQQxkwlCqCIYEWnQiBf?= =?us-ascii?q?w8BAQEPUQQBAYUGAo0yAiY0CQ4BAgQDAgMBAQEBAQEBAQEBAQsBAQUBAQECA?= =?us-ascii?q?QcFgQ4ThlyGWwIBAycLAUYQUVYZgwKCdAO0F4F5M4EB3kGBZAELFAGBOI1cd?= =?us-ascii?q?IR7JxUGgUlEgRWCcgdvgVKJNQSDLo8cSIEeA1ksAVUTDQoLBwWBZgM1EioVb?= =?us-ascii?q?jIdgSM+F4ELGwcFgUuBN3JqgQSEV3gjLANOgS2BawMLGA1IESw3FBsEPm4Hi?= =?us-ascii?q?nkcD4IqB4EOAYE8CGQXY5JjCpAdgiGBNZ9ZhCahWBozhASUFZJRmQWpQIFoP?= =?us-ascii?q?IFZMxoIGxWDIlMZD44tFsseJzI9AQEHAgcOAwuBaJF9AQE?= IronPort-Data: A9a23:jgeaeqtL115YyQGRt0f/fi7slufnVN1fMUV32f8akzHdYApBsoF/q tZmKTqBPq7YZGbzf4siYdjno08PvJKGyNYwQFZorSw9FHlEgMeUXt7xwmUckM+xwmwvaGo9s q3yv/GZdJhcokf0/0nrav666yEgiclkf5KkYMbcICd9WAR4fykojBNnioYRj5Vh6TSDK1vlV eja/YuFZDdJ5xYuajhKs//Z8Usz1BjPkGpwUmIWNKgjUGD2zxH5PLpHTYmtIn3xRJVjH+LSb 47r0LGj82rFyAwmA9Wjn6yTWhVirmn6ZFXmZtJ+AsBOszAazsAA+v9T2Mk0NS+7vw60c+VZk 72hg3AfpTABZcUgkMxFO/VR/roX0aduoNcrKlDn2SCfItGvn3bEm51T4E8K0YIwyuwwXkpw3 KQhJiEiRDbY27us8pjrY7w57igjBJGD0II3oHpsy3TdSP0hW52GG/SM7t5D1zB2jcdLdRrcT 5NGMnw0M1KaPkAJYwtJYH49tL/Aan3XcDRCtFORrKkf6GnIxws327/oWDbQUoDVGJUOxB3I/ Aoq+UzcGBMeO/WPzQGX/zWi2O3FnCDrQ48rQejQGvlCxQf7KnYoIB0fT1aTovSjjEO6HdVFJ CQ89iMo66M77lSmSMXwRTW8oXiNpBlaXMBfe8U45QOH4q7V5RuJQGkOS3hKb9lOnMo/XyAr0 BmRks/kHyditpWSU3uW8rrSpjS3UQAcIWYBYjcDUCMf7tXjqZ11hRXKJv5hFaOzg9L1GBnqz jyKpTR4jLIW5eYR2ru250vvmT+gppHVCAUy423/Wm646AhwYqa+epelr1Pc6J5oKIefU0nEv 3UencWaxP4BAIvLlyGXRugJWraz6J6tNDzanE4qBJI69hyz9HO5O4Nd+jdzIAFuKMlsRNPyS FXYtQUU4NpYO2GnKPcmJYmwEM8ti6PnELwJS8zpUzaHWbApHCfvwc2kTRX4M7zF+KT0rZwCB A== IronPort-HdrOrdr: A9a23:hL1VDq70s0gNeQ7HpQPXwALXdLJyesId70hD6qm+c3Bom6uj5q STdZsguyMc5Ax6ZJhko6HiBEDiewK4yXcW2+gs1N6ZNWGMhILrFvAB0WKI+VLd8kPFm9J15O NJb7V+BNrsDVJzkMr2pDWjH81I+qjhzEnRv4fj5kYoax12YKd96Ao8IAOaHkpqADRiP/MCZf yhDg4tnUvZRZzRBf7Lf0U4Yw== X-Talos-CUID: 9a23:eayNv2AUcQRDa7v6ExltsxE/JOl9S3PM4132eBPhE1RDGJTAHA== X-Talos-MUID: 9a23:O1po9AqThC2O0ojFIjAezxR4NsNnyrSqM1IA1ptYucOFNjxrNg7I2Q== X-IronPort-Anti-Spam-Filtered: true X-IronPort-AV: E=Sophos;i="6.24,160,1774310400"; d="scan'208";a="475832382" Received: from rcdn-l-core-09.cisco.com ([173.37.255.146]) by rcdn-iport-8.cisco.com with ESMTP/TLS/TLS_AES_256_GCM_SHA384; 21 May 2026 18:12:34 +0000 Received: from fedora.lan?044cisco.com (unknown [10.188.18.181]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kartilak@cisco.com) by rcdn-l-core-09.cisco.com (Postfix) with ESMTPSA id 40DDE1800059F; Thu, 21 May 2026 18:12:33 +0000 (GMT) From: Karan Tilak Kumar 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 , Hannes Reinecke Subject: [PATCH 12/13] scsi: fnic: Expose NVMe transport state in debugfs Date: Thu, 21 May 2026 11:04:57 -0700 Message-ID: <20260521180458.5448-13-kartilak@cisco.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260521180458.5448-1-kartilak@cisco.com> References: <20260521180458.5448-1-kartilak@cisco.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-User: kartilak@cisco.com X-Outbound-Client-TLS: ANONYMOUS;unknown [10.188.18.181];TLSv1.3;TLS_AES_256_GCM_SHA384;256 X-Outbound-SMTP-Client: 10.188.18.181, [10.188.18.181] X-Outbound-Node: rcdn-l-core-09.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 Reviewed-by: Arulprabhu Ponnusamy Reviewed-by: Gian Carlo Boffa Reviewed-by: Arun Easi Reviewed-by: Hannes Reinecke Reviewed-by: Lee Duncan Signed-off-by: Karan Tilak Kumar Co-developed-by: Hannes Reinecke --- drivers/scsi/fnic/fnic.h | 5 ++ drivers/scsi/fnic/fnic_debugfs.c | 96 ++++++++++++++++++++++++++++++++ drivers/scsi/fnic/fnic_main.c | 10 ++++ drivers/scsi/fnic/fnic_nvme.c | 24 ++++++++ drivers/scsi/fnic/fnic_nvme.h | 1 + drivers/scsi/fnic/fnic_stats.h | 7 +++ 6 files changed, 143 insertions(+) diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 86293e112b34..951549aff521 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); +int 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..690b1c6ecf01 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,77 @@ void fnic_stats_debugfs_remove(struct fnic *fnic) debugfs_remove(fnic->fnic_stats_debugfs_host); fnic->fnic_stats_debugfs_host = NULL; } + +int 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 | + 0200, + fnic->fnic_nvmef_debugfs_host, + fnic, + &fnic_nvmef_debugfs_fops); + return 0; +} + +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 1831aa5c5911..5d585bfb28e1 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c @@ -933,6 +933,15 @@ 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: + err = fnic_nvmef_debugfs_init(fnic); + if (err) { + dev_info(&fnic->pdev->dev, + "fnic(%d) Failed to initialize debugfs for nvmef\n", + fnic->fnic_num); + fnic_nvmef_debugfs_remove(fnic); + goto err_out_fnic_role; + } + fnic->role = FNIC_ROLE_NVME_INITIATOR; dev_info(&fnic->pdev->dev, "fnic: %d is NVME initiator\n", fnic->fnic_num); @@ -1277,6 +1286,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 cf6a0ec963ea..5ae9d31c6070 100644 --- a/drivers/scsi/fnic/fnic_nvme.c +++ b/drivers/scsi/fnic/fnic_nvme.c @@ -176,6 +176,30 @@ 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; + + len += snprintf(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) { + len += snprintf(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 8cf9beb8c997..642747b6d7c1 100644 --- a/drivers/scsi/fnic/fnic_nvme.h +++ b/drivers/scsi/fnic/fnic_nvme.h @@ -131,6 +131,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); extern const char *fnic_fcpio_status_to_str(unsigned int status); void nvfnic_nvme_iodone_work(struct work_struct *work); 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