Skip to contentSkip to conversation

megaraid_sas: fix for a potential deadlock

PATCH Applied Tomas Henzl 3 participants 5 messages Sep 23, 2024 – Nov 21, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 megaraid_sas: fix for a potential deadlock

This fixes a 'possible circular locking dependency detected' warning

      CPU0                    CPU1 
      ----                    ---- 
 lock(&instance->reset_mutex); 
                              lock(&shost->scan_mutex); 
                              lock(&instance->reset_mutex); 

lock(&shost->scan_mutex);

Fix this but temporarily releasing the reset_mutex.

---
 drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_base.c +4 -1
index 6c79c350a4d5..253cc1159661 100644
@@ -8907,8 +8907,11 @@ megasas_aen_polling(struct work_struct *work)
 						   (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
 						   (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),
 						   0);
-			if (sdev1)
+			if (sdev1) {
+				mutex_unlock(&instance->reset_mutex);
 				megasas_remove_scsi_device(sdev1);
+				mutex_lock(&instance->reset_mutex);
+			}
 
 			event_type = SCAN_VD_CHANNEL;
 			break;
Signature · 1 line
2.46.0
#1 lore raw
Quoted 23 lines · Tomas Henzl

This fixes a 'possible circular locking dependency detected' warning

      CPU0                    CPU1 
      ----                    ---- 
 lock(&instance->reset_mutex); 
                              lock(&shost->scan_mutex); 
                              lock(&instance->reset_mutex); 

lock(&shost->scan_mutex);

Fix this but temporarily releasing the reset_mutex.

---
 drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_base.c +0 -0
index 6c79c350a4d5..253cc1159661 100644
@@ -8907,8 +8907,11 @@ megasas_aen_polling(struct work_struct *work)
 						   (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
 						   (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),

drivers/scsi/megaraid/megaraid_sas_base.c megasas_aen_polling(struct work_struct *work) · line 8917

Quoted 10 lines
drivers/scsi/megaraid/megaraid_sas_base.c +4 -1
 						   0);
-			if (sdev1)
+			if (sdev1) {
+				mutex_unlock(&instance->reset_mutex);
 				megasas_remove_scsi_device(sdev1);
+				mutex_lock(&instance->reset_mutex);
+			}
 
 			event_type = SCAN_VD_CHANNEL;
 			break;

Hi Chandrakanth,

can you please review this patch?

Thanks, Tomas

maintainer Acked-by
#2 lore raw
Quoted 33 lines · Tomas Henzl
Quoted 31 lines · Tomas Henzl

This fixes a 'possible circular locking dependency detected' warning

      CPU0                    CPU1
      ----                    ----
 lock(&instance->reset_mutex);
                              lock(&shost->scan_mutex);
                              lock(&instance->reset_mutex);

lock(&shost->scan_mutex);

Fix this but temporarily releasing the reset_mutex.

---
 drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_base.c +4 -1
index 6c79c350a4d5..253cc1159661 100644
@@ -8907,8 +8907,11 @@ megasas_aen_polling(struct work_struct *work)
                                                 (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
                                                 (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),
                                                 0);
-                     if (sdev1)
+                     if (sdev1) {
+                             mutex_unlock(&instance->reset_mutex);
                              megasas_remove_scsi_device(sdev1);
+                             mutex_lock(&instance->reset_mutex);
+                     }
 
Quoted 9 lines

drivers/scsi/megaraid/megaraid_sas_base.c megasas_aen_polling(struct work_struct *work) · line 8917

Quoted 2 lines
drivers/scsi/megaraid/megaraid_sas_base.c +0 -0
                      event_type = SCAN_VD_CHANNEL;
                      break;

Hi Chandrakanth,

can you please review this patch?

Thanks, Tomas

Patch looks good to me.

maintainer Acked-by on v1 1/1
#3 lore raw
In reply to Tomas Henzl
Quoted 35 lines · Tomas Henzl

This fixes a 'possible circular locking dependency detected' warning

      CPU0                    CPU1
      ----                    ----
 lock(&instance->reset_mutex);
                              lock(&shost->scan_mutex);
                              lock(&instance->reset_mutex);

lock(&shost->scan_mutex);

Fix this but temporarily releasing the reset_mutex.

---
 drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/megaraid/megaraid_sas_base.c +4 -2
index 6c79c350a4d5..253cc1159661 100644
@@ -8907,8 +8907,11 @@ megasas_aen_polling(struct work_struct *work)
                                                   (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
                                                   (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),
                                                   0);
-                       if (sdev1)
+                       if (sdev1) {
+                               mutex_unlock(&instance->reset_mutex);
                                megasas_remove_scsi_device(sdev1);
+                               mutex_lock(&instance->reset_mutex);
+                       }
 
                        event_type = SCAN_VD_CHANNEL;
                        break;
--
Quoted 2 lines

2.46.0

Patch looks good to me.

#4 lore raw

Chandrakanth,

Quoted 1 line
Quoted 1 line

This fixes a 'possible circular locking dependency detected' warning

Applied to 6.13/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering