Skip to content

Commit 7d2c0d6

Browse files
Jitendra Bhivaremartinkpetersen
Jitendra Bhivare
authored and
martinkpetersen
committed
scsi: be2iscsi: Replace _bh with _irqsave/irqrestore
[ 3843.132217] WARNING: CPU: 20 PID: 1227 at kernel/softirq.c:150 __local_bh_enable_ip+0x6b/0x90 [ 3843.142815] Modules linked in: ... [ 3843.294328] CPU: 20 PID: 1227 Comm: kworker/20:1H Tainted: G E 4.8.0-rc1+ #3 [ 3843.304944] Hardware name: Dell Inc. PowerEdge R720/0X6H47, BIOS 1.4.8 10/25/2012 [ 3843.314798] Workqueue: kblockd blk_timeout_work [ 3843.321350] 0000000000000086 00000000a32f4533 ffff8802216d7bd8 ffffffff8135c3cf [ 3843.331146] 0000000000000000 0000000000000000 ffff8802216d7c18 ffffffff8108d661 [ 3843.340918] 00000096216d7c50 0000000000000200 ffff8802d07cc828 ffff8801b3632550 [ 3843.350687] Call Trace: [ 3843.354866] [<ffffffff8135c3cf>] dump_stack+0x63/0x84 [ 3843.362061] [<ffffffff8108d661>] __warn+0xd1/0xf0 [ 3843.368851] [<ffffffff8108d79d>] warn_slowpath_null+0x1d/0x20 [ 3843.376791] [<ffffffff810930eb>] __local_bh_enable_ip+0x6b/0x90 [ 3843.384903] [<ffffffff816fe7be>] _raw_spin_unlock_bh+0x1e/0x20 [ 3843.392940] [<ffffffffa085f710>] beiscsi_alloc_pdu+0x2f0/0x6e0 [be2iscsi] [ 3843.402076] [<ffffffffa06bc358>] __iscsi_conn_send_pdu+0xf8/0x370 [libiscsi] [ 3843.411549] [<ffffffffa06bc6fe>] iscsi_send_nopout+0xbe/0x110 [libiscsi] [ 3843.420639] [<ffffffffa06bd98b>] iscsi_eh_cmd_timed_out+0x29b/0x2b0 [libiscsi] [ 3843.430339] [<ffffffff814cd1de>] scsi_times_out+0x5e/0x250 [ 3843.438119] [<ffffffff813374af>] blk_rq_timed_out+0x1f/0x60 [ 3843.446009] [<ffffffff8133759d>] blk_timeout_work+0xad/0x150 [ 3843.454010] [<ffffffff810a6642>] process_one_work+0x152/0x400 [ 3843.462114] [<ffffffff810a6f35>] worker_thread+0x125/0x4b0 [ 3843.469961] [<ffffffff810a6e10>] ? rescuer_thread+0x380/0x380 [ 3843.478116] [<ffffffff810aca28>] kthread+0xd8/0xf0 [ 3843.485212] [<ffffffff816fedff>] ret_from_fork+0x1f/0x40 [ 3843.492908] [<ffffffff810ac950>] ? kthread_park+0x60/0x60 [ 3843.500715] ---[ end trace 57ec0a1d8f0dd3a0 ]--- [ 3852.328667] NMI watchdog: Watchdog detected hard LOCKUP on cpu 1Kernel panic - not syncing: Hard LOCKUP blk_timeout_work takes queue_lock spin_lock with interrupts disabled before invoking iscsi_eh_cmd_timed_out. This causes a WARN_ON_ONCE in spin_unlock_bh for wrb_lock/io_sgl_lock/mgmt_sgl_lock. CPU was kept busy in lot of bottom half work with interrupts disabled thus causing hard lock up. Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Chris Leech <cleech@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 4fa5079 commit 7d2c0d6

1 file changed

Lines changed: 23 additions & 14 deletions

File tree

‎drivers/scsi/be2iscsi/be_main.c‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,9 @@ void hwi_ring_cq_db(struct beiscsi_hba *phba,
900900
static struct sgl_handle *alloc_io_sgl_handle(struct beiscsi_hba *phba)
901901
{
902902
struct sgl_handle *psgl_handle;
903+
unsigned long flags;
903904

904-
spin_lock_bh(&phba->io_sgl_lock);
905+
spin_lock_irqsave(&phba->io_sgl_lock, flags);
905906
if (phba->io_sgl_hndl_avbl) {
906907
beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_IO,
907908
"BM_%d : In alloc_io_sgl_handle,"
@@ -919,14 +920,16 @@ static struct sgl_handle *alloc_io_sgl_handle(struct beiscsi_hba *phba)
919920
phba->io_sgl_alloc_index++;
920921
} else
921922
psgl_handle = NULL;
922-
spin_unlock_bh(&phba->io_sgl_lock);
923+
spin_unlock_irqrestore(&phba->io_sgl_lock, flags);
923924
return psgl_handle;
924925
}
925926

926927
static void
927928
free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
928929
{
929-
spin_lock_bh(&phba->io_sgl_lock);
930+
unsigned long flags;
931+
932+
spin_lock_irqsave(&phba->io_sgl_lock, flags);
930933
beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_IO,
931934
"BM_%d : In free_,io_sgl_free_index=%d\n",
932935
phba->io_sgl_free_index);
@@ -941,7 +944,7 @@ free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
941944
"value there=%p\n", phba->io_sgl_free_index,
942945
phba->io_sgl_hndl_base
943946
[phba->io_sgl_free_index]);
944-
spin_unlock_bh(&phba->io_sgl_lock);
947+
spin_unlock_irqrestore(&phba->io_sgl_lock, flags);
945948
return;
946949
}
947950
phba->io_sgl_hndl_base[phba->io_sgl_free_index] = psgl_handle;
@@ -950,23 +953,24 @@ free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
950953
phba->io_sgl_free_index = 0;
951954
else
952955
phba->io_sgl_free_index++;
953-
spin_unlock_bh(&phba->io_sgl_lock);
956+
spin_unlock_irqrestore(&phba->io_sgl_lock, flags);
954957
}
955958

956959
static inline struct wrb_handle *
957960
beiscsi_get_wrb_handle(struct hwi_wrb_context *pwrb_context,
958961
unsigned int wrbs_per_cxn)
959962
{
960963
struct wrb_handle *pwrb_handle;
964+
unsigned long flags;
961965

962-
spin_lock_bh(&pwrb_context->wrb_lock);
966+
spin_lock_irqsave(&pwrb_context->wrb_lock, flags);
963967
pwrb_handle = pwrb_context->pwrb_handle_base[pwrb_context->alloc_index];
964968
pwrb_context->wrb_handles_available--;
965969
if (pwrb_context->alloc_index == (wrbs_per_cxn - 1))
966970
pwrb_context->alloc_index = 0;
967971
else
968972
pwrb_context->alloc_index++;
969-
spin_unlock_bh(&pwrb_context->wrb_lock);
973+
spin_unlock_irqrestore(&pwrb_context->wrb_lock, flags);
970974

971975
if (pwrb_handle)
972976
memset(pwrb_handle->pwrb, 0, sizeof(*pwrb_handle->pwrb));
@@ -1001,14 +1005,16 @@ beiscsi_put_wrb_handle(struct hwi_wrb_context *pwrb_context,
10011005
struct wrb_handle *pwrb_handle,
10021006
unsigned int wrbs_per_cxn)
10031007
{
1004-
spin_lock_bh(&pwrb_context->wrb_lock);
1008+
unsigned long flags;
1009+
1010+
spin_lock_irqsave(&pwrb_context->wrb_lock, flags);
10051011
pwrb_context->pwrb_handle_base[pwrb_context->free_index] = pwrb_handle;
10061012
pwrb_context->wrb_handles_available++;
10071013
if (pwrb_context->free_index == (wrbs_per_cxn - 1))
10081014
pwrb_context->free_index = 0;
10091015
else
10101016
pwrb_context->free_index++;
1011-
spin_unlock_bh(&pwrb_context->wrb_lock);
1017+
spin_unlock_irqrestore(&pwrb_context->wrb_lock, flags);
10121018
}
10131019

10141020
/**
@@ -1037,8 +1043,9 @@ free_wrb_handle(struct beiscsi_hba *phba, struct hwi_wrb_context *pwrb_context,
10371043
static struct sgl_handle *alloc_mgmt_sgl_handle(struct beiscsi_hba *phba)
10381044
{
10391045
struct sgl_handle *psgl_handle;
1046+
unsigned long flags;
10401047

1041-
spin_lock_bh(&phba->mgmt_sgl_lock);
1048+
spin_lock_irqsave(&phba->mgmt_sgl_lock, flags);
10421049
if (phba->eh_sgl_hndl_avbl) {
10431050
psgl_handle = phba->eh_sgl_hndl_base[phba->eh_sgl_alloc_index];
10441051
phba->eh_sgl_hndl_base[phba->eh_sgl_alloc_index] = NULL;
@@ -1056,14 +1063,16 @@ static struct sgl_handle *alloc_mgmt_sgl_handle(struct beiscsi_hba *phba)
10561063
phba->eh_sgl_alloc_index++;
10571064
} else
10581065
psgl_handle = NULL;
1059-
spin_unlock_bh(&phba->mgmt_sgl_lock);
1066+
spin_unlock_irqrestore(&phba->mgmt_sgl_lock, flags);
10601067
return psgl_handle;
10611068
}
10621069

10631070
void
10641071
free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
10651072
{
1066-
spin_lock_bh(&phba->mgmt_sgl_lock);
1073+
unsigned long flags;
1074+
1075+
spin_lock_irqsave(&phba->mgmt_sgl_lock, flags);
10671076
beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_CONFIG,
10681077
"BM_%d : In free_mgmt_sgl_handle,"
10691078
"eh_sgl_free_index=%d\n",
@@ -1078,7 +1087,7 @@ free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
10781087
"BM_%d : Double Free in eh SGL ,"
10791088
"eh_sgl_free_index=%d\n",
10801089
phba->eh_sgl_free_index);
1081-
spin_unlock_bh(&phba->mgmt_sgl_lock);
1090+
spin_unlock_irqrestore(&phba->mgmt_sgl_lock, flags);
10821091
return;
10831092
}
10841093
phba->eh_sgl_hndl_base[phba->eh_sgl_free_index] = psgl_handle;
@@ -1088,7 +1097,7 @@ free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
10881097
phba->eh_sgl_free_index = 0;
10891098
else
10901099
phba->eh_sgl_free_index++;
1091-
spin_unlock_bh(&phba->mgmt_sgl_lock);
1100+
spin_unlock_irqrestore(&phba->mgmt_sgl_lock, flags);
10921101
}
10931102

10941103
static void

0 commit comments

Comments
 (0)