diff mbox series

scsi: mpt3sas: Don't call disable_irq from IRQ poll handler

Message ID 20200901145026.12174-1-thenzl@redhat.com (mailing list archive)
State Accepted
Headers show
Series scsi: mpt3sas: Don't call disable_irq from IRQ poll handler | expand

Commit Message

Tomas Henzl Sept. 1, 2020, 2:50 p.m. UTC
disable_irq might sleep, replace it with disable_irq_nosync,
for synchronisation is the 'irq_poll_scheduled' sufficient

Fixes: 320e77acb3 scsi: mpt3sas: Irq poll to avoid CPU hard lockups

Signed-off-by: Tomas Henzl <thenzl@redhat.com>
---
 drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin K. Petersen Sept. 3, 2020, 3:01 a.m. UTC | #1
On Tue, 1 Sep 2020 16:50:26 +0200, Tomas Henzl wrote:

> disable_irq might sleep, replace it with disable_irq_nosync,
> for synchronisation is the 'irq_poll_scheduled' sufficient
> 
> Fixes: 320e77acb3 scsi: mpt3sas: Irq poll to avoid CPU hard lockups

Applied to 5.9/scsi-fixes, thanks!

[1/1] scsi: mpt3sas: Don't call disable_irq from IRQ poll handler
      https://git.kernel.org/mkp/scsi/c/b614d55b970d
diff mbox series

Patch

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 96b78fdc6..a85c9672c 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -1732,7 +1732,7 @@  _base_irqpoll(struct irq_poll *irqpoll, int budget)
 	reply_q = container_of(irqpoll, struct adapter_reply_queue,
 			irqpoll);
 	if (reply_q->irq_line_enable) {
-		disable_irq(reply_q->os_irq);
+		disable_irq_nosync(reply_q->os_irq);
 		reply_q->irq_line_enable = false;
 	}
 	num_entries = _base_process_reply_queue(reply_q);