megaraid_sas: Driver version update to 07.719.03.00-rc1
Subsystems (2)
Sumit Saxena
maintainercover megaraid_sas: Driver version update to 07.719.03.00-rc1
This patchset has a critical fix and added helper functions to improve code readbility in ISR.
Sumit Saxena (3):
megaraid_sas: fix concurrent access to ISR between IRQ polling and
real interrupt
megaraid_sas: Add helper functions- {access/release}_irq_context
megaraid_sas: Driver version update to 07.719.03.00-rc1
drivers/scsi/megaraid/megaraid_sas.h | 4 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 50 ++++++++++++++++++--- 2 files changed, 45 insertions(+), 9 deletions(-)
Signature · 1 line
2.18.1
Sumit Saxena
maintainerPATCH 1/3 megaraid_sas: fix concurrent access to ISR between IRQ polling and real interrupt
IRQ polling thread calls ISR after enable_irq() to handle any missed IO completion. atomic flag "in_used" was added to have the synchronization between the IRQ polling thread and the interrupt context. There is a bug around it leading to a race condition.
Below is the sequence:
-IRQ polling thread accesses ISR, fetches the reply descriptor. -Real interrupt arrives and pre-empts polling thread(see enable_irq()
is already called).
-Interrupt context picks the same reply descriptor as fetched by polling
thread, processes it, and exits.
-Polling thread resumes and processes the descriptor which is already
processed by interrupt thread leads to kernel crash.
Setting the "in_used" flag before fetching the reply descriptor ensures synchronized access to ISR.
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +7 -4
@@ -3530,6 +3530,9 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,if (atomic_read (&instance->adprecovery) ==MEGASAS_HW_CRITICAL_ERROR )return IRQ_HANDLED ; +if (irq_context && !atomic_add_unless (&irq_context->in_used,1 ,1 )) +return 0 ; + desc = fusion->reply_frames_desc[MSIxIndex] + fusion->last_reply_idx[MSIxIndex];
@@ -3540,11 +3543,11 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex, reply_descript_type = reply_desc->ReplyFlags &MPI2_RPY_DESCRIPT_FLAGS_TYPE_MASK ; -if (reply_descript_type ==MPI2_RPY_DESCRIPT_FLAGS_UNUSED ) +if (reply_descript_type ==MPI2_RPY_DESCRIPT_FLAGS_UNUSED ) { +if (irq_context) +atomic_dec (&irq_context->in_used);return IRQ_NONE ; - -if (irq_context && !atomic_add_unless (&irq_context->in_used,1 ,1 )) -return 0 ; + } num_completed =0 ;
Signature · 1 line
2.18.1
Sumit Saxena
maintainerPATCH 2/3 megaraid_sas: Add helper functions- {access/release}_irq_context
In reply to Sumit SaxenaAdding helper functions for ISR access and release to improve the readability.
--- drivers/scsi/megaraid/megaraid_sas_fusion.c | 45 ++++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-)
drivers/scsi/megaraid/megaraid_sas_fusion.c +39 -6
@@ -3497,6 +3497,41 @@ megasas_complete_r1_command(struct megasas_instance *instance, } } +/** +* access_irq_context: Access to reply processing +* @irq_context: IRQ context +* +* Synchronize access to reply processing. +* +* Return: true on success, false on failure. +*/ +static inline +bool access_irq_context (struct megasas_irq_context *irq_context) +{ +if (!irq_context) +return true; + +if (atomic_add_unless (&irq_context->in_used,1 ,1 )) +return true; + +return false; +} + +/** +* release_irq_context: Release reply processing +* @irq_context: IRQ context +* +* Release access of reply processing. +* +* Return: Nothing. +*/ +static inline +void release_irq_context (struct megasas_irq_context *irq_context) +{ +if (irq_context) +atomic_dec (&irq_context->in_used); +} +/** * complete_cmd_fusion - Completes command * @instance: Adapter soft state
@@ -3530,7 +3565,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,if (atomic_read (&instance->adprecovery) ==MEGASAS_HW_CRITICAL_ERROR )return IRQ_HANDLED ; -if (irq_context && !atomic_add_unless (&irq_context->in_used,1 ,1 )) +if (!access_irq_context (irq_context))return 0 ; desc = fusion->reply_frames_desc[MSIxIndex] +
@@ -3544,8 +3579,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,MPI2_RPY_DESCRIPT_FLAGS_TYPE_MASK ;if (reply_descript_type ==MPI2_RPY_DESCRIPT_FLAGS_UNUSED ) { -if (irq_context) -atomic_dec (&irq_context->in_used); +release_irq_context (irq_context);return IRQ_NONE ; }
@@ -3663,7 +3697,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex, irq_context->irq_line_enable = true;irq_poll_sched (&irq_context->irqpoll); } -atomic_dec (&irq_context->in_used); +release_irq_context (irq_context);return num_completed; } }
@@ -3682,8 +3716,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,megasas_check_and_restore_queue_depth (instance); } -if (irq_context) -atomic_dec (&irq_context->in_used); +release_irq_context (irq_context);return num_completed; }
Signature · 1 line
2.18.1
Sumit Saxena
maintainerPATCH 3/3 megaraid_sas: Driver version update to 07.719.03.00-rc1
In reply to Sumit Saxena--- drivers/scsi/megaraid/megaraid_sas.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/megaraid/megaraid_sas.h +2 -2
@@ -21,8 +21,8 @@/* * MegaRAID SAS Driver meta data */ -#define MEGASAS_VERSION "07.717.02.00-rc1" -#define MEGASAS_RELDATE "May 19, 2021" +#define MEGASAS_VERSION "07.719.03.00-rc1" +#define MEGASAS_RELDATE "Sep 29, 2021"#define MEGASAS_MSIX_NAME_LEN 32
Signature · 1 line
2.18.1
Martin K. Petersen
AppliedSumit,
Quoted 2 lines
This patchset has a critical fix and added helper functions to improve code readbility in ISR.
Applied to 5.16/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 10 lines · Sumit Saxena
This patchset has a critical fix and added helper functions to improve code readbility in ISR.
Sumit Saxena (3):
megaraid_sas: fix concurrent access to ISR between IRQ polling and
real interrupt
megaraid_sas: Add helper functions- {access/release}_irq_context
megaraid_sas: Driver version update to 07.719.03.00-rc1[...]
Applied to 5.16/scsi-queue, thanks!
[1/3] megaraid_sas: fix concurrent access to ISR between IRQ polling and real interrupt
https://git.kernel.org/mkp/scsi/c/e7dcc514a49e [2/3] megaraid_sas: Add helper functions- {access/release}_irq_context https://git.kernel.org/mkp/scsi/c/4c32edc350e4 [3/3] megaraid_sas: Driver version update to 07.719.03.00-rc1 https://git.kernel.org/mkp/scsi/c/cdf7f6a10d48
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering