From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yong Zhang Subject: [PATCH -rt 4/5] workqueue: hotplug fix Date: Sun, 16 Oct 2011 18:56:46 +0800 Message-ID: <1318762607-2261-5-git-send-email-yong.zhang0@gmail.com> References: <1318762607-2261-1-git-send-email-yong.zhang0@gmail.com> Cc: linux-rt-users@vger.kernel.org, tglx@linutronix.de To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1318762607-2261-1-git-send-email-yong.zhang0@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-rt-users.vger.kernel.org BUG: sleeping function called from invalid context at kernel/rtmutex.c:645 in_atomic(): 1, irqs_disabled(): 0, pid: 1739, name: bash Pid: 1739, comm: bash Not tainted 3.0.6-rt17-00284-gb76d419 #3 Call Trace: [] ? printk+0x1d/0x20 [] __might_sleep+0xe6/0x110 [] rt_spin_lock+0x1c/0x30 [] flush_gcwq+0x236/0x320 [] ? kfree+0xe1/0x1a0 [] ? __cpufreq_remove_dev+0xf8/0x260 [] ? rt_down_write+0xd/0x10 [] workqueue_cpu_down_callback+0x26/0x2d [] notifier_call_chain+0x45/0x60 [] __raw_notifier_call_chain+0x1e/0x30 [] __cpu_notify+0x24/0x40 [] _cpu_down+0xdf/0x330 [] cpu_down+0x30/0x50 [] store_online+0x50/0xa7 [] ? acpi_os_map_memory+0xec/0xec [] sysdev_store+0x2a/0x40 [] sysfs_write_file+0xa4/0x100 [] vfs_write+0xa2/0x170 [] ? sysfs_poll+0x90/0x90 [] sys_write+0x42/0x70 [] sysenter_do_call+0x12/0x2d CPU 1 is now offline SMP alternatives: switching to UP code SMP alternatives: switching to SMP code Booting Node 0 Processor 1 APIC 0x1 smpboot cpu 1: start_ip = 9b000 Initializing CPU#1 BUG: sleeping function called from invalid context at kernel/rtmutex.c:645 in_atomic(): 1, irqs_disabled(): 1, pid: 0, name: kworker/0:0 Pid: 0, comm: kworker/0:0 Not tainted 3.0.6-rt17-00284-gb76d419 #3 Call Trace: [] ? printk+0x1d/0x20 [] __might_sleep+0xe6/0x110 [] rt_spin_lock+0x1c/0x30 [] workqueue_cpu_up_callback+0x56/0xf3 [] notifier_call_chain+0x45/0x60 [] __raw_notifier_call_chain+0x1e/0x30 [] __cpu_notify+0x24/0x40 [] cpu_notify+0x1c/0x20 [] notify_cpu_starting+0x1e/0x20 [] smp_callin+0xfb/0x10e [] start_secondary+0x19/0xd7 NMI watchdog enabled, takes one hw-pmu counter. Switched to NOHz mode on CPU #1 Signed-off-by: Yong Zhang --- kernel/workqueue.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e262f6b..ddbf89c 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -3195,30 +3195,34 @@ static int __devinit workqueue_cpu_up_callback(struct notifier_block *nfb, } /* some are called w/ irq disabled, don't disturb irq status */ - spin_lock_irqsave(&gcwq->lock, flags); switch (action) { case CPU_UP_PREPARE: + spin_lock_irqsave(&gcwq->lock, flags); BUG_ON(gcwq->first_idle); gcwq->first_idle = new_worker; + spin_unlock_irqrestore(&gcwq->lock, flags); break; case CPU_UP_CANCELED: + spin_lock_irqsave(&gcwq->lock, flags); destroy_worker(gcwq->first_idle); gcwq->first_idle = NULL; + spin_unlock_irqrestore(&gcwq->lock, flags); break; case CPU_ONLINE: + spin_lock_irqsave(&gcwq->lock, flags); spin_unlock_irq(&gcwq->lock); kthread_bind(gcwq->first_idle->task, cpu); spin_lock_irq(&gcwq->lock); gcwq->flags |= GCWQ_MANAGE_WORKERS; start_worker(gcwq->first_idle); gcwq->first_idle = NULL; + spin_unlock_irqrestore(&gcwq->lock, flags); break; } - spin_unlock_irqrestore(&gcwq->lock, flags); return notifier_from_errno(0); } @@ -3274,14 +3278,14 @@ static void flush_gcwq(struct global_cwq *gcwq) spin_unlock_irq(&gcwq->lock); - gcwq = get_gcwq(get_cpu()); + gcwq = get_gcwq(get_cpu_light()); spin_lock_irq(&gcwq->lock); list_for_each_entry_safe(work, nw, &non_affine_works, entry) { list_del_init(&work->entry); ___queue_work(get_work_cwq(work)->wq, gcwq, work); } spin_unlock_irq(&gcwq->lock); - put_cpu(); + put_cpu_light(); } static int __devinit workqueue_cpu_down_callback(struct notifier_block *nfb, -- 1.7.1