The patch titled
flush_workqueue(): use preempt_disable to hold off cpu hotplug
has been removed from the -mm tree. Its filename was
flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: flush_workqueue(): use preempt_disable to hold off cpu hotplug
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Srivatsa Vaddagiri <vatsa@xxxxxxxxxx>
Cc: Gautham Shenoy <ego@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/workqueue.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff -puN kernel/workqueue.c~flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug kernel/workqueue.c
--- a/kernel/workqueue.c~flush_workqueue-use-preempt_disable-to-hold-off-cpu-hotplug
+++ a/kernel/workqueue.c
@@ -419,18 +419,22 @@ static void flush_cpu_workqueue(struct c
* Probably keventd trying to flush its own queue. So simply run
* it by hand rather than deadlocking.
*/
- mutex_unlock(&workqueue_mutex);
+ preempt_enable();
+ /*
+ * We can still touch *cwq here because we are keventd, and
+ * hot-unplug will be waiting us to exit.
+ */
run_workqueue(cwq);
- mutex_lock(&workqueue_mutex);
+ preempt_disable();
} else {
struct wq_barrier barr;
init_wq_barrier(&barr);
__queue_work(cwq, &barr.work);
- mutex_unlock(&workqueue_mutex);
+ preempt_enable(); /* Can no longer touch *cwq */
wait_for_completion(&barr.done);
- mutex_lock(&workqueue_mutex);
+ preempt_disable();
}
}
@@ -449,7 +453,7 @@ static void flush_cpu_workqueue(struct c
*/
void fastcall flush_workqueue(struct workqueue_struct *wq)
{
- mutex_lock(&workqueue_mutex);
+ preempt_disable(); /* CPU hotplug */
if (is_single_threaded(wq)) {
/* Always use first cpu's area. */
flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, singlethread_cpu));
@@ -459,7 +463,7 @@ void fastcall flush_workqueue(struct wor
for_each_online_cpu(cpu)
flush_cpu_workqueue(per_cpu_ptr(wq->cpu_wq, cpu));
}
- mutex_unlock(&workqueue_mutex);
+ preempt_enable();
}
EXPORT_SYMBOL_GPL(flush_workqueue);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
git-ieee1394.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-ioat-vs-git-md-accel.patch
ioat-warning-fix.patch
scsi-cover-up-bugs-fix-up-compiler-warnings-in-megaraid-driver.patch
git-ipwireless_cs.patch
lumpy-reclaim-v4.patch
deprecate-smbfs-in-favour-of-cifs.patch
sync_sb_inodes-propagate-errors.patch
move-page-writeback-acounting-out-of-macros.patch
ext2-reservations.patch
mm-implement-swap-prefetching.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
reiser4.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
vdso-print-fatal-signals-use-ctl_unnumbered.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
kmap_atomic-debugging.patch
shrink_slab-handle-bad-shrinkers.patch
squash-ipc-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
