From: Peter Zijlstra <peterz@infradead.org>
To: mingo@kernel.org, oleg@redhat.com, torvalds@linux-foundation.org
Cc: tglx@linutronix.de, ilya.dryomov@inktank.com,
umgwanakikbuti@gmail.com, linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 07/11] smp: Correctly deal with nested sleeps
Date: Wed, 24 Sep 2014 10:18:52 +0200 [thread overview]
Message-ID: <20140924082242.392279328@infradead.org> (raw)
In-Reply-To: 20140924081845.572814794@infradead.org
[-- Attachment #1: peterz-might_sleep_smpboot.patch --]
[-- Type: text/plain, Size: 1770 bytes --]
smp_hotplug_thread::{setup,unpark} functions can sleep too, so be
consistent and do the same for all callbacks.
__might_sleep+0x74/0x80
kmem_cache_alloc_trace+0x4e/0x1c0
perf_event_alloc+0x55/0x450
perf_event_create_kernel_counter+0x2f/0x100
watchdog_nmi_enable+0x8d/0x160
watchdog_enable+0x45/0x90
smpboot_thread_fn+0xec/0x2b0
kthread+0xe4/0x100
ret_from_fork+0x7c/0xb0
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
kernel/smpboot.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -110,7 +110,7 @@ static int smpboot_thread_fn(void *data)
set_current_state(TASK_INTERRUPTIBLE);
preempt_disable();
if (kthread_should_stop()) {
- set_current_state(TASK_RUNNING);
+ __set_current_state(TASK_RUNNING);
preempt_enable();
if (ht->cleanup)
ht->cleanup(td->cpu, cpu_online(td->cpu));
@@ -136,26 +136,27 @@ static int smpboot_thread_fn(void *data)
/* Check for state change setup */
switch (td->status) {
case HP_THREAD_NONE:
+ __set_current_state(TASK_RUNNING);
preempt_enable();
if (ht->setup)
ht->setup(td->cpu);
td->status = HP_THREAD_ACTIVE;
- preempt_disable();
- break;
+ continue;
+
case HP_THREAD_PARKED:
+ __set_current_state(TASK_RUNNING);
preempt_enable();
if (ht->unpark)
ht->unpark(td->cpu);
td->status = HP_THREAD_ACTIVE;
- preempt_disable();
- break;
+ continue;
}
if (!ht->thread_should_run(td->cpu)) {
- preempt_enable();
+ preempt_enable_no_resched();
schedule();
} else {
- set_current_state(TASK_RUNNING);
+ __set_current_state(TASK_RUNNING);
preempt_enable();
ht->thread_fn(td->cpu);
}
next prev parent reply other threads:[~2014-09-24 8:27 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 8:18 [PATCH 00/11] nested sleeps, fixes and debug infrastructure Peter Zijlstra
2014-09-24 8:18 ` [PATCH 01/11] locking/mutex: Dont assume TASK_RUNNING Peter Zijlstra
2014-10-28 11:09 ` [tip:sched/core] locking/mutex: Don't " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 02/11] wait: Provide infrastructure to deal with nested blocking Peter Zijlstra
2014-09-29 21:02 ` Oleg Nesterov
2014-10-02 7:37 ` Peter Zijlstra
2014-10-02 21:21 ` Oleg Nesterov
2014-10-28 11:09 ` [tip:sched/core] sched/wait: " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 03/11] wait: Add might_sleep() Peter Zijlstra
2014-10-28 11:09 ` [tip:sched/core] sched/wait: Add might_sleep() checks tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 04/11] exit: Deal with nested sleeps Peter Zijlstra
2014-10-28 11:10 ` [tip:sched/core] sched, " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 05/11] inotify: " Peter Zijlstra
2014-10-28 11:10 ` [tip:sched/core] sched, " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 06/11] tty: " Peter Zijlstra
2014-10-28 11:10 ` [tip:sched/core] sched, " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` Peter Zijlstra [this message]
2014-10-28 11:11 ` [tip:sched/core] sched, smp: Correctly deal " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 08/11] module: Fix nested sleep Peter Zijlstra
2014-09-29 22:18 ` Oleg Nesterov
2014-09-30 13:43 ` Peter Zijlstra
2014-10-28 11:11 ` [tip:sched/core] sched, modules: Fix nested sleep in add_unformed_module() tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 09/11] net: Clean up sk_wait_event() vs might_sleep() Peter Zijlstra
2014-09-24 8:36 ` Peter Zijlstra
2014-10-28 11:11 ` [tip:sched/core] sched, net: Clean up sk_wait_event() vs. might_sleep() tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 10/11] sched: Debug nested sleeps Peter Zijlstra
2014-09-29 22:13 ` Oleg Nesterov
2014-09-30 13:49 ` Peter Zijlstra
2014-09-30 21:47 ` Oleg Nesterov
2014-10-01 16:10 ` Peter Zijlstra
2014-10-01 18:35 ` Oleg Nesterov
2014-10-02 9:07 ` Peter Zijlstra
2014-10-02 21:34 ` Oleg Nesterov
2014-10-28 11:11 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2014-09-24 8:18 ` [PATCH 11/11] sched: Exclude cond_resched() from nested sleep test Peter Zijlstra
2014-10-28 11:12 ` [tip:sched/core] " tip-bot for Peter Zijlstra
2014-09-25 8:30 ` [PATCH 00/11] nested sleeps, fixes and debug infrastructure Mike Galbraith
2014-09-25 9:06 ` Peter Zijlstra
2014-09-25 9:10 ` Mike Galbraith
2014-09-25 9:15 ` Peter Zijlstra
2014-09-25 9:56 ` Mike Galbraith
2014-09-25 13:59 ` BUG: sleeping function called from invalid context at drivers/cpufreq/cpufreq.c:370 Mike Galbraith
2014-09-26 6:24 ` Mike Galbraith
2014-09-26 7:54 ` Mike Galbraith
2014-09-26 14:10 ` Rafael J. Wysocki
2014-09-26 22:44 ` Rafael J. Wysocki
2014-09-27 6:14 ` Mike Galbraith
2014-09-27 19:57 ` Rafael J. Wysocki
2014-10-02 10:22 ` [PATCH 00/11] nested sleeps, fixes and debug infrastructure Peter Zijlstra
2014-10-02 12:15 ` Peter Zijlstra
2014-10-27 13:41 ` Peter Zijlstra
2014-10-28 0:07 ` Oleg Nesterov
2014-10-28 8:23 ` Peter Zijlstra
2014-10-29 0:00 ` Oleg Nesterov
2014-10-29 9:35 ` Peter Zijlstra
2014-10-29 11:31 ` Peter Zijlstra
2014-10-29 11:36 ` Peter Zijlstra
2014-10-29 14:26 ` Peter Zijlstra
2014-11-04 16:08 ` [tip:sched/core] audit, sched/wait: Fixup kauditd_thread() wait loop tip-bot for Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140924082242.392279328@infradead.org \
--to=peterz@infradead.org \
--cc=ilya.dryomov@inktank.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=umgwanakikbuti@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).