scsi: lpfc: Add embedded data pointers for enhanced performance (0bc2b7c5) · Commits · 戴 / test

drivers/scsi/lpfc/lpfc.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -840,6 +840,8 @@ struct lpfc_hba {
		#define LPFC_ENABLE_FCP 1
		#define LPFC_ENABLE_NVME 2
		#define LPFC_ENABLE_BOTH 3
		uint32_t nvme_embed_pbde;
		uint32_t fcp_embed_pbde;
		uint32_t io_channel_irqs; /* number of irqs for io channels */
		struct nvmet_fc_target_port *targetport;
		lpfc_vpd_t vpd; /* vital product data */

drivers/scsi/lpfc/lpfc_hw4.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -4226,6 +4226,9 @@ struct wqe_common {
		#define wqe_irsp_SHIFT 4
		#define wqe_irsp_MASK 0x00000001
		#define wqe_irsp_WORD word11
		#define wqe_pbde_SHIFT 5
		#define wqe_pbde_MASK 0x00000001
		#define wqe_pbde_WORD word11
		#define wqe_sup_SHIFT 6
		#define wqe_sup_MASK 0x00000001
		#define wqe_sup_WORD word11

drivers/scsi/lpfc/lpfc_init.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -10608,6 +10608,19 @@ lpfc_get_sli4_parameters(struct lpfc_hba phba, LPFC_MBOXQ_t mboxq)
		phba->cfg_enable_fc4_type = LPFC_ENABLE_FCP;
		}

		/* Only embed PBDE for if_type 6 */
		if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==
		LPFC_SLI_INTF_IF_TYPE_6) {
		phba->fcp_embed_pbde = 1;
		phba->nvme_embed_pbde = 1;
		}

		/* PBDE support requires xib be set */
		if (!bf_get(cfg_xib, mbx_sli4_parameters)) {
		phba->fcp_embed_pbde = 0;
		phba->nvme_embed_pbde = 0;
		}

		/*
		* To support Suppress Response feature we must satisfy 3 conditions.
		* lpfc_suppress_rsp module parameter must be set (default).
		@@ -10639,6 +10652,13 @@ lpfc_get_sli4_parameters(struct lpfc_hba phba, LPFC_MBOXQ_t mboxq)
		else
		phba->fcp_embed_io = 0;

		lpfc_printf_log(phba, KERN_INFO, LOG_INIT \| LOG_NVME,
		"6422 XIB %d: FCP %d %d NVME %d %d %d\n",
		bf_get(cfg_xib, mbx_sli4_parameters),
		phba->fcp_embed_pbde, phba->fcp_embed_io,
		phba->nvme_support, phba->nvme_embed_pbde,
		phba->cfg_suppress_rsp);

		if ((bf_get(cfg_cqpsize, mbx_sli4_parameters) & LPFC_CQ_16K_PAGE_SZ) &&
		(bf_get(cfg_wqpsize, mbx_sli4_parameters) & LPFC_WQ_16K_PAGE_SZ) &&
		(sli4_params->wqsize & LPFC_WQ_SZ128_SUPPORT))

drivers/scsi/lpfc/lpfc_nvme.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -1170,6 +1170,7 @@ lpfc_nvme_prep_io_dma(struct lpfc_vport *vport,
		struct sli4_sge *sgl = lpfc_ncmd->nvme_sgl;
		struct scatterlist *data_sg;
		struct sli4_sge *first_data_sgl;
		struct ulp_bde64 *bde;
		dma_addr_t physaddr;
		uint32_t num_bde = 0;
		uint32_t dma_len;
		@@ -1237,7 +1238,24 @@ lpfc_nvme_prep_io_dma(struct lpfc_vport *vport,
		data_sg = sg_next(data_sg);
		sgl++;
		}
		if (phba->nvme_embed_pbde) {
		/* Use PBDE support for first SGL only, offset == 0 */
		/* Words 13-15 */
		bde = (struct ulp_bde64 *)
		&wqe->words[13];
		bde->addrLow = first_data_sgl->addr_lo;
		bde->addrHigh = first_data_sgl->addr_hi;
		bde->tus.f.bdeSize =
		le32_to_cpu(first_data_sgl->sge_len);
		bde->tus.f.bdeFlags = BUFF_TYPE_BDE_64;
		bde->tus.w = cpu_to_le32(bde->tus.w);
		bf_set(wqe_pbde, &wqe->generic.wqe_com, 1);
		} else
		bf_set(wqe_pbde, &wqe->generic.wqe_com, 0);

		} else {
		bf_set(wqe_pbde, &wqe->generic.wqe_com, 0);

		/* For this clause to be valid, the payload_length
		* and sg_cnt must zero.
		*/

drivers/scsi/lpfc/lpfc_nvmet.c

+24 −0

Original line number	Diff line number	Diff line
		@@ -2150,9 +2150,11 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
		struct lpfc_iocbq *nvmewqe;
		struct scatterlist *sgel;
		union lpfc_wqe128 *wqe;
		struct ulp_bde64 *bde;
		uint32_t *txrdy;
		dma_addr_t physaddr;
		int i, cnt;
		int do_pbde;
		int xc = 1;

		if (!lpfc_is_link_up(phba)) {
		@@ -2243,6 +2245,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
		/* Word 7 */
		bf_set(wqe_pu, &wqe->fcp_tsend.wqe_com, 1);
		bf_set(wqe_cmnd, &wqe->fcp_tsend.wqe_com, CMD_FCP_TSEND64_WQE);
		do_pbde = 0;

		/* Word 8 */
		wqe->fcp_tsend.wqe_com.abort_tag = nvmewqe->iotag;
		@@ -2355,6 +2358,10 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
		bf_set(wqe_ar, &wqe->fcp_treceive.wqe_com, 0);
		bf_set(wqe_cmnd, &wqe->fcp_treceive.wqe_com,
		CMD_FCP_TRECEIVE64_WQE);
		if (phba->nvme_embed_pbde)
		do_pbde = 1;
		else
		do_pbde = 0;

		/* Word 8 */
		wqe->fcp_treceive.wqe_com.abort_tag = nvmewqe->iotag;
		@@ -2438,6 +2445,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
		bf_set(wqe_pu, &wqe->fcp_trsp.wqe_com, 0);
		bf_set(wqe_ag, &wqe->fcp_trsp.wqe_com, 1);
		bf_set(wqe_cmnd, &wqe->fcp_trsp.wqe_com, CMD_FCP_TRSP64_WQE);
		do_pbde = 0;

		/* Word 8 */
		wqe->fcp_trsp.wqe_com.abort_tag = nvmewqe->iotag;
		@@ -2508,9 +2516,25 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
		bf_set(lpfc_sli4_sge_last, sgl, 1);
		sgl->word2 = cpu_to_le32(sgl->word2);
		sgl->sge_len = cpu_to_le32(cnt);
		if (do_pbde && i == 0) {
		bde = (struct ulp_bde64 *)&wqe->words[13];
		memset(bde, 0, sizeof(struct ulp_bde64));
		/* Words 13-15 (PBDE)*/
		bde->addrLow = sgl->addr_lo;
		bde->addrHigh = sgl->addr_hi;
		bde->tus.f.bdeSize =
		le32_to_cpu(sgl->sge_len);
		bde->tus.f.bdeFlags = BUFF_TYPE_BDE_64;
		bde->tus.w = cpu_to_le32(bde->tus.w);
		}
		sgl++;
		ctxp->offset += cnt;
		}

		if (do_pbde)
		bf_set(wqe_pbde, &wqe->generic.wqe_com, 1);
		else
		bf_set(wqe_pbde, &wqe->generic.wqe_com, 0);
		ctxp->state = LPFC_NVMET_STE_DATA;
		ctxp->entry_cnt++;
		return nvmewqe;

Admin message