diff mbox series

scsi: megaraid_sas: Don't call disable_irq from process IRQ poll

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

Commit Message

Tomas Henzl Aug. 27, 2020, 4:53 p.m. UTC
disable_irq might sleep, replace it with disable_irq_nosync which is sufficient,
irq_poll_scheduled protects againt running complete_cmd_fusion in parallel
from megasas_irqpoll and megasas_isr_fusion.

Fixes: a6ffd5bf681 scsi: megaraid_sas: Call disable_irq from process IRQ poll
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin K. Petersen Sept. 3, 2020, 3:01 a.m. UTC | #1
On Thu, 27 Aug 2020 18:53:32 +0200, Tomas Henzl wrote:

> disable_irq might sleep, replace it with disable_irq_nosync which is sufficient,
> irq_poll_scheduled protects againt running complete_cmd_fusion in parallel
> from megasas_irqpoll and megasas_isr_fusion.

Applied to 5.9/scsi-fixes, thanks!

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

Patch

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 319f241da..766bc2bb1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -3690,7 +3690,7 @@  int megasas_irqpoll(struct irq_poll *irqpoll, int budget)
 	instance = irq_ctx->instance;
 
 	if (irq_ctx->irq_line_enable) {
-		disable_irq(irq_ctx->os_irq);
+		disable_irq_nosync(irq_ctx->os_irq);
 		irq_ctx->irq_line_enable = false;
 	}