Skip to content

Commit f4fffa1

Browse files
biger410gregkh
authored andcommitted
scsi: megaraid_sas: Fix deadlock on firmware crashdump
commit 0b0747d upstream. The following processes run into a deadlock. CPU 41 was waiting for CPU 29 to handle a CSD request while holding spinlock "crashdump_lock", but CPU 29 was hung by that spinlock with IRQs disabled. PID: 17360 TASK: ffff95c1090c5c40 CPU: 41 COMMAND: "mrdiagd" !# 0 [ffffb80edbf37b58] __read_once_size at ffffffff9b871a40 include/linux/compiler.h:185:0 !# 1 [ffffb80edbf37b58] atomic_read at ffffffff9b871a40 arch/x86/include/asm/atomic.h:27:0 !# 2 [ffffb80edbf37b58] dump_stack at ffffffff9b871a40 lib/dump_stack.c:54:0 # 3 [ffffb80edbf37b78] csd_lock_wait_toolong at ffffffff9b131ad5 kernel/smp.c:364:0 # 4 [ffffb80edbf37b78] __csd_lock_wait at ffffffff9b131ad5 kernel/smp.c:384:0 # 5 [ffffb80edbf37bf8] csd_lock_wait at ffffffff9b13267a kernel/smp.c:394:0 # 6 [ffffb80edbf37bf8] smp_call_function_many at ffffffff9b13267a kernel/smp.c:843:0 # 7 [ffffb80edbf37c50] smp_call_function at ffffffff9b13279d kernel/smp.c:867:0 # 8 [ffffb80edbf37c50] on_each_cpu at ffffffff9b13279d kernel/smp.c:976:0 # 9 [ffffb80edbf37c78] flush_tlb_kernel_range at ffffffff9b085c4b arch/x86/mm/tlb.c:742:0 #10 [ffffb80edbf37cb8] __purge_vmap_area_lazy at ffffffff9b23a1e0 mm/vmalloc.c:701:0 #11 [ffffb80edbf37ce0] try_purge_vmap_area_lazy at ffffffff9b23a2cc mm/vmalloc.c:722:0 #12 [ffffb80edbf37ce0] free_vmap_area_noflush at ffffffff9b23a2cc mm/vmalloc.c:754:0 #13 [ffffb80edbf37cf8] free_unmap_vmap_area at ffffffff9b23bb3b mm/vmalloc.c:764:0 #14 [ffffb80edbf37cf8] remove_vm_area at ffffffff9b23bb3b mm/vmalloc.c:1509:0 #15 [ffffb80edbf37d18] __vunmap at ffffffff9b23bb8a mm/vmalloc.c:1537:0 #16 [ffffb80edbf37d40] vfree at ffffffff9b23bc85 mm/vmalloc.c:1612:0 #17 [ffffb80edbf37d58] megasas_free_host_crash_buffer [megaraid_sas] at ffffffffc020b7f2 drivers/scsi/megaraid/megaraid_sas_fusion.c:3932:0 #18 [ffffb80edbf37d80] fw_crash_state_store [megaraid_sas] at ffffffffc01f804d drivers/scsi/megaraid/megaraid_sas_base.c:3291:0 #19 [ffffb80edbf37dc0] dev_attr_store at ffffffff9b56dd7b drivers/base/core.c:758:0 #20 [ffffb80edbf37dd0] sysfs_kf_write at ffffffff9b326acf fs/sysfs/file.c:144:0 #21 [ffffb80edbf37de0] kernfs_fop_write at ffffffff9b325fd4 fs/kernfs/file.c:316:0 #22 [ffffb80edbf37e20] __vfs_write at ffffffff9b29418a fs/read_write.c:480:0 #23 [ffffb80edbf37ea8] vfs_write at ffffffff9b294462 fs/read_write.c:544:0 #24 [ffffb80edbf37ee8] SYSC_write at ffffffff9b2946ec fs/read_write.c:590:0 #25 [ffffb80edbf37ee8] SyS_write at ffffffff9b2946ec fs/read_write.c:582:0 #26 [ffffb80edbf37f30] do_syscall_64 at ffffffff9b003ca9 arch/x86/entry/common.c:298:0 #27 [ffffb80edbf37f58] entry_SYSCALL_64 at ffffffff9ba001b1 arch/x86/entry/entry_64.S:238:0 PID: 17355 TASK: ffff95c1090c3d80 CPU: 29 COMMAND: "mrdiagd" !# 0 [ffffb80f2d3c7d30] __read_once_size at ffffffff9b0f2ab0 include/linux/compiler.h:185:0 !# 1 [ffffb80f2d3c7d30] native_queued_spin_lock_slowpath at ffffffff9b0f2ab0 kernel/locking/qspinlock.c:368:0 # 2 [ffffb80f2d3c7d58] pv_queued_spin_lock_slowpath at ffffffff9b0f244b arch/x86/include/asm/paravirt.h:674:0 # 3 [ffffb80f2d3c7d58] queued_spin_lock_slowpath at ffffffff9b0f244b arch/x86/include/asm/qspinlock.h:53:0 # 4 [ffffb80f2d3c7d68] queued_spin_lock at ffffffff9b8961a6 include/asm-generic/qspinlock.h:90:0 # 5 [ffffb80f2d3c7d68] do_raw_spin_lock_flags at ffffffff9b8961a6 include/linux/spinlock.h:173:0 # 6 [ffffb80f2d3c7d68] __raw_spin_lock_irqsave at ffffffff9b8961a6 include/linux/spinlock_api_smp.h:122:0 # 7 [ffffb80f2d3c7d68] _raw_spin_lock_irqsave at ffffffff9b8961a6 kernel/locking/spinlock.c:160:0 # 8 [ffffb80f2d3c7d88] fw_crash_buffer_store [megaraid_sas] at ffffffffc01f8129 drivers/scsi/megaraid/megaraid_sas_base.c:3205:0 # 9 [ffffb80f2d3c7dc0] dev_attr_store at ffffffff9b56dd7b drivers/base/core.c:758:0 #10 [ffffb80f2d3c7dd0] sysfs_kf_write at ffffffff9b326acf fs/sysfs/file.c:144:0 #11 [ffffb80f2d3c7de0] kernfs_fop_write at ffffffff9b325fd4 fs/kernfs/file.c:316:0 #12 [ffffb80f2d3c7e20] __vfs_write at ffffffff9b29418a fs/read_write.c:480:0 #13 [ffffb80f2d3c7ea8] vfs_write at ffffffff9b294462 fs/read_write.c:544:0 #14 [ffffb80f2d3c7ee8] SYSC_write at ffffffff9b2946ec fs/read_write.c:590:0 #15 [ffffb80f2d3c7ee8] SyS_write at ffffffff9b2946ec fs/read_write.c:582:0 #16 [ffffb80f2d3c7f30] do_syscall_64 at ffffffff9b003ca9 arch/x86/entry/common.c:298:0 #17 [ffffb80f2d3c7f58] entry_SYSCALL_64 at ffffffff9ba001b1 arch/x86/entry/entry_64.S:238:0 The lock is used to synchronize different sysfs operations, it doesn't protect any resource that will be touched by an interrupt. Consequently it's not required to disable IRQs. Replace the spinlock with a mutex to fix the deadlock. Signed-off-by: Junxiao Bi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Mike Christie <[email protected]> Cc: [email protected] Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3753e56 commit f4fffa1

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

drivers/scsi/megaraid/megaraid_sas.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ struct megasas_instance {
23272327
u32 support_morethan256jbod; /* FW support for more than 256 PD/JBOD */
23282328
bool use_seqnum_jbod_fp; /* Added for PD sequence */
23292329
bool smp_affinity_enable;
2330-
spinlock_t crashdump_lock;
2330+
struct mutex crashdump_lock;
23312331

23322332
struct megasas_register_set __iomem *reg_set;
23332333
u32 __iomem *reply_post_host_index_addr[MR_MAX_MSIX_REG_ARRAY];

drivers/scsi/megaraid/megaraid_sas_base.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3221,14 +3221,13 @@ fw_crash_buffer_store(struct device *cdev,
32213221
struct megasas_instance *instance =
32223222
(struct megasas_instance *) shost->hostdata;
32233223
int val = 0;
3224-
unsigned long flags;
32253224

32263225
if (kstrtoint(buf, 0, &val) != 0)
32273226
return -EINVAL;
32283227

3229-
spin_lock_irqsave(&instance->crashdump_lock, flags);
3228+
mutex_lock(&instance->crashdump_lock);
32303229
instance->fw_crash_buffer_offset = val;
3231-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3230+
mutex_unlock(&instance->crashdump_lock);
32323231
return strlen(buf);
32333232
}
32343233

@@ -3243,24 +3242,23 @@ fw_crash_buffer_show(struct device *cdev,
32433242
unsigned long dmachunk = CRASH_DMA_BUF_SIZE;
32443243
unsigned long chunk_left_bytes;
32453244
unsigned long src_addr;
3246-
unsigned long flags;
32473245
u32 buff_offset;
32483246

3249-
spin_lock_irqsave(&instance->crashdump_lock, flags);
3247+
mutex_lock(&instance->crashdump_lock);
32503248
buff_offset = instance->fw_crash_buffer_offset;
32513249
if (!instance->crash_dump_buf ||
32523250
!((instance->fw_crash_state == AVAILABLE) ||
32533251
(instance->fw_crash_state == COPYING))) {
32543252
dev_err(&instance->pdev->dev,
32553253
"Firmware crash dump is not available\n");
3256-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3254+
mutex_unlock(&instance->crashdump_lock);
32573255
return -EINVAL;
32583256
}
32593257

32603258
if (buff_offset > (instance->fw_crash_buffer_size * dmachunk)) {
32613259
dev_err(&instance->pdev->dev,
32623260
"Firmware crash dump offset is out of range\n");
3263-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3261+
mutex_unlock(&instance->crashdump_lock);
32643262
return 0;
32653263
}
32663264

@@ -3272,7 +3270,7 @@ fw_crash_buffer_show(struct device *cdev,
32723270
src_addr = (unsigned long)instance->crash_buf[buff_offset / dmachunk] +
32733271
(buff_offset % dmachunk);
32743272
memcpy(buf, (void *)src_addr, size);
3275-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3273+
mutex_unlock(&instance->crashdump_lock);
32763274

32773275
return size;
32783276
}
@@ -3297,7 +3295,6 @@ fw_crash_state_store(struct device *cdev,
32973295
struct megasas_instance *instance =
32983296
(struct megasas_instance *) shost->hostdata;
32993297
int val = 0;
3300-
unsigned long flags;
33013298

33023299
if (kstrtoint(buf, 0, &val) != 0)
33033300
return -EINVAL;
@@ -3311,9 +3308,9 @@ fw_crash_state_store(struct device *cdev,
33113308
instance->fw_crash_state = val;
33123309

33133310
if ((val == COPIED) || (val == COPY_ERROR)) {
3314-
spin_lock_irqsave(&instance->crashdump_lock, flags);
3311+
mutex_lock(&instance->crashdump_lock);
33153312
megasas_free_host_crash_buffer(instance);
3316-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3313+
mutex_unlock(&instance->crashdump_lock);
33173314
if (val == COPY_ERROR)
33183315
dev_info(&instance->pdev->dev, "application failed to "
33193316
"copy Firmware crash dump\n");
@@ -7325,7 +7322,7 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance)
73257322
init_waitqueue_head(&instance->int_cmd_wait_q);
73267323
init_waitqueue_head(&instance->abort_cmd_wait_q);
73277324

7328-
spin_lock_init(&instance->crashdump_lock);
7325+
mutex_init(&instance->crashdump_lock);
73297326
spin_lock_init(&instance->mfi_pool_lock);
73307327
spin_lock_init(&instance->hba_lock);
73317328
spin_lock_init(&instance->stream_lock);

0 commit comments

Comments
 (0)