scsi: lpfc: remove left-over BUILD_NVME defines (1052b41b) · Commits · 戴 / test

The BUILD_NVME define never got defined anywhere, causing NVMe commands to be treated as SCSI commands when freeing the buffers. This was causing a stuck discovery and a horrible crash in lpfc_set_rrq_active() later on. Link: https://lore.kernel.org/r/20191017150019.75769-1-hare@suse.de Fixes: ("scsi: lpfc: Merge per-protocol WQ/CQ pairs into single per-cpu pair") Signed-off-by:

Hannes Reinecke <hare@suse.com> Reviewed-by:

James Smart <james.smart@broadcom.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/lpfc/lpfc_init.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -9053,7 +9053,6 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)
		}
		}

		#if defined(BUILD_NVME)
		/* Clear NVME stats */
		if (phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME) {
		for (idx = 0; idx < phba->cfg_hdw_queue; idx++) {
		@@ -9061,7 +9060,6 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)
		sizeof(phba->sli4_hba.hdwq[idx].nvme_cstat));
		}
		}
		#endif

		/* Clear SCSI stats */
		if (phba->cfg_enable_fc4_type & LPFC_ENABLE_FCP) {

drivers/scsi/lpfc/lpfc_scsi.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -528,7 +528,6 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba,
		list_del_init(&psb->list);
		psb->exch_busy = 0;
		psb->status = IOSTAT_SUCCESS;
		#ifdef BUILD_NVME
		if (psb->cur_iocbq.iocb_flag == LPFC_IO_NVME) {
		qp->abts_nvme_io_bufs--;
		spin_unlock(&qp->abts_io_buf_list_lock);
		@@ -536,7 +535,6 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba,
		lpfc_sli4_nvme_xri_aborted(phba, axri, psb);
		return;
		}
		#endif
		qp->abts_scsi_io_bufs--;
		spin_unlock(&qp->abts_io_buf_list_lock);

Admin message