Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Commit cd22d605 authored Aug 23, 2017 by Dick Kennedy Committed by Martin K. Petersen Aug 24, 2017

scsi: lpfc: Correct return error codes to align with nvme_fc transport



Modify driver return error codes to align with host nvme transport.

Driver isn't returning Exxx error codes to properly reflect out of
resource or connectivity conditions (-EBUSY), yet there were hard error
conditions returning -EBUSY.

Ensure the following situations return the proper return code:

 - Temporary failures or temporary resource availability: -EBUSY

 - Connectivity issues: -ENODEV

All others are treated as hard errors and return an -Exxx value that
indicates the type of error.

Also, lpfc_sli4_issue_wqe() was modified to not translate error from
-Exxx to WQE state.  This allows lpfc_nvme_fcp_io_submit() routine to
just return whatever -E value was returned from other routines.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent ffb70cd6

drivers/scsi/lpfc/lpfc_nvme.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -364,7 +364,7 @@ lpfc_nvme_gen_req(struct lpfc_vport vport, struct lpfc_dmabuf bmp,
		genwqe->sli4_xritag, genwqe->iotag, ndlp->nlp_DID);

		rc = lpfc_sli4_issue_wqe(phba, LPFC_ELS_RING, genwqe);
		if (rc == WQE_ERROR) {
		if (rc) {
		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
		"6045 Issue GEN REQ WQE to NPORT x%x "
		"Data: x%x x%x\n",
		@@ -1270,7 +1270,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
		* not exceed the programmed depth.
		*/
		if (atomic_read(&ndlp->cmd_pending) >= ndlp->cmd_qdepth) {
		ret = -EAGAIN;
		ret = -EBUSY;
		goto out_fail;
		}

		@@ -1279,7 +1279,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport,
		lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_IOERR,
		"6065 driver's buffer pool is empty, "
		"IO failed\n");
		ret = -ENOMEM;
		ret = -EBUSY;
		goto out_fail;
		}
		#ifdef CONFIG_SCSI_LPFC_DEBUG_FS
		@@ -1332,7 +1332,6 @@ 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 = -EBUSY;
		goto out_free_nvme_buf;
		}

		@@ -1576,7 +1575,7 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport,
		abts_buf->wqe_cmpl = lpfc_nvme_abort_fcreq_cmpl;
		ret_val = lpfc_sli4_issue_wqe(phba, LPFC_FCP_RING, abts_buf);
		spin_unlock_irqrestore(&phba->hbalock, flags);
		if (ret_val == IOCB_ERROR) {
		if (ret_val) {
		lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME_ABTS,
		"6137 Failed abts issue_wqe with status x%x "
		"for nvme_fcreq %p.\n",

drivers/scsi/lpfc/lpfc_sli.c

+14 −9

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ lpfc_get_iocb_from_iocbq(struct lpfc_iocbq *iocbq)
		* -ENOMEM.
		* The caller is expected to hold the hbalock when calling this routine.
		**/
		static uint32_t
		static int
		lpfc_sli4_wq_put(struct lpfc_queue q, union lpfc_wqe wqe)
		{
		union lpfc_wqe *temp_wqe;
		@@ -123,7 +123,7 @@ lpfc_sli4_wq_put(struct lpfc_queue q, union lpfc_wqe wqe)
		idx = ((q->host_index + 1) % q->entry_count);
		if (idx == q->hba_index) {
		q->WQ_overflow++;
		return -ENOMEM;
		return -EBUSY;
		}
		q->WQ_posted++;
		/* set consumption flag every once in a while */
		@@ -10741,7 +10741,7 @@ lpfc_sli4_abort_nvme_io(struct lpfc_hba phba, struct lpfc_sli_ring pring,
		abtsiocbp->vport = vport;
		abtsiocbp->wqe_cmpl = lpfc_nvme_abort_fcreq_cmpl;
		retval = lpfc_sli4_issue_wqe(phba, LPFC_FCP_RING, abtsiocbp);
		if (retval == IOCB_ERROR) {
		if (retval) {
		lpfc_printf_vlog(vport, KERN_ERR, LOG_NVME,
		"6147 Failed abts issue_wqe with status x%x "
		"for oxid x%x\n",
		@@ -18888,6 +18888,7 @@ lpfc_sli4_issue_wqe(struct lpfc_hba *phba, uint32_t ring_number,
		struct lpfc_sglq *sglq;
		struct lpfc_sli_ring *pring;
		unsigned long iflags;
		uint32_t ret = 0;

		/* NVME_LS and NVME_LS ABTS requests. */
		if (pwqe->iocb_flag & LPFC_IO_NVME_LS) {
		@@ -18906,10 +18907,12 @@ lpfc_sli4_issue_wqe(struct lpfc_hba *phba, uint32_t ring_number,
		}
		bf_set(wqe_xri_tag, &pwqe->wqe.xmit_bls_rsp.wqe_com,
		pwqe->sli4_xritag);
		if (lpfc_sli4_wq_put(phba->sli4_hba.nvmels_wq, wqe)) {
		ret = lpfc_sli4_wq_put(phba->sli4_hba.nvmels_wq, wqe);
		if (ret) {
		spin_unlock_irqrestore(&pring->ring_lock, iflags);
		return WQE_ERROR;
		return ret;
		}

		lpfc_sli_ringtxcmpl_put(phba, pring, pwqe);
		spin_unlock_irqrestore(&pring->ring_lock, iflags);
		return 0;
		@@ -18924,9 +18927,10 @@ lpfc_sli4_issue_wqe(struct lpfc_hba *phba, uint32_t ring_number,
		wq = phba->sli4_hba.nvme_wq[pwqe->hba_wqidx];
		bf_set(wqe_cqid, &wqe->generic.wqe_com,
		phba->sli4_hba.nvme_cq[pwqe->hba_wqidx]->queue_id);
		if (lpfc_sli4_wq_put(wq, wqe)) {
		ret = lpfc_sli4_wq_put(wq, wqe);
		if (ret) {
		spin_unlock_irqrestore(&pring->ring_lock, iflags);
		return WQE_ERROR;
		return ret;
		}
		lpfc_sli_ringtxcmpl_put(phba, pring, pwqe);
		spin_unlock_irqrestore(&pring->ring_lock, iflags);
		@@ -18950,9 +18954,10 @@ lpfc_sli4_issue_wqe(struct lpfc_hba *phba, uint32_t ring_number,
		wq = phba->sli4_hba.nvme_wq[pwqe->hba_wqidx];
		bf_set(wqe_cqid, &wqe->generic.wqe_com,
		phba->sli4_hba.nvme_cq[pwqe->hba_wqidx]->queue_id);
		if (lpfc_sli4_wq_put(wq, wqe)) {
		ret = lpfc_sli4_wq_put(wq, wqe);
		if (ret) {
		spin_unlock_irqrestore(&pring->ring_lock, iflags);
		return WQE_ERROR;
		return ret;
		}
		lpfc_sli_ringtxcmpl_put(phba, pring, pwqe);
		spin_unlock_irqrestore(&pring->ring_lock, iflags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE