Skip to contentSkip to conversation

lpfc: Fix compilation errors on kernels with no CONFIG_DEBUG_FS

PATCH Superseded James Smart 2 participants 3 messages Aug 30, 2021 – Sep 8, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lpfc: Fix compilation errors on kernels with no CONFIG_DEBUG_FS

The Kernel test robot flagged the following warning:
".../lpfc_init.c:7788:35: error: 'struct lpfc_sli4_hba' has no member named 'c_stat'"

Reviewing this issue highlighted that one of the recent patches caused the driver to no longer compile cleanly if CONFIG_DEBUG_FS is not set.

Correct the different areas that are failing to compile.

Fixes 02243836ad6f ("scsi: lpfc: Add support for the CM framework")
---
 drivers/scsi/lpfc/lpfc_init.c | 12 ++++++++----
 drivers/scsi/lpfc/lpfc_nvme.c |  2 --
 drivers/scsi/lpfc/lpfc_scsi.c |  4 ----
 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +8 -4
index d3f1fa38269f..a6127a51b4fe 100644
@@ -8254,7 +8254,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
 		lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
 				"3331 Failed allocating per cpu cgn stats\n");
 		rc = -ENOMEM;
-		goto out_free_hba_hdwq_info;
+#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
+		goto out_free_hba_hdwq_stat;
+#else
+		goto out_free_hba_idle_stat;
+#endif
 	}
 
 	/*
@@ -8276,12 +8280,12 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
 
 	return 0;
 
-out_free_hba_hdwq_info:
-	free_percpu(phba->sli4_hba.c_stat);
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
+out_free_hba_hdwq_stat:
+	free_percpu(phba->sli4_hba.c_stat);
+#endif
 out_free_hba_idle_stat:
 	kfree(phba->sli4_hba.idle_stat);
-#endif
 out_free_hba_eq_info:
 	free_percpu(phba->sli4_hba.eq_info);
 out_free_hba_cpu_map:
drivers/scsi/lpfc/lpfc_nvme.c +0 -2
index 73a3568ff17e..479b3eed6208 100644
@@ -1489,9 +1489,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
 	struct lpfc_nvme_qhandle *lpfc_queue_info;
 	struct lpfc_nvme_fcpreq_priv *freqpriv;
 	struct nvme_common_command *sqe;
-#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 	uint64_t start = 0;
-#endif
 
 	/* Validate pointers. LLDD fault handling with transport does
 	 * have timing races.
drivers/scsi/lpfc/lpfc_scsi.c +0 -4
index 0fde1e874c7a..dae5cc03e8c2 100644
@@ -5578,12 +5578,8 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)
 	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 	int err, idx;
 	u8 *uuid = NULL;
-#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 	uint64_t start = 0L;
 
-	if (phba->ktime_on)
-		start = ktime_get_ns();
-#endif
 	start = ktime_get_ns();
 	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);
 
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · James Smart

The Kernel test robot flagged the following warning:
".../lpfc_init.c:7788:35: error: 'struct lpfc_sli4_hba' has no member named 'c_stat'"

Reviewing this issue highlighted that one of the recent patches caused the driver to no longer compile cleanly if CONFIG_DEBUG_FS is not set.

Quoted 6 lines

Correct the different areas that are failing to compile.

Fixes 02243836ad6f ("scsi: lpfc: Add support for the CM framework")

I got bit by this in certain configurations, it would be helpful to get this into mainline sooner rather than later.

Couple of comments below.

Quoted 24 lines
---
 drivers/scsi/lpfc/lpfc_init.c | 12 ++++++++----
 drivers/scsi/lpfc/lpfc_nvme.c |  2 --
 drivers/scsi/lpfc/lpfc_scsi.c |  4 ----
 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +5 -1
index d3f1fa38269f..a6127a51b4fe 100644
@@ -8254,7 +8254,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
 		lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
 				"3331 Failed allocating per cpu cgn stats\n");
 		rc = -ENOMEM;
-		goto out_free_hba_hdwq_info;
+#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
+		goto out_free_hba_hdwq_stat;
+#else
+		goto out_free_hba_idle_stat;
+#endif
 	}
 
 	/*

drivers/scsi/lpfc/lpfc_init.c lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) · line 8279

Quoted 4 lines
drivers/scsi/lpfc/lpfc_init.c +0 -1
@@ -8276,12 +8280,12 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
 
 	return 0;
 
-out_free_hba_hdwq_info:

Wouldn't it be simpler to just move the ifdef up one line and the endif down one line to avoid the ifdef in the first hunk?

Quoted 30 lines
drivers/scsi/lpfc/lpfc_init.c +3 -2
-	free_percpu(phba->sli4_hba.c_stat);
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
+out_free_hba_hdwq_stat:
+	free_percpu(phba->sli4_hba.c_stat);
+#endif
 out_free_hba_idle_stat:
 	kfree(phba->sli4_hba.idle_stat);
-#endif
 out_free_hba_eq_info:
 	free_percpu(phba->sli4_hba.eq_info);
 out_free_hba_cpu_map:
drivers/scsi/lpfc/lpfc_nvme.c +0 -2
index 73a3568ff17e..479b3eed6208 100644
@@ -1489,9 +1489,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
 	struct lpfc_nvme_qhandle *lpfc_queue_info;
 	struct lpfc_nvme_fcpreq_priv *freqpriv;
 	struct nvme_common_command *sqe;
-#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 	uint64_t start = 0;
-#endif
 
 	/* Validate pointers. LLDD fault handling with transport does
 	 * have timing races.
drivers/scsi/lpfc/lpfc_scsi.c +0 -0
index 0fde1e874c7a..dae5cc03e8c2 100644

drivers/scsi/lpfc/lpfc_scsi.c lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) · line 5583

Quoted 10 lines
drivers/scsi/lpfc/lpfc_scsi.c +0 -4
@@ -5578,12 +5578,8 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)
 	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 	int err, idx;
 	u8 *uuid = NULL;
-#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 	uint64_t start = 0L;
 
-	if (phba->ktime_on)
-		start = ktime_get_ns();
-#endif
 	start = ktime_get_ns();

Someone is probably going to come along and complain that the 0L is a dead store. I would remove the assignment at the least but it might be worth combining the two lines.

Quoted 4 lines
drivers/scsi/lpfc/lpfc_scsi.c +0 -0
 	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);
 
Signature · 1 line
2.26.2
#2 lore raw
Quoted 47 lines · Nathan Chancellor
Quoted 7 lines · James Smart

The Kernel test robot flagged the following warning:
".../lpfc_init.c:7788:35: error: 'struct lpfc_sli4_hba' has no member named 'c_stat'"

Reviewing this issue highlighted that one of the recent patches caused the driver to no longer compile cleanly if CONFIG_DEBUG_FS is not set.

Quoted 6 lines

Correct the different areas that are failing to compile.

Fixes 02243836ad6f ("scsi: lpfc: Add support for the CM framework")

I got bit by this in certain configurations, it would be helpful to get this into mainline sooner rather than later.

Couple of comments below.

Quoted 25 lines
---
  drivers/scsi/lpfc/lpfc_init.c | 12 ++++++++----
  drivers/scsi/lpfc/lpfc_nvme.c |  2 --
  drivers/scsi/lpfc/lpfc_scsi.c |  4 ----
  3 files changed, 8 insertions(+), 10 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +5 -1
index d3f1fa38269f..a6127a51b4fe 100644
@@ -8254,7 +8254,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
  		lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
  				"3331 Failed allocating per cpu cgn stats\n");
  		rc = -ENOMEM;
-		goto out_free_hba_hdwq_info;
+#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
+		goto out_free_hba_hdwq_stat;
+#else
+		goto out_free_hba_idle_stat;
+#endif
  	}
 
  	/*
@@ -8276,12 +8280,12 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
 
Quoted 6 lines

drivers/scsi/lpfc/lpfc_init.c lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) · line 8279

Quoted 3 lines
drivers/scsi/lpfc/lpfc_init.c +0 -1
  	return 0;
 
-out_free_hba_hdwq_info:

Wouldn't it be simpler to just move the ifdef up one line and the endif down one line to avoid the ifdef in the first hunk?

Yep. It is simpler.

Quoted 1 line

...

Quoted 4 lines

Someone is probably going to come along and complain that the 0L is a dead store. I would remove the assignment at the least but it might be worth combining the two lines.

NP. I'll take care of it.

-- james