51 lines
1.3 KiB
Diff
51 lines
1.3 KiB
Diff
|
From 8ef254e0dcd7351a9ce7ec61ea26c55d3d87418c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Date: Thu, 20 Dec 2012 18:28:26 +0100
|
||
|
|
Subject: [PATCH 218/365] block: Use cpu_chill() for retry loops
|
||
|
|
|
||
|
|
Retry loops on RT might loop forever when the modifying side was
|
||
|
|
preempted. Steven also observed a live lock when there was a
|
||
|
|
concurrent priority boosting going on.
|
||
|
|
|
||
|
|
Use cpu_chill() instead of cpu_relax() to let the system
|
||
|
|
make progress.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
---
|
||
|
|
block/blk-ioc.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
|
||
|
|
index 381cb50a673c..dc8785233d94 100644
|
||
|
|
--- a/block/blk-ioc.c
|
||
|
|
+++ b/block/blk-ioc.c
|
||
|
|
@@ -7,6 +7,7 @@
|
||
|
|
#include <linux/bio.h>
|
||
|
|
#include <linux/blkdev.h>
|
||
|
|
#include <linux/slab.h>
|
||
|
|
+#include <linux/delay.h>
|
||
|
|
|
||
|
|
#include "blk.h"
|
||
|
|
|
||
|
|
@@ -109,7 +110,7 @@ static void ioc_release_fn(struct work_struct *work)
|
||
|
|
spin_unlock(q->queue_lock);
|
||
|
|
} else {
|
||
|
|
spin_unlock_irqrestore(&ioc->lock, flags);
|
||
|
|
- cpu_relax();
|
||
|
|
+ cpu_chill();
|
||
|
|
spin_lock_irqsave_nested(&ioc->lock, flags, 1);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -187,7 +188,7 @@ void put_io_context_active(struct io_context *ioc)
|
||
|
|
spin_unlock(icq->q->queue_lock);
|
||
|
|
} else {
|
||
|
|
spin_unlock_irqrestore(&ioc->lock, flags);
|
||
|
|
- cpu_relax();
|
||
|
|
+ cpu_chill();
|
||
|
|
goto retry;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|