Commit f64d92e6 authored by Jitendra Bhivare's avatar Jitendra Bhivare Committed by Martin K. Petersen

be2iscsi: Add lock to protect WRB alloc and free

FW got into UE after running IO stress test

With kernel change to split session lock in frwd_lock and back_lock for
tx and rx path correspondingly, in the IO path, common resource used in
driver such as WRB was left unprotected.

Add wrb_lock spinlock to protect allocation and freeing of WRB.
Signed-off-by: default avatarJitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 10139fe0
...@@ -1190,12 +1190,14 @@ beiscsi_get_wrb_handle(struct hwi_wrb_context *pwrb_context, ...@@ -1190,12 +1190,14 @@ beiscsi_get_wrb_handle(struct hwi_wrb_context *pwrb_context,
{ {
struct wrb_handle *pwrb_handle; struct wrb_handle *pwrb_handle;
spin_lock_bh(&pwrb_context->wrb_lock);
pwrb_handle = pwrb_context->pwrb_handle_base[pwrb_context->alloc_index]; pwrb_handle = pwrb_context->pwrb_handle_base[pwrb_context->alloc_index];
pwrb_context->wrb_handles_available--; pwrb_context->wrb_handles_available--;
if (pwrb_context->alloc_index == (wrbs_per_cxn - 1)) if (pwrb_context->alloc_index == (wrbs_per_cxn - 1))
pwrb_context->alloc_index = 0; pwrb_context->alloc_index = 0;
else else
pwrb_context->alloc_index++; pwrb_context->alloc_index++;
spin_unlock_bh(&pwrb_context->wrb_lock);
return pwrb_handle; return pwrb_handle;
} }
...@@ -1227,12 +1229,14 @@ beiscsi_put_wrb_handle(struct hwi_wrb_context *pwrb_context, ...@@ -1227,12 +1229,14 @@ beiscsi_put_wrb_handle(struct hwi_wrb_context *pwrb_context,
struct wrb_handle *pwrb_handle, struct wrb_handle *pwrb_handle,
unsigned int wrbs_per_cxn) unsigned int wrbs_per_cxn)
{ {
spin_lock_bh(&pwrb_context->wrb_lock);
pwrb_context->pwrb_handle_base[pwrb_context->free_index] = pwrb_handle; pwrb_context->pwrb_handle_base[pwrb_context->free_index] = pwrb_handle;
pwrb_context->wrb_handles_available++; pwrb_context->wrb_handles_available++;
if (pwrb_context->free_index == (wrbs_per_cxn - 1)) if (pwrb_context->free_index == (wrbs_per_cxn - 1))
pwrb_context->free_index = 0; pwrb_context->free_index = 0;
else else
pwrb_context->free_index++; pwrb_context->free_index++;
spin_unlock_bh(&pwrb_context->wrb_lock);
} }
/** /**
...@@ -2920,6 +2924,7 @@ static int beiscsi_init_wrb_handle(struct beiscsi_hba *phba) ...@@ -2920,6 +2924,7 @@ static int beiscsi_init_wrb_handle(struct beiscsi_hba *phba)
} }
num_cxn_wrbh--; num_cxn_wrbh--;
} }
spin_lock_init(&pwrb_context->wrb_lock);
} }
idx = 0; idx = 0;
for (index = 0; index < phba->params.cxns_per_ctrl; index++) { for (index = 0; index < phba->params.cxns_per_ctrl; index++) {
......
...@@ -304,6 +304,7 @@ struct invalidate_command_table { ...@@ -304,6 +304,7 @@ struct invalidate_command_table {
#define BEISCSI_GET_ULP_FROM_CRI(phwi_ctrlr, cri) \ #define BEISCSI_GET_ULP_FROM_CRI(phwi_ctrlr, cri) \
(phwi_ctrlr->wrb_context[cri].ulp_num) (phwi_ctrlr->wrb_context[cri].ulp_num)
struct hwi_wrb_context { struct hwi_wrb_context {
spinlock_t wrb_lock;
struct list_head wrb_handle_list; struct list_head wrb_handle_list;
struct list_head wrb_handle_drvr_list; struct list_head wrb_handle_drvr_list;
struct wrb_handle **pwrb_handle_base; struct wrb_handle **pwrb_handle_base;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment