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

scsi: lpfc: Increase SCSI CQ and WQ sizes. 



Increased the sizes of the SCSI WQ's and CQ's so that SCSI operation is
similar to that used by NVME. However, size increase restricted only to
those newer adapters that can support the larger WQE size, thus bigger
queue sizes.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b95e29b7

drivers/scsi/lpfc/lpfc_init.c

+43 −22
Original line number Diff line number Diff line
@@ -7983,9 +7983,9 @@ lpfc_alloc_nvme_wq_cq(struct lpfc_hba *phba, int wqidx) 
{

	struct lpfc_queue *qdesc;



	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_NVME_PAGE_SIZE,

	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,

				      phba->sli4_hba.cq_esize,

				      LPFC_NVME_CQSIZE);

				      LPFC_CQE_EXP_COUNT);

	if (!qdesc) {

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				"0508 Failed allocate fast-path NVME CQ (%d)\n",
@@ -7994,8 +7994,8 @@ lpfc_alloc_nvme_wq_cq(struct lpfc_hba *phba, int wqidx) 
	}

	phba->sli4_hba.nvme_cq[wqidx] = qdesc;



	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_NVME_PAGE_SIZE,

				      LPFC_WQE128_SIZE, LPFC_NVME_WQSIZE);

	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,

				      LPFC_WQE128_SIZE, LPFC_WQE_EXP_COUNT);

	if (!qdesc) {

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				"0509 Failed allocate fast-path NVME WQ (%d)\n",
@@ -8011,9 +8011,15 @@ static int 
lpfc_alloc_fcp_wq_cq(struct lpfc_hba *phba, int wqidx)

{

	struct lpfc_queue *qdesc;

	uint32_t wqesize;



	/* Create Fast Path FCP CQs */

	if (phba->fcp_embed_io)

		/* Increase the CQ size when WQEs contain an embedded cdb */

		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,

					      phba->sli4_hba.cq_esize,

					      LPFC_CQE_EXP_COUNT);



	else

		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,

					      phba->sli4_hba.cq_esize,

					      phba->sli4_hba.cq_ecount);
@@ -8025,10 +8031,15 @@ lpfc_alloc_fcp_wq_cq(struct lpfc_hba *phba, int wqidx) 
	phba->sli4_hba.fcp_cq[wqidx] = qdesc;



	/* Create Fast Path FCP WQs */

	wqesize = (phba->fcp_embed_io) ?

		LPFC_WQE128_SIZE : phba->sli4_hba.wq_esize;

	if (phba->fcp_embed_io)

		/* Increase the WQ size when WQEs contain an embedded cdb */

		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_EXPANDED_PAGE_SIZE,

					      LPFC_WQE128_SIZE,

					      LPFC_WQE_EXP_COUNT);

	else

		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,

				      wqesize, phba->sli4_hba.wq_ecount);

					      phba->sli4_hba.wq_esize,

					      phba->sli4_hba.wq_ecount);

	if (!qdesc) {

		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,

				"0503 Failed allocate fast-path FCP WQ (%d)\n",
@@ -12216,7 +12227,6 @@ int 
lpfc_fof_queue_create(struct lpfc_hba *phba)

{

	struct lpfc_queue *qdesc;

	uint32_t wqesize;



	/* Create FOF EQ */

	qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,
@@ -12230,7 +12240,14 @@ lpfc_fof_queue_create(struct lpfc_hba *phba) 
	if (phba->cfg_fof) {



		/* Create OAS CQ */

		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,

		if (phba->fcp_embed_io)

			qdesc = lpfc_sli4_queue_alloc(phba,

						      LPFC_EXPANDED_PAGE_SIZE,

						      phba->sli4_hba.cq_esize,

						      LPFC_CQE_EXP_COUNT);

		else

			qdesc = lpfc_sli4_queue_alloc(phba,

						      LPFC_DEFAULT_PAGE_SIZE,

						      phba->sli4_hba.cq_esize,

						      phba->sli4_hba.cq_ecount);

		if (!qdesc)
@@ -12239,12 +12256,16 @@ lpfc_fof_queue_create(struct lpfc_hba *phba) 
		phba->sli4_hba.oas_cq = qdesc;



		/* Create OAS WQ */

		wqesize = (phba->fcp_embed_io) ?

				LPFC_WQE128_SIZE : phba->sli4_hba.wq_esize;

		qdesc = lpfc_sli4_queue_alloc(phba, LPFC_DEFAULT_PAGE_SIZE,

					      wqesize,

		if (phba->fcp_embed_io)

			qdesc = lpfc_sli4_queue_alloc(phba,

						      LPFC_EXPANDED_PAGE_SIZE,

						      LPFC_WQE128_SIZE,

						      LPFC_WQE_EXP_COUNT);

		else

			qdesc = lpfc_sli4_queue_alloc(phba,

						      LPFC_DEFAULT_PAGE_SIZE,

						      phba->sli4_hba.wq_esize,

						      phba->sli4_hba.wq_ecount);



		if (!qdesc)

			goto out_error;

drivers/scsi/lpfc/lpfc_nvme.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
 ********************************************************************/



#define LPFC_NVME_DEFAULT_SEGS		(64 + 1)	/* 256K IOs */

#define LPFC_NVME_WQSIZE		1024

#define LPFC_NVME_CQSIZE		4096



#define LPFC_NVME_ERSP_LEN		0x20

drivers/scsi/lpfc/lpfc_sli4.h

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ struct lpfc_queue { 
	uint32_t q_mode;

	uint16_t page_count;	/* Number of pages allocated for this queue */

	uint16_t page_size;	/* size of page allocated for this queue */

#define LPFC_NVME_PAGE_SIZE	16384

#define LPFC_EXPANDED_PAGE_SIZE	16384

#define LPFC_DEFAULT_PAGE_SIZE	4096

	uint16_t chann;		/* IO channel this queue is associated with */

	uint16_t db_format;
@@ -370,9 +370,9 @@ struct lpfc_bmbx { 


#define LPFC_EQE_DEF_COUNT	1024

#define LPFC_CQE_DEF_COUNT      1024

#define LPFC_CQE_EXP_COUNT      4096

#define LPFC_WQE_DEF_COUNT      256

#define LPFC_WQE128_DEF_COUNT   128

#define LPFC_WQE128_MAX_COUNT   256

#define LPFC_WQE_EXP_COUNT      1024

#define LPFC_MQE_DEF_COUNT      16

#define LPFC_RQE_DEF_COUNT	512

CRA Git | Maintained and supported by SUSTech CRA and CCSE