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

thenzl · martinkpetersen · commit b614d55b970d · 2020-09-02T22:36:05.000-04:00
disable_irq() might sleep, replace it with disable_irq_nosync(). For synchronisation 'irq_poll_scheduled' is sufficient Fixes: 320e77a scsi: mpt3sas: Irq poll to avoid CPU hard lockups Link: https://lore.kernel.org/r/20200901145026.12174-1-thenzl@redhat.com Signed-off-by: Tomas Henzl <thenzl@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -1733,7 +1733,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);

Original file line number	Diff line number	Diff line change
`@@ -1733,7 +1733,7 @@ _base_irqpoll(struct irq_poll *irqpoll, int budget)`
`1733`	`1733`	`reply_q = container_of(irqpoll, struct adapter_reply_queue,`
`1734`	`1734`	`irqpoll);`
`1735`	`1735`	`if (reply_q->irq_line_enable) {`
`1736`		`- disable_irq(reply_q->os_irq);`
	`1736`	`+ disable_irq_nosync(reply_q->os_irq);`
`1737`	`1737`	`reply_q->irq_line_enable = false;`
`1738`	`1738`	`}`
`1739`	`1739`	`num_entries = _base_process_reply_queue(reply_q);`