UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

be2iscsi: Fix processing CQE before connection resources are freed 

Driver should process the completion queue entries before a connection
 resources are freed. While running mixed traffic due to latency, driver
 processes the CQE after the connection resources are freed. This fix
 processes all the completion queue before the connection resources are
 freed.

Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Jayamohan Kallickal 2014-08-08 01:00:01 -04:00 committed by Christoph Hellwig
parent a3d313ea56
commit b7ab35b133
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/scsi/be2iscsi/be_iscsi.c
View File

@ -1273,6 +1273,31 @@ int beiscsi_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
return 0; return 0;
} }
/**
* beiscsi_flush_cq()- Flush the CQ created.
* @phba: ptr device priv structure.
*
* Before the connection resource are freed flush
* all the CQ enteries
**/
static void beiscsi_flush_cq(struct beiscsi_hba *phba)
{
uint16_t i;
struct be_eq_obj *pbe_eq;
struct hwi_controller *phwi_ctrlr;
struct hwi_context_memory *phwi_context;
phwi_ctrlr = phba->phwi_ctrlr;
phwi_context = phwi_ctrlr->phwi_ctxt;
for (i = 0; i < phba->num_cpus; i++) {
pbe_eq = &phwi_context->be_eq[i];
blk_iopoll_disable(&pbe_eq->iopoll);
beiscsi_process_cq(pbe_eq);
blk_iopoll_enable(&pbe_eq->iopoll);
}
}
/** /**
* beiscsi_close_conn - Upload the connection * beiscsi_close_conn - Upload the connection
* @ep: The iscsi endpoint * @ep: The iscsi endpoint
@ -1294,6 +1319,10 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
} }
ret = beiscsi_mccq_compl(phba, tag, NULL, NULL); ret = beiscsi_mccq_compl(phba, tag, NULL, NULL);
/* Flush the CQ entries */
beiscsi_flush_cq(phba);
return ret; return ret;
} }

15
drivers/scsi/be2iscsi/be_main.c
View File

@ -2068,7 +2068,7 @@ static void beiscsi_process_mcc_isr(struct beiscsi_hba *phba)
* return * return
* Number of Completion Entries processed. * Number of Completion Entries processed.
**/ **/
static unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq) unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq)
{ {
struct be_queue_info *cq; struct be_queue_info *cq;
struct sol_cqe *sol; struct sol_cqe *sol;
@ -2110,6 +2110,18 @@ static unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq)
cri_index = BE_GET_CRI_FROM_CID(cid); cri_index = BE_GET_CRI_FROM_CID(cid);
ep = phba->ep_array[cri_index]; ep = phba->ep_array[cri_index];
if (ep == NULL) {
/* connection has already been freed
* just move on to next one
*/
beiscsi_log(phba, KERN_WARNING,
BEISCSI_LOG_INIT,
"BM_%d : proc cqe of disconn ep: cid %d\n",
cid);
goto proc_next_cqe;
}
beiscsi_ep = ep->dd_data; beiscsi_ep = ep->dd_data;
beiscsi_conn = beiscsi_ep->conn; beiscsi_conn = beiscsi_ep->conn;
@ -2219,6 +2231,7 @@ static unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq)
break; break;
} }
proc_next_cqe:
AMAP_SET_BITS(struct amap_sol_cqe, valid, sol, 0); AMAP_SET_BITS(struct amap_sol_cqe, valid, sol, 0);
queue_tail_inc(cq); queue_tail_inc(cq);
sol = queue_tail_node(cq); sol = queue_tail_node(cq);

3
drivers/scsi/be2iscsi/be_main.h
View File

@ -840,6 +840,9 @@ void beiscsi_free_mgmt_task_handles(struct beiscsi_conn *beiscsi_conn,
void hwi_ring_cq_db(struct beiscsi_hba *phba, void hwi_ring_cq_db(struct beiscsi_hba *phba,
unsigned int id, unsigned int num_processed, unsigned int id, unsigned int num_processed,
unsigned char rearm, unsigned char event); unsigned char rearm, unsigned char event);
unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq);
static inline bool beiscsi_error(struct beiscsi_hba *phba) static inline bool beiscsi_error(struct beiscsi_hba *phba)
{ {
return phba->ue_detected || phba->fw_timeout; return phba->ue_detected || phba->fw_timeout;