Commit 2afc95bf authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] be2iscsi: Moving to pci_pools v3 



This patch contains changes to use pci_pools for iscsi hdr
instead of pci_alloc_consistent. Here we alloc and free to pool
for every IO

v3:
- Remove cleanup loop in beiscsi_session_destroy
- Fixup for allocation failure handling in beiscsi_alloc_pdu
- Removed unused variable in beiscsi_session_destroy.

[jejb: fix up pci_pool_alloc address sizing problem]
Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent b8b9e1b8

drivers/scsi/be2iscsi/be_iscsi.c

+18 −28
Original line number Diff line number Diff line
@@ -45,14 +45,9 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, 
	struct beiscsi_endpoint *beiscsi_ep;

	struct iscsi_cls_session *cls_session;

	struct beiscsi_hba *phba;

	struct iscsi_task *task;

	struct iscsi_session *sess;

	struct beiscsi_session *beiscsi_sess;

	struct beiscsi_io_task *io_task;

	unsigned int max_size, num_cmd;

	dma_addr_t bus_add;

	u64 pa_addr;

	void *vaddr;



	SE_DEBUG(DBG_LVL_8, "In beiscsi_session_create\n");
@@ -80,20 +75,18 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, 
	if (!cls_session)

		return NULL;

	sess = cls_session->dd_data;

	max_size = ALIGN(sizeof(struct be_cmd_bhs), 64) * sess->cmds_max;

	vaddr = pci_alloc_consistent(phba->pcidev, max_size, &bus_add);

	pa_addr = (__u64) bus_add;



	for (num_cmd = 0; num_cmd < sess->cmds_max; num_cmd++) {

		task = sess->cmds[num_cmd];

		io_task = task->dd_data;

		io_task->cmd_bhs = vaddr;

		io_task->bhs_pa.u.a64.address = pa_addr;

		io_task->alloc_size = max_size;

		vaddr += ALIGN(sizeof(struct be_cmd_bhs), 64);

		pa_addr += ALIGN(sizeof(struct be_cmd_bhs), 64);

	}

	beiscsi_sess = sess->dd_data;

	beiscsi_sess->bhs_pool =  pci_pool_create("beiscsi_bhs_pool",

						   phba->pcidev,

						   sizeof(struct be_cmd_bhs),

						   64, 0);

	if (!beiscsi_sess->bhs_pool)

		goto destroy_sess;



	return cls_session;

destroy_sess:

	iscsi_session_teardown(cls_session);

	return NULL;

}



/**
@@ -105,18 +98,10 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, 
 */

void beiscsi_session_destroy(struct iscsi_cls_session *cls_session)

{

	struct iscsi_task *task;

	struct beiscsi_io_task *io_task;

	struct iscsi_session *sess = cls_session->dd_data;

	struct Scsi_Host *shost = iscsi_session_to_shost(cls_session);

	struct beiscsi_hba *phba = iscsi_host_priv(shost);

	struct beiscsi_session *beiscsi_sess = sess->dd_data;



	task = sess->cmds[0];

	io_task = task->dd_data;

	pci_free_consistent(phba->pcidev,

			    io_task->alloc_size,

			    io_task->cmd_bhs,

			    io_task->bhs_pa.u.a64.address);

	pci_pool_destroy(beiscsi_sess->bhs_pool);

	iscsi_session_teardown(cls_session);

}
@@ -133,6 +118,8 @@ beiscsi_conn_create(struct iscsi_cls_session *cls_session, u32 cid) 
	struct iscsi_cls_conn *cls_conn;

	struct beiscsi_conn *beiscsi_conn;

	struct iscsi_conn *conn;

	struct iscsi_session *sess;

	struct beiscsi_session *beiscsi_sess;



	SE_DEBUG(DBG_LVL_8, "In beiscsi_conn_create ,cid"

		 "from iscsi layer=%d\n", cid);
@@ -148,6 +135,9 @@ beiscsi_conn_create(struct iscsi_cls_session *cls_session, u32 cid) 
	beiscsi_conn->ep = NULL;

	beiscsi_conn->phba = phba;

	beiscsi_conn->conn = conn;

	sess = cls_session->dd_data;

	beiscsi_sess = sess->dd_data;

	beiscsi_conn->beiscsi_sess = beiscsi_sess;

	return cls_conn;

}

drivers/scsi/be2iscsi/be_main.c

+33 −36
Original line number Diff line number Diff line
@@ -2880,7 +2880,16 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
	struct hwi_wrb_context *pwrb_context;

	struct hwi_controller *phwi_ctrlr;

	itt_t itt;

	struct beiscsi_session *beiscsi_sess = beiscsi_conn->beiscsi_sess;

	dma_addr_t paddr;



	io_task->cmd_bhs = pci_pool_alloc(beiscsi_sess->bhs_pool,

					  GFP_KERNEL, &paddr);



	if (!io_task->cmd_bhs)

		return -ENOMEM;



	io_task->bhs_pa.u.a64.address = paddr;

	io_task->pwrb_handle = alloc_wrb_handle(phba,

						beiscsi_conn->beiscsi_conn_cid,

						task->itt);
@@ -2894,17 +2903,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
		spin_lock(&phba->io_sgl_lock);

		io_task->psgl_handle = alloc_io_sgl_handle(phba);

		spin_unlock(&phba->io_sgl_lock);

		if (!io_task->psgl_handle) {

			phwi_ctrlr = phba->phwi_ctrlr;

			pwrb_context = &phwi_ctrlr->wrb_context

					[beiscsi_conn->beiscsi_conn_cid];

			free_wrb_handle(phba, pwrb_context,

						io_task->pwrb_handle);

			io_task->pwrb_handle = NULL;

			SE_DEBUG(DBG_LVL_1,

				 "Alloc of SGL_ICD Failed \n");

			return -ENOMEM;

		}

		if (!io_task->psgl_handle)

			goto free_hndls;



	} else {

		io_task->scsi_cmnd = NULL;

		if ((task->hdr->opcode & ISCSI_OPCODE_MASK) == ISCSI_OP_LOGIN) {
@@ -2913,18 +2914,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
				io_task->psgl_handle = (struct sgl_handle *)

						alloc_mgmt_sgl_handle(phba);

				spin_unlock(&phba->mgmt_sgl_lock);

				if (!io_task->psgl_handle) {

					phwi_ctrlr = phba->phwi_ctrlr;

					pwrb_context =

					&phwi_ctrlr->wrb_context

					[beiscsi_conn->beiscsi_conn_cid];

					free_wrb_handle(phba, pwrb_context,

							io_task->pwrb_handle);

					io_task->pwrb_handle = NULL;

					SE_DEBUG(DBG_LVL_1, "Alloc of "

						"MGMT_SGL_ICD Failed \n");

					return -ENOMEM;

				}

				if (!io_task->psgl_handle)

					goto free_hndls;



				beiscsi_conn->login_in_progress = 1;

				beiscsi_conn->plogin_sgl_handle =

							io_task->psgl_handle;
@@ -2936,23 +2928,24 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) 
			spin_lock(&phba->mgmt_sgl_lock);

			io_task->psgl_handle = alloc_mgmt_sgl_handle(phba);

			spin_unlock(&phba->mgmt_sgl_lock);

			if (!io_task->psgl_handle) {

				phwi_ctrlr = phba->phwi_ctrlr;

				pwrb_context = &phwi_ctrlr->wrb_context

					[beiscsi_conn->beiscsi_conn_cid];

				free_wrb_handle(phba, pwrb_context,

							io_task->pwrb_handle);

				io_task->pwrb_handle = NULL;

				SE_DEBUG(DBG_LVL_1, "Alloc of "

					 "MGMT_SGL_ICD Failed \n");

				return -ENOMEM;

			}

			if (!io_task->psgl_handle)

				goto free_hndls;

		}

	}

	itt = (itt_t) cpu_to_be32(((unsigned int)task->itt << 16) |

			(unsigned int)(io_task->psgl_handle->sgl_index));

	io_task->cmd_bhs->iscsi_hdr.itt = itt;

	return 0;



free_hndls:

	phwi_ctrlr = phba->phwi_ctrlr;

	pwrb_context = &phwi_ctrlr->wrb_context[beiscsi_conn->beiscsi_conn_cid];

	free_wrb_handle(phba, pwrb_context, io_task->pwrb_handle);

	io_task->pwrb_handle = NULL;

	pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,

		      io_task->bhs_pa.u.a64.address);

	SE_DEBUG(DBG_LVL_1, "Alloc of SGL_ICD Failed \n");

	return -ENOMEM;

}



static void beiscsi_cleanup_task(struct iscsi_task *task)
@@ -2961,6 +2954,7 @@ static void beiscsi_cleanup_task(struct iscsi_task *task) 
	struct iscsi_conn *conn = task->conn;

	struct beiscsi_conn *beiscsi_conn = conn->dd_data;

	struct beiscsi_hba *phba = beiscsi_conn->phba;

	struct beiscsi_session *beiscsi_sess = beiscsi_conn->beiscsi_sess;

	struct hwi_wrb_context *pwrb_context;

	struct hwi_controller *phwi_ctrlr;
@@ -2971,6 +2965,11 @@ static void beiscsi_cleanup_task(struct iscsi_task *task) 
		io_task->pwrb_handle = NULL;

	}



	if (io_task->cmd_bhs) {

		pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,

			      io_task->bhs_pa.u.a64.address);

	}



	if (task->sc) {

		if (io_task->psgl_handle) {

			spin_lock(&phba->io_sgl_lock);
@@ -3003,7 +3002,6 @@ static int beiscsi_iotask(struct iscsi_task *task, struct scatterlist *sg, 
	unsigned int doorbell = 0;



	pwrb = io_task->pwrb_handle->pwrb;



	io_task->cmd_bhs->iscsi_hdr.exp_statsn = 0;

	io_task->bhs_len = sizeof(struct be_cmd_bhs);
@@ -3020,7 +3018,6 @@ static int beiscsi_iotask(struct iscsi_task *task, struct scatterlist *sg, 
			      &io_task->cmd_bhs->iscsi_data_pdu, 1);

		AMAP_SET_BITS(struct amap_iscsi_wrb, type, pwrb, INI_WR_CMD);

		AMAP_SET_BITS(struct amap_iscsi_wrb, dsp, pwrb, 1);



	} else {

		SE_DEBUG(DBG_LVL_4, "READ Command \t");

		AMAP_SET_BITS(struct amap_iscsi_wrb, type, pwrb, INI_RD_CMD);

drivers/scsi/be2iscsi/be_main.h

+0 −1
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ struct beiscsi_io_task { 
	unsigned short cid;

	unsigned short header_len;



	unsigned int alloc_size;

	struct be_cmd_bhs *cmd_bhs;

	struct be_bus_address bhs_pa;

	unsigned short bhs_len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE