be2iscsi: Moving to pci_pools v2
Subsystems (2)
PATCH 2/2 be2iscsi: Moving to pci_pools v2
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
v2:
- Remove cleanup loop in beiscsi_session_destroy
- Fixup for allocation failure handling in beiscsi_alloc_pdu
--- drivers/scsi/be2iscsi/be_iscsi.c | 42 +++++++++-------------- drivers/scsi/be2iscsi/be_main.c | 67 +++++++++++++++++-------------------- drivers/scsi/be2iscsi/be_main.h | 1 - 3 files changed, 48 insertions(+), 62 deletions(-)
drivers/scsi/be2iscsi/be_iscsi.c +18 -26
@@ -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 ; }/**
@@ -108,15 +101,9 @@ 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 +120,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 +137,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 +31 -36
121 lines not on this page · raw message
drivers/scsi/be2iscsi/be_main.h +0 -1
@@ -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;
Signature · 1 line
1.6.4
drivers/scsi/be2iscsi/be_iscsi.c void beiscsi_session_destroy(struct iscsi_cls_session *cls_session) · line 103
Quoted 5 lines · Jayamohan Kallickal
/**
drivers/scsi/be2iscsi/be_iscsi.c +0
-0@@ -108,15 +101,9 @@ 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;
Sorry to do this to you again.
I was compiling the patch and got this:drivers/scsi/be2iscsi/be_iscsi.c: In function ‘beiscsi_session_destroy’:drivers/scsi/be2iscsi/be_iscsi.c:102: warning: unused variable ‘io_task’ drivers/scsi/be2iscsi/be_iscsi.c:101: warning: unused variable ‘task’
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html