i3c: master: dw: fix deadlock
Subsystems (2)
PATCH 1/1 i3c: master: dw: fix deadlock
In dw_i3c_master_irq_handler(), we already have gotten &master->xferqueue.lock, if we try to get the same lock again in dw_i3c_master_dequeue_xfer(), deadlock happens.
We fix this issue by introduing dw_i3c_master_dequeue_xfer_locked() which does all what dw_i3c_master_dequeue_xfer() does without trying to lock &master->xferqueue.lock.
--- drivers/i3c/master/dw-i3c-master.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/i3c/master/dw-i3c-master.c +12 -6
@@ -419,12 +419,9 @@ static void dw_i3c_master_enqueue_xfer(struct dw_i3c_master *master,spin_unlock_irqrestore (&master->xferqueue.lock, flags); } -static void dw_i3c_master_dequeue_xfer (struct dw_i3c_master *master, -struct dw_i3c_xfer *xfer) +static void dw_i3c_master_dequeue_xfer_locked (struct dw_i3c_master *master, +struct dw_i3c_xfer *xfer) { -unsigned long flags; - -spin_lock_irqsave (&master->xferqueue.lock, flags);if (master->xferqueue.cur == xfer) {u32 status;
@@ -439,6 +436,15 @@ static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master, }else {list_del_init (&xfer->node); } +} + +static void dw_i3c_master_dequeue_xfer (struct dw_i3c_master *master, +struct dw_i3c_xfer *xfer) +{ +unsigned long flags; + +spin_lock_irqsave (&master->xferqueue.lock, flags); +dw_i3c_master_dequeue_xfer_locked (master, xfer);spin_unlock_irqrestore (&master->xferqueue.lock, flags); }
@@ -494,7 +500,7 @@ static void dw_i3c_master_end_xfer_locked(struct dw_i3c_master *master, u32 isr)complete (&xfer->comp);if (ret <0 ) { -dw_i3c_master_dequeue_xfer (master, xfer); +dw_i3c_master_dequeue_xfer_locked (master, xfer);writel (readl (master->regs +DEVICE_CTRL ) |DEV_CTRL_RESUME , master->regs +DEVICE_CTRL ); }
Signature · 1 line
2.20.1
Hi Jisheng,
Thanks for your report.
Quoted 49 lines · Jisheng Zhang
In
dw_i3c_master_irq_handler(), we already have gotten&master->xferqueue.lock, if we try to get the same lock again indw_i3c_master_dequeue_xfer(), deadlock happens.We fix this issue by introduing
dw_i3c_master_dequeue_xfer_locked()which does all whatdw_i3c_master_dequeue_xfer()does without trying to lock&master->xferqueue.lock.Signed-off-by Jisheng Zhang <[email protected]>--- drivers/i3c/master/dw-i3c-master.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)drivers/i3c/master/dw-i3c-master.c +11
-5@@ -419,12 +419,9 @@ static void dw_i3c_master_enqueue_xfer(struct dw_i3c_master *master,spin_unlock_irqrestore (&master->xferqueue.lock, flags); } -static void dw_i3c_master_dequeue_xfer (struct dw_i3c_master *master, -struct dw_i3c_xfer *xfer) +static void dw_i3c_master_dequeue_xfer_locked (struct dw_i3c_master *master, +struct dw_i3c_xfer *xfer) { -unsigned long flags; - -spin_lock_irqsave (&master->xferqueue.lock, flags);if (master->xferqueue.cur == xfer) {u32 status;@@ -439,6 +436,15 @@ static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master, }else {list_del_init (&xfer->node); } +} + +static void dw_i3c_master_dequeue_xfer (struct dw_i3c_master *master, +struct dw_i3c_xfer *xfer) +{ +unsigned long flags; + +spin_lock_irqsave (&master->xferqueue.lock, flags); +dw_i3c_master_dequeue_xfer_locked (master, xfer);spin_unlock_irqrestore (&master->xferqueue.lock, flags); }
drivers/i3c/master/dw-i3c-master.c static void dw_i3c_master_end_xfer_locked(struct dw_i3c_master *master, u32 isr) · line 506
Quoted 8 lines
drivers/i3c/master/dw-i3c-master.c +1
-1@@ -494,7 +500,7 @@ static void dw_i3c_master_end_xfer_locked(struct dw_i3c_master *master, u32 isr)complete (&xfer->comp);if (ret <0 ) { -dw_i3c_master_dequeue_xfer (master, xfer); +dw_i3c_master_dequeue_xfer_locked (master, xfer);writel (readl (master->regs +DEVICE_CTRL ) |DEV_CTRL_RESUME , master->regs +DEVICE_CTRL ); }