| From 4cc8a2169bc2c7517c5610d6841eda7c00534019 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 Aug 2020 18:53:32 +0200 |
| Subject: scsi: megaraid_sas: Don't call disable_irq from process IRQ poll |
| |
| From: Tomas Henzl <thenzl@redhat.com> |
| |
| [ Upstream commit d2af39141eea34ef651961e885f49d96781a1016 ] |
| |
| disable_irq() might sleep. Replace it with disable_irq_nosync() which is |
| sufficient as irq_poll_scheduled protects against concurrently running |
| complete_cmd_fusion() from megasas_irqpoll() and megasas_isr_fusion(). |
| |
| Link: https://lore.kernel.org/r/20200827165332.8432-1-thenzl@redhat.com |
| Fixes: a6ffd5bf681 scsi: megaraid_sas: Call disable_irq from process IRQ poll |
| Signed-off-by: Tomas Henzl <thenzl@redhat.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c |
| index 5bcef9769740b..5dcd7b9b72ced 100644 |
| --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c |
| +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c |
| @@ -3738,7 +3738,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; |
| } |
| |
| -- |
| 2.25.1 |
| |
