Skip to contentSkip to conversation

mpi3mr: IRQ save variants of spinlock to protect chain frame allocation

PATCH Applied Ranjan Kumar 2 participants 2 messages Apr 6, 2023 – Apr 12, 2023

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

PATCH 1/1 mpi3mr: IRQ save variants of spinlock to protect chain frame allocation

Driver use spin lock without irqsave when it needs to acquire a chain frame to protect chain frame allocation from multiple submission threads. If there is any I/O queued from an interrupt context and if that requires a chain frame and if the chain lock is held by the CPU which got interrupted then there will be a possible deadlock.

---
 drivers/scsi/mpi3mr/mpi3mr_os.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_os.c +3 -3
index 6d55698ea4d1..ee6af3d4d667 100644
@@ -3311,19 +3311,19 @@ static int mpi3mr_get_chain_idx(struct mpi3mr_ioc *mrioc)
 {
 	u8 retry_count = 5;
 	int cmd_idx = -1;
+	unsigned long flags;
 
+	spin_lock_irqsave(&mrioc->chain_buf_lock, flags);
 	do {
-		spin_lock(&mrioc->chain_buf_lock);
 		cmd_idx = find_first_zero_bit(mrioc->chain_bitmap,
 		    mrioc->chain_buf_count);
 		if (cmd_idx < mrioc->chain_buf_count) {
 			set_bit(cmd_idx, mrioc->chain_bitmap);
-			spin_unlock(&mrioc->chain_buf_lock);
 			break;
 		}
-		spin_unlock(&mrioc->chain_buf_lock);
 		cmd_idx = -1;
 	} while (retry_count--);
+	spin_unlock_irqrestore(&mrioc->chain_buf_lock, flags);
 	return cmd_idx;
 }
 
Signature · 1 line
2.31.1
#1 lore raw

Ranjan,

Quoted 5 lines

Driver use spin lock without irqsave when it needs to acquire a chain frame to protect chain frame allocation from multiple submission threads. If there is any I/O queued from an interrupt context and if that requires a chain frame and if the chain lock is held by the CPU which got interrupted then there will be a possible deadlock.

Applied to 6.4/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering