Commit db7531d2 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Convert abort handling to SLI-3 and SLI-4 handlers 

This patch reworks the abort interfaces such that SLI-3 retains the
iocb-based formatting and completions and SLI-4 now uses native WQEs and
completion routines.

The following changes are made:

 - The code is refactored from a confusing 2 routine sequence of
   xx_abort_iotag_issue(), which creates/formats and abort cmd, and
   xx_issue_abort_tag(), which then issues and handles the completion of
   the abort cmd - into a single interface of xx_issue_abort_iotag().  The
   new interface will determine whether SLI-3 or SLI-4 and then call the
   appropriate handler. A completion handler can now be specified to
   address the differences in completion handling.  Note: original code is
   all iocb based, with SLI-4 converting to SLI-3 for the SCSI/ELS path,
   and NVMe natively using wqes.

 - The SLI-3 side is refactored:

   The older iocb-base lpfc_sli_issue_abort_iotag() routine is combined
   with the logic of lpfc_sli_abort_iotag_issue() as well as the
   iocb-specific code in lpfc_abort_handler() and lpfc_sli_abort_iocb() to
   create the new single SLI-3 abort routine that formats and issues the
   iocb.

 - The SLI-4 side is refactored and added to:

   The native WQE abort code in NVMe is moved to the new SLI-4
   issue_abort_iotag() routine. Items in SCSI that set fields not set by
   NVMe is migrated into the new routine. Thus the routine supports NVMe
   and SCSI initiators. The nvmet block (target) formats the abort slightly
   different (like the old NVMe initiator) thus it has its own prep routine
   stolen from NVMe initiator and it retains the current code it has for
   issuing the WQE (does not use the commonized routine the initiators
   do). SLI-4 completion handlers were also added.

 - lpfc_abort_handler now becomes a wrapper that determines whether
   SLI-3 or SLI-4 and calls the proper abort handler.

Link: https://lore.kernel.org/r/20201115192646.12977-16-james.smart@broadcom.com


Co-developed-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 96e209be

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -5927,7 +5927,7 @@ lpfc_bsg_timeout(struct bsg_job *job) 
			}

		}

		if (list_empty(&completions))

			lpfc_sli_issue_abort_iotag(phba, pring, cmdiocb);

			lpfc_sli_issue_abort_iotag(phba, pring, cmdiocb, NULL);

		spin_unlock_irqrestore(&phba->hbalock, flags);

		if (!list_empty(&completions)) {

			lpfc_sli_cancel_iocbs(phba, &completions,
@@ -5964,7 +5964,7 @@ lpfc_bsg_timeout(struct bsg_job *job) 
			}

		}

		if (list_empty(&completions))

			lpfc_sli_issue_abort_iotag(phba, pring, cmdiocb);

			lpfc_sli_issue_abort_iotag(phba, pring, cmdiocb, NULL);

		spin_unlock_irqrestore(&phba->hbalock, flags);

		if (!list_empty(&completions)) {

			lpfc_sli_cancel_iocbs(phba, &completions,

drivers/scsi/lpfc/lpfc_crtn.h

+5 −2
Original line number Diff line number Diff line
@@ -324,6 +324,8 @@ int lpfc_sli_issue_fcp_io(struct lpfc_hba *phba, uint32_t ring_number, 
			  struct lpfc_iocbq *piocb, uint32_t flag);

int lpfc_sli4_issue_wqe(struct lpfc_hba *phba, struct lpfc_sli4_hdw_queue *qp,

			struct lpfc_iocbq *pwqe);

int lpfc_sli4_issue_abort_iotag(struct lpfc_hba *phba,

			struct lpfc_iocbq *cmdiocb, void *cmpl);

struct lpfc_sglq *__lpfc_clear_active_sglq(struct lpfc_hba *phba, uint16_t xri);

struct lpfc_sglq *__lpfc_sli_get_nvmet_sglq(struct lpfc_hba *phba,

					    struct lpfc_iocbq *piocbq);
@@ -348,7 +350,7 @@ int lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *, uint32_t); 
void lpfc_sli_hbqbuf_free_all(struct lpfc_hba *);

int lpfc_sli_hbq_size(void);

int lpfc_sli_issue_abort_iotag(struct lpfc_hba *, struct lpfc_sli_ring *,

			       struct lpfc_iocbq *);

			       struct lpfc_iocbq *, void *);

int lpfc_sli_sum_iocb(struct lpfc_vport *, uint16_t, uint64_t, lpfc_ctx_cmd);

int lpfc_sli_abort_iocb(struct lpfc_vport *, struct lpfc_sli_ring *, uint16_t,

			uint64_t, lpfc_ctx_cmd);
@@ -371,6 +373,8 @@ int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, uint32_t, 
			     uint32_t);

void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *,

			     struct lpfc_iocbq *);

void lpfc_sli4_abort_fcp_cmpl(struct lpfc_hba *h, struct lpfc_iocbq *i,

			      struct lpfc_wcqe_complete *w);



void lpfc_sli_free_hbq(struct lpfc_hba *, struct hbq_dmabuf *);
@@ -595,7 +599,6 @@ void lpfc_io_ktime(struct lpfc_hba *phba, struct lpfc_io_buf *ncmd); 
void lpfc_wqe_cmd_template(void);

void lpfc_nvmet_cmd_template(void);

void lpfc_nvme_cancel_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *pwqeIn);

void lpfc_nvme_prep_abort_wqe(struct lpfc_iocbq *pwqeq, u16 xritag, u8 opt);

extern int lpfc_enable_nvmet_cnt;

extern unsigned long long lpfc_enable_nvmet[];

extern int lpfc_no_hba_reset_cnt;

drivers/scsi/lpfc/lpfc_els.c

+4 −3
Original line number Diff line number Diff line
@@ -1424,7 +1424,8 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba) 
		if (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) {

			ndlp = (struct lpfc_nodelist *)(iocb->context1);

			if (ndlp && (ndlp->nlp_DID == Fabric_DID))

				lpfc_sli_issue_abort_iotag(phba, pring, iocb);

				lpfc_sli_issue_abort_iotag(phba, pring, iocb,

							   NULL);

		}

	}

	spin_unlock_irq(&phba->hbalock);
@@ -8135,7 +8136,7 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport) 
			 remote_ID, cmd->ulpCommand, cmd->ulpIoTag);

		spin_lock_irq(&phba->hbalock);

		list_del_init(&piocb->dlist);

		lpfc_sli_issue_abort_iotag(phba, pring, piocb);

		lpfc_sli_issue_abort_iotag(phba, pring, piocb, NULL);

		spin_unlock_irq(&phba->hbalock);

	}
@@ -8235,7 +8236,7 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport) 
	list_for_each_entry_safe(piocb, tmp_iocb, &abort_list, dlist) {

		spin_lock_irqsave(&phba->hbalock, iflags);

		list_del_init(&piocb->dlist);

		lpfc_sli_issue_abort_iotag(phba, pring, piocb);

		lpfc_sli_issue_abort_iotag(phba, pring, piocb, NULL);

		spin_unlock_irqrestore(&phba->hbalock, iflags);

	}

	if (!list_empty(&abort_list))

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −1
Original line number Diff line number Diff line
@@ -5610,7 +5610,7 @@ lpfc_free_tx(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) 
		icmd = &iocb->iocb;

		if (icmd->ulpCommand == CMD_ELS_REQUEST64_CR ||

		    icmd->ulpCommand == CMD_XMIT_ELS_RSP64_CX) {

			lpfc_sli_issue_abort_iotag(phba, pring, iocb);

			lpfc_sli_issue_abort_iotag(phba, pring, iocb, NULL);

		}

	}

	spin_unlock_irq(&phba->hbalock);

drivers/scsi/lpfc/lpfc_nportdisc.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) 
	list_for_each_entry_safe(iocb, next_iocb, &abort_list, dlist) {

			spin_lock_irq(&phba->hbalock);

			list_del_init(&iocb->dlist);

			lpfc_sli_issue_abort_iotag(phba, pring, iocb);

			lpfc_sli_issue_abort_iotag(phba, pring, iocb, NULL);

			spin_unlock_irq(&phba->hbalock);

	}