Skip to content

Commit dd64f80

Browse files
Ychamemartinkpetersen
authored andcommitted
scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock
As &qedi_percpu->p_work_lock is acquired by hard IRQ qedi_msix_handler(), other acquisitions of the same lock under process context should disable IRQ, otherwise deadlock could happen if the IRQ preempts the execution while the lock is held in process context on the same CPU. qedi_cpu_offline() is one such function which acquires the lock in process context. [Deadlock Scenario] qedi_cpu_offline() ->spin_lock(&p->p_work_lock) <irq> ->qedi_msix_handler() ->edi_process_completions() ->spin_lock_irqsave(&p->p_work_lock, flags); (deadlock here) This flaw was found by an experimental static analysis tool I am developing for IRQ-related deadlocks. The tentative patch fix the potential deadlock by spin_lock_irqsave() under process context. Signed-off-by: Chengfeng Ye <dg573847474@gmail.com> Link: https://lore.kernel.org/r/20230726125655.4197-1-dg573847474@gmail.com Acked-by: Manish Rangankar <mrangankar@marvell.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 8eebf0e commit dd64f80

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/scsi/qedi/qedi_main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,8 +1976,9 @@ static int qedi_cpu_offline(unsigned int cpu)
19761976
struct qedi_percpu_s *p = this_cpu_ptr(&qedi_percpu);
19771977
struct qedi_work *work, *tmp;
19781978
struct task_struct *thread;
1979+
unsigned long flags;
19791980

1980-
spin_lock_bh(&p->p_work_lock);
1981+
spin_lock_irqsave(&p->p_work_lock, flags);
19811982
thread = p->iothread;
19821983
p->iothread = NULL;
19831984

@@ -1988,7 +1989,7 @@ static int qedi_cpu_offline(unsigned int cpu)
19881989
kfree(work);
19891990
}
19901991

1991-
spin_unlock_bh(&p->p_work_lock);
1992+
spin_unlock_irqrestore(&p->p_work_lock, flags);
19921993
if (thread)
19931994
kthread_stop(thread);
19941995
return 0;

0 commit comments

Comments
 (0)