scsi: lpfc: Separate NVMET data buffer pool fir ELS/CT. (3c603be9) · Commits · e / devices / android_kernel_teracube_emerald

drivers/scsi/lpfc/lpfc.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -943,6 +943,7 @@ struct lpfc_hba {
	struct pci_pool *lpfc_mbuf_pool;		struct pci_pool *lpfc_mbuf_pool;
	struct pci_pool lpfc_hrb_pool; / header receive buffer pool */		struct pci_pool lpfc_hrb_pool; / header receive buffer pool */
	struct pci_pool lpfc_drb_pool; / data receive buffer pool */		struct pci_pool lpfc_drb_pool; / data receive buffer pool */
			struct pci_pool lpfc_nvmet_drb_pool; / data receive buffer pool */
	struct pci_pool lpfc_hbq_pool; / SLI3 hbq buffer pool */		struct pci_pool lpfc_hbq_pool; / SLI3 hbq buffer pool */
	struct pci_pool *txrdy_payload_pool;		struct pci_pool *txrdy_payload_pool;
	struct lpfc_dma_pool lpfc_mbuf_safety_pool;		struct lpfc_dma_pool lpfc_mbuf_safety_pool;

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -271,6 +271,7 @@ int lpfc_sli4_fcf_rr_next_proc(struct lpfc_vport *, uint16_t);
	void lpfc_sli4_clear_fcf_rr_bmask(struct lpfc_hba *);		void lpfc_sli4_clear_fcf_rr_bmask(struct lpfc_hba *);

	int lpfc_mem_alloc(struct lpfc_hba *, int align);		int lpfc_mem_alloc(struct lpfc_hba *, int align);
			int lpfc_nvmet_mem_alloc(struct lpfc_hba *phba);
	int lpfc_mem_alloc_active_rrq_pool_s4(struct lpfc_hba *);		int lpfc_mem_alloc_active_rrq_pool_s4(struct lpfc_hba *);
	void lpfc_mem_free(struct lpfc_hba *);		void lpfc_mem_free(struct lpfc_hba *);
	void lpfc_mem_free_all(struct lpfc_hba *);		void lpfc_mem_free_all(struct lpfc_hba *);

drivers/scsi/lpfc/lpfc_hw4.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1356,6 +1356,7 @@ struct lpfc_mbx_wq_destroy {

	#define LPFC_HDR_BUF_SIZE 128		#define LPFC_HDR_BUF_SIZE 128
	#define LPFC_DATA_BUF_SIZE 2048		#define LPFC_DATA_BUF_SIZE 2048
			#define LPFC_NVMET_DATA_BUF_SIZE 128
	struct rq_context {		struct rq_context {
	uint32_t word0;		uint32_t word0;
	#define lpfc_rq_context_rqe_count_SHIFT 16 /* Version 0 Only */		#define lpfc_rq_context_rqe_count_SHIFT 16 /* Version 0 Only */

drivers/scsi/lpfc/lpfc_init.c

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5956,16 +5956,21 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
	for (i = 0; i < lpfc_enable_nvmet_cnt; i++) {		for (i = 0; i < lpfc_enable_nvmet_cnt; i++) {
	if (wwn == lpfc_enable_nvmet[i]) {		if (wwn == lpfc_enable_nvmet[i]) {
	#if (IS_ENABLED(CONFIG_NVME_TARGET_FC))		#if (IS_ENABLED(CONFIG_NVME_TARGET_FC))
			if (lpfc_nvmet_mem_alloc(phba))
			break;

			phba->nvmet_support = 1; /* a match */

	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
	"6017 NVME Target %016llx\n",		"6017 NVME Target %016llx\n",
	wwn);		wwn);
	phba->nvmet_support = 1; /* a match */
	#else		#else
	lpfc_printf_log(phba, KERN_ERR, LOG_INIT,		lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
	"6021 Can't enable NVME Target."		"6021 Can't enable NVME Target."
	" NVME_TARGET_FC infrastructure"		" NVME_TARGET_FC infrastructure"
	" is not in kernel\n");		" is not in kernel\n");
	#endif		#endif
			break;
	}		}
	}		}
	}		}

drivers/scsi/lpfc/lpfc_mem.c

+26 −7

Original line number	Original line	Diff line number	Diff line
	@@ -214,6 +214,21 @@ lpfc_mem_alloc(struct lpfc_hba *phba, int align)
	return -ENOMEM;		return -ENOMEM;
	}		}

			int
			lpfc_nvmet_mem_alloc(struct lpfc_hba *phba)
			{
			phba->lpfc_nvmet_drb_pool =
			pci_pool_create("lpfc_nvmet_drb_pool",
			phba->pcidev, LPFC_NVMET_DATA_BUF_SIZE,
			SGL_ALIGN_SZ, 0);
			if (!phba->lpfc_nvmet_drb_pool) {
			lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
			"6024 Can't enable NVME Target - no memory\n");
			return -ENOMEM;
			}
			return 0;
			}

	/**		/**
	* lpfc_mem_free - Frees memory allocated by lpfc_mem_alloc		* lpfc_mem_free - Frees memory allocated by lpfc_mem_alloc
	* @phba: HBA to free memory for		* @phba: HBA to free memory for
	@@ -232,6 +247,9 @@ lpfc_mem_free(struct lpfc_hba *phba)

	/* Free HBQ pools */		/* Free HBQ pools */
	lpfc_sli_hbqbuf_free_all(phba);		lpfc_sli_hbqbuf_free_all(phba);
			if (phba->lpfc_nvmet_drb_pool)
			pci_pool_destroy(phba->lpfc_nvmet_drb_pool);
			phba->lpfc_nvmet_drb_pool = NULL;
	if (phba->lpfc_drb_pool)		if (phba->lpfc_drb_pool)
	pci_pool_destroy(phba->lpfc_drb_pool);		pci_pool_destroy(phba->lpfc_drb_pool);
	phba->lpfc_drb_pool = NULL;		phba->lpfc_drb_pool = NULL;
	@@ -624,20 +642,20 @@ lpfc_sli4_nvmet_alloc(struct lpfc_hba *phba)
	kfree(dma_buf);		kfree(dma_buf);
	return NULL;		return NULL;
	}		}
	dma_buf->dbuf.virt = pci_pool_alloc(phba->lpfc_drb_pool, GFP_KERNEL,		dma_buf->dbuf.virt = pci_pool_alloc(phba->lpfc_nvmet_drb_pool,
	&dma_buf->dbuf.phys);		GFP_KERNEL, &dma_buf->dbuf.phys);
	if (!dma_buf->dbuf.virt) {		if (!dma_buf->dbuf.virt) {
	pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,		pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,
	dma_buf->hbuf.phys);		dma_buf->hbuf.phys);
	kfree(dma_buf);		kfree(dma_buf);
	return NULL;		return NULL;
	}		}
	dma_buf->total_size = LPFC_DATA_BUF_SIZE;		dma_buf->total_size = LPFC_NVMET_DATA_BUF_SIZE;

	dma_buf->context = kzalloc(sizeof(struct lpfc_nvmet_rcv_ctx),		dma_buf->context = kzalloc(sizeof(struct lpfc_nvmet_rcv_ctx),
	GFP_KERNEL);		GFP_KERNEL);
	if (!dma_buf->context) {		if (!dma_buf->context) {
	pci_pool_free(phba->lpfc_drb_pool, dma_buf->dbuf.virt,		pci_pool_free(phba->lpfc_nvmet_drb_pool, dma_buf->dbuf.virt,
	dma_buf->dbuf.phys);		dma_buf->dbuf.phys);
	pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,		pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,
	dma_buf->hbuf.phys);		dma_buf->hbuf.phys);
	@@ -648,7 +666,7 @@ lpfc_sli4_nvmet_alloc(struct lpfc_hba *phba)
	dma_buf->iocbq = lpfc_sli_get_iocbq(phba);		dma_buf->iocbq = lpfc_sli_get_iocbq(phba);
	if (!dma_buf->iocbq) {		if (!dma_buf->iocbq) {
	kfree(dma_buf->context);		kfree(dma_buf->context);
	pci_pool_free(phba->lpfc_drb_pool, dma_buf->dbuf.virt,		pci_pool_free(phba->lpfc_nvmet_drb_pool, dma_buf->dbuf.virt,
	dma_buf->dbuf.phys);		dma_buf->dbuf.phys);
	pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,		pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,
	dma_buf->hbuf.phys);		dma_buf->hbuf.phys);
	@@ -678,7 +696,7 @@ lpfc_sli4_nvmet_alloc(struct lpfc_hba *phba)
	if (!dma_buf->sglq) {		if (!dma_buf->sglq) {
	lpfc_sli_release_iocbq(phba, dma_buf->iocbq);		lpfc_sli_release_iocbq(phba, dma_buf->iocbq);
	kfree(dma_buf->context);		kfree(dma_buf->context);
	pci_pool_free(phba->lpfc_drb_pool, dma_buf->dbuf.virt,		pci_pool_free(phba->lpfc_nvmet_drb_pool, dma_buf->dbuf.virt,
	dma_buf->dbuf.phys);		dma_buf->dbuf.phys);
	pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,		pci_pool_free(phba->lpfc_hrb_pool, dma_buf->hbuf.virt,
	dma_buf->hbuf.phys);		dma_buf->hbuf.phys);
	@@ -718,7 +736,8 @@ lpfc_sli4_nvmet_free(struct lpfc_hba phba, struct rqb_dmabuf dmab)
	lpfc_sli_release_iocbq(phba, dmab->iocbq);		lpfc_sli_release_iocbq(phba, dmab->iocbq);
	kfree(dmab->context);		kfree(dmab->context);
	pci_pool_free(phba->lpfc_hrb_pool, dmab->hbuf.virt, dmab->hbuf.phys);		pci_pool_free(phba->lpfc_hrb_pool, dmab->hbuf.virt, dmab->hbuf.phys);
	pci_pool_free(phba->lpfc_drb_pool, dmab->dbuf.virt, dmab->dbuf.phys);		pci_pool_free(phba->lpfc_nvmet_drb_pool,
			dmab->dbuf.virt, dmab->dbuf.phys);
	kfree(dmab);		kfree(dmab);
	}		}