public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: jsmart2021@gmail.com
To: linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org
Cc: James Smart <jsmart2021@gmail.com>,
	Dick Kennedy <dick.kennedy@broadcom.com>,
	James Smart <james.smart@broadcom.com>
Subject: [PATCH 08/20] lpfc: Fix IO submission if WQ is full
Date: Sat,  4 Mar 2017 09:30:28 -0800	[thread overview]
Message-ID: <1488648640-5170-9-git-send-email-jsmart2021@gmail.com> (raw)
In-Reply-To: <1488648640-5170-1-git-send-email-jsmart2021@gmail.com>

From: James Smart <jsmart2021@gmail.com>

For both initiator and target: if WQ is full, return -EBUSY.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
---
 drivers/scsi/lpfc/lpfc_nvme.c  | 2 +-
 drivers/scsi/lpfc/lpfc_nvmet.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index bf3ccc5..e1bf31e 100644
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -1310,7 +1310,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
 				 "sid: x%x did: x%x oxid: x%x\n",
 				 ret, vport->fc_myDID, ndlp->nlp_DID,
 				 lpfc_ncmd->cur_iocbq.sli4_xritag);
-		ret = -EINVAL;
+		ret = -EBUSY;
 		goto out_free_nvme_buf;
 	}
 
diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c
index 6c2221a..735e2ba 100644
--- a/drivers/scsi/lpfc/lpfc_nvmet.c
+++ b/drivers/scsi/lpfc/lpfc_nvmet.c
@@ -571,6 +571,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,
 		lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR,
 				"6102 Bad state IO x%x aborted\n",
 				ctxp->oxid);
+		rc = -ENXIO;
 		goto aerr;
 	}
 
@@ -580,6 +581,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,
 		lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR,
 				"6152 FCP Drop IO x%x: Prep\n",
 				ctxp->oxid);
+		rc = -ENXIO;
 		goto aerr;
 	}
 
@@ -618,8 +620,9 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport,
 	ctxp->wqeq->hba_wqidx = 0;
 	nvmewqeq->context2 = NULL;
 	nvmewqeq->context3 = NULL;
+	rc = -EBUSY;
 aerr:
-	return -ENXIO;
+	return rc;
 }
 
 static void
-- 
2.5.0

  parent reply	other threads:[~2017-03-04 17:30 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-04 17:30 [PATCH 00/20] lpfc: Update lpfc to revision 11.2.0.10 jsmart2021
2017-03-04 17:30 ` [PATCH 01/20] scsi: lpfc: remove redundant assignment of sgel jsmart2021
2017-03-04 17:30 ` [PATCH 02/20] scsi: lpfc: sanity check hrq is null before dereferencing it jsmart2021
2017-03-04 17:30 ` [PATCH 03/20] scsi: lpfc: don't dereference dma_buf->iocbq before null check jsmart2021
2017-03-04 17:30 ` [PATCH 04/20] scsi: lpfc: fix missing spin_unlock on sql_list_lock jsmart2021
2017-03-04 17:30 ` [PATCH 05/20] lpfc: Fix crash during Hardware error recovery on SLI3 adapters jsmart2021
2017-03-04 17:30 ` [PATCH 06/20] lpfc: Fix RCTL value on NVME LS request and response jsmart2021
2017-03-04 17:30 ` [PATCH 07/20] lpfc: Fix NVME CMD IU byte swapped word 1 problem jsmart2021
2017-03-04 17:30 ` jsmart2021 [this message]
2017-03-04 17:30 ` [PATCH 09/20] lpfc: Fix nvme allocation bug on failed nvme_fc_register_localport jsmart2021
2017-03-04 17:30 ` [PATCH 10/20] lpfc: add NVME exchange aborts jsmart2021
2017-03-04 17:30 ` [PATCH 11/20] lpfc: Fix eh_deadline setting for sli3 adapters jsmart2021
2017-03-04 23:51   ` Laurence Oberman
2017-03-04 17:30 ` [PATCH 12/20] lpfc: add transport eh_timed_out reference jsmart2021
2017-03-04 17:30 ` [PATCH 13/20] lpfc: Rework lpfc Kconfig for NVME options jsmart2021
2017-03-04 17:30 ` [PATCH 14/20] lpfc: Rename LPFC_MAX_EQ_DELAY to LPFC_MAX_EQ_DELAY_EQID_CNT jsmart2021
2017-03-04 17:30 ` [PATCH 15/20] lpfc: correct double print jsmart2021
2017-03-04 17:30 ` [PATCH 16/20] lpfc: remove dead sli3 nvme code jsmart2021
2017-03-04 17:30 ` [PATCH 17/20] lpfc: correct rdp diag portnames jsmart2021
2017-03-04 17:30 ` [PATCH 18/20] lpfc: code cleanups in NVME initiator base jsmart2021
2017-03-04 17:30 ` [PATCH 19/20] lpfc: code cleanups in NVME initiator discovery jsmart2021
2017-03-04 17:30 ` [PATCH 20/20] lpfc: revise version number to 11.2.0.10 jsmart2021
2017-03-07  4:09 ` [PATCH 00/20] lpfc: Update lpfc to revision 11.2.0.10 Martin K. Petersen

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=1488648640-5170-9-git-send-email-jsmart2021@gmail.com \
    --to=jsmart2021@gmail.com \
    --cc=dick.kennedy@broadcom.com \
    --cc=james.smart@broadcom.com \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@vger.kernel.org \
    /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