Skip to content

Commit 220ae3f

Browse files
biger410Saeed Mirzamohammadi
authored and
Saeed Mirzamohammadi
committed
scsi: megaraid_sas: Fix deadlock on firmware crashdump
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]> (cherry picked from commit 0b0747d) Orabug: 35702793 Signed-off-by: Junxiao Bi <[email protected]> Signed-off-by: Saeed Mirzamohammadi <[email protected]>
1 parent cca820d commit 220ae3f

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
@@ -2337,7 +2337,7 @@ struct megasas_instance {
23372337
u32 support_morethan256jbod; /* FW support for more than 256 PD/JBOD */
23382338
bool use_seqnum_jbod_fp; /* Added for PD sequence */
23392339
bool smp_affinity_enable;
2340-
spinlock_t crashdump_lock;
2340+
struct mutex crashdump_lock;
23412341

23422342
struct megasas_register_set __iomem *reg_set;
23432343
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
@@ -3238,14 +3238,13 @@ fw_crash_buffer_store(struct device *cdev,
32383238
struct megasas_instance *instance =
32393239
(struct megasas_instance *) shost->hostdata;
32403240
int val = 0;
3241-
unsigned long flags;
32423241

32433242
if (kstrtoint(buf, 0, &val) != 0)
32443243
return -EINVAL;
32453244

3246-
spin_lock_irqsave(&instance->crashdump_lock, flags);
3245+
mutex_lock(&instance->crashdump_lock);
32473246
instance->fw_crash_buffer_offset = val;
3248-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3247+
mutex_unlock(&instance->crashdump_lock);
32493248
return strlen(buf);
32503249
}
32513250

@@ -3260,24 +3259,23 @@ fw_crash_buffer_show(struct device *cdev,
32603259
unsigned long dmachunk = CRASH_DMA_BUF_SIZE;
32613260
unsigned long chunk_left_bytes;
32623261
unsigned long src_addr;
3263-
unsigned long flags;
32643262
u32 buff_offset;
32653263

3266-
spin_lock_irqsave(&instance->crashdump_lock, flags);
3264+
mutex_lock(&instance->crashdump_lock);
32673265
buff_offset = instance->fw_crash_buffer_offset;
32683266
if (!instance->crash_dump_buf ||
32693267
!((instance->fw_crash_state == AVAILABLE) ||
32703268
(instance->fw_crash_state == COPYING))) {
32713269
dev_err(&instance->pdev->dev,
32723270
"Firmware crash dump is not available\n");
3273-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3271+
mutex_unlock(&instance->crashdump_lock);
32743272
return -EINVAL;
32753273
}
32763274

32773275
if (buff_offset > (instance->fw_crash_buffer_size * dmachunk)) {
32783276
dev_err(&instance->pdev->dev,
32793277
"Firmware crash dump offset is out of range\n");
3280-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3278+
mutex_unlock(&instance->crashdump_lock);
32813279
return 0;
32823280
}
32833281

@@ -3289,7 +3287,7 @@ fw_crash_buffer_show(struct device *cdev,
32893287
src_addr = (unsigned long)instance->crash_buf[buff_offset / dmachunk] +
32903288
(buff_offset % dmachunk);
32913289
memcpy(buf, (void *)src_addr, size);
3292-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3290+
mutex_unlock(&instance->crashdump_lock);
32933291

32943292
return size;
32953293
}
@@ -3314,7 +3312,6 @@ fw_crash_state_store(struct device *cdev,
33143312
struct megasas_instance *instance =
33153313
(struct megasas_instance *) shost->hostdata;
33163314
int val = 0;
3317-
unsigned long flags;
33183315

33193316
if (kstrtoint(buf, 0, &val) != 0)
33203317
return -EINVAL;
@@ -3328,9 +3325,9 @@ fw_crash_state_store(struct device *cdev,
33283325
instance->fw_crash_state = val;
33293326

33303327
if ((val == COPIED) || (val == COPY_ERROR)) {
3331-
spin_lock_irqsave(&instance->crashdump_lock, flags);
3328+
mutex_lock(&instance->crashdump_lock);
33323329
megasas_free_host_crash_buffer(instance);
3333-
spin_unlock_irqrestore(&instance->crashdump_lock, flags);
3330+
mutex_unlock(&instance->crashdump_lock);
33343331
if (val == COPY_ERROR)
33353332
dev_info(&instance->pdev->dev, "application failed to "
33363333
"copy Firmware crash dump\n");
@@ -7337,7 +7334,7 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance)
73377334
init_waitqueue_head(&instance->int_cmd_wait_q);
73387335
init_waitqueue_head(&instance->abort_cmd_wait_q);
73397336

7340-
spin_lock_init(&instance->crashdump_lock);
7337+
mutex_init(&instance->crashdump_lock);
73417338
spin_lock_init(&instance->mfi_pool_lock);
73427339
spin_lock_init(&instance->hba_lock);
73437340
spin_lock_init(&instance->stream_lock);

0 commit comments

Comments
 (0)