From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Oleg Nesterov <oleg@redhat.com>
Subject: linux-next: manual merge of the akpm tree with Linus' tree
Date: Tue, 16 Apr 2013 17:25:56 +1000 [thread overview]
Message-ID: <20130416172556.46cb5439c5f6d0b3da12bb15@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2727 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/kthread.c between commit f2530dc71cf0 ("kthread: Prevent unpark
race which puts threads on the wrong cpu") from Linus' tree and commit
"kthread: kill task_get_live_kthread()" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/kthread.c
index e820aa6,b9db231..0000000
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@@ -324,28 -324,6 +324,22 @@@ struct task_struct *kthread_create_on_c
return p;
}
- static struct kthread *task_get_live_kthread(struct task_struct *k)
- {
- get_task_struct(k);
- return to_live_kthread(k);
- }
-
+static void __kthread_unpark(struct task_struct *k, struct kthread *kthread)
+{
+ clear_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
+ /*
+ * We clear the IS_PARKED bit here as we don't wait
+ * until the task has left the park code. So if we'd
+ * park before that happens we'd see the IS_PARKED bit
+ * which might be about to be cleared.
+ */
+ if (test_and_clear_bit(KTHREAD_IS_PARKED, &kthread->flags)) {
+ if (test_bit(KTHREAD_IS_PER_CPU, &kthread->flags))
+ __kthread_bind(k, kthread->cpu, TASK_PARKED);
+ wake_up_state(k, TASK_PARKED);
+ }
+}
+
/**
* kthread_unpark - unpark a thread created by kthread_create().
* @k: thread created by kthread_create().
@@@ -356,11 -334,22 +350,10 @@@
*/
void kthread_unpark(struct task_struct *k)
{
- struct kthread *kthread = task_get_live_kthread(k);
+ struct kthread *kthread = to_live_kthread(k);
- if (kthread) {
- clear_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
- /*
- * We clear the IS_PARKED bit here as we don't wait
- * until the task has left the park code. So if we'd
- * park before that happens we'd see the IS_PARKED bit
- * which might be about to be cleared.
- */
- if (test_and_clear_bit(KTHREAD_IS_PARKED, &kthread->flags)) {
- if (test_bit(KTHREAD_IS_PER_CPU, &kthread->flags))
- __kthread_bind(k, kthread->cpu);
- wake_up_process(k);
- }
- }
+ if (kthread)
+ __kthread_unpark(k, kthread);
- put_task_struct(k);
}
/**
@@@ -415,9 -403,12 +407,12 @@@ int kthread_stop(struct task_struct *k
int ret;
trace_sched_kthread_stop(k);
+
+ get_task_struct(k);
+ kthread = to_live_kthread(k);
if (kthread) {
set_bit(KTHREAD_SHOULD_STOP, &kthread->flags);
- clear_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
+ __kthread_unpark(k, kthread);
wake_up_process(k);
wait_for_completion(&kthread->exited);
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-16 7:26 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 7:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-02 2:17 linux-next: manual merge of the akpm tree with Linus' tree Stephen Rothwell
2019-12-02 2:08 Stephen Rothwell
2018-10-15 7:22 Stephen Rothwell
2018-10-15 7:04 Stephen Rothwell
2018-03-26 8:56 Stephen Rothwell
2017-01-09 2:51 Stephen Rothwell
2016-12-12 5:49 Stephen Rothwell
2016-01-19 2:42 Stephen Rothwell
2016-01-19 2:36 Stephen Rothwell
2015-07-27 5:26 Stephen Rothwell
2013-09-10 4:38 Stephen Rothwell
2013-09-10 22:27 ` Andrew Morton
2013-09-10 22:29 ` Al Viro
2013-09-10 22:35 ` Andrew Morton
2013-09-10 22:36 ` Al Viro
2013-09-10 22:39 ` Al Viro
2013-09-10 22:41 ` Andrew Morton
2013-09-10 22:48 ` Al Viro
2013-09-10 22:59 ` Al Viro
2013-09-10 23:13 ` Andrew Morton
2013-09-10 23:55 ` Al Viro
2013-09-11 4:30 ` Stephen Rothwell
2013-09-10 23:37 ` Linus Torvalds
2013-09-10 23:53 ` Al Viro
2013-09-11 0:01 ` Linus Torvalds
2013-09-11 0:39 ` Dave Chinner
2013-09-13 0:56 ` Linus Torvalds
2013-09-13 1:12 ` Linus Torvalds
2013-09-13 1:35 ` Al Viro
2013-09-13 19:12 ` Linus Torvalds
2013-09-13 19:28 ` Linus Torvalds
2013-09-13 19:54 ` Linus Torvalds
2013-09-13 20:00 ` Al Viro
2013-09-13 20:18 ` Al Viro
2013-09-13 20:23 ` Al Viro
2013-09-13 20:25 ` Linus Torvalds
2013-09-13 20:31 ` Linus Torvalds
2013-09-13 20:31 ` Al Viro
2013-09-13 20:34 ` Linus Torvalds
2013-09-10 22:35 ` Linus Torvalds
2013-09-10 22:44 ` Andrew Morton
2013-09-11 0:30 ` Stephen Rothwell
2013-09-11 0:41 ` Linus Torvalds
2013-09-10 4:21 Stephen Rothwell
2013-09-10 4:09 Stephen Rothwell
2013-09-10 4:12 ` Stephen Rothwell
2013-09-09 5:38 Stephen Rothwell
2013-09-09 5:22 Stephen Rothwell
2013-09-09 5:16 Stephen Rothwell
2013-08-30 8:44 Stephen Rothwell
2013-05-27 6:20 Stephen Rothwell
2013-05-20 4:04 Stephen Rothwell
2013-05-20 12:19 ` Chris Mason
2013-05-13 5:20 Eric Paris
2013-05-13 2:07 Stephen Rothwell
2013-05-13 2:11 ` Eric Paris
2013-05-13 4:16 ` Stephen Rothwell
2013-05-13 4:49 ` Kees Cook
2013-05-13 5:14 ` Eric Paris
2013-05-02 6:01 Stephen Rothwell
2013-04-29 8:38 Stephen Rothwell
2013-04-19 7:40 Stephen Rothwell
2013-04-03 6:10 Stephen Rothwell
2013-03-25 4:22 Stephen Rothwell
2013-03-04 2:21 Stephen Rothwell
2013-01-04 3:27 Stephen Rothwell
2012-12-11 5:25 Stephen Rothwell
2012-12-11 5:22 Stephen Rothwell
2012-12-11 7:58 ` Glauber Costa
2012-12-07 6:39 Stephen Rothwell
2012-11-30 6:24 Stephen Rothwell
2012-11-26 12:52 Stephen Rothwell
2012-11-26 12:48 Stephen Rothwell
2012-11-26 13:25 ` Xiaotian Feng
2012-11-26 12:34 Stephen Rothwell
2012-10-15 2:07 Stephen Rothwell
2012-10-15 22:14 ` Catalin Marinas
2012-10-01 14:15 Stephen Rothwell
2012-08-22 5:59 Stephen Rothwell
2012-08-22 8:58 ` Mel Gorman
2012-07-27 3:57 Stephen Rothwell
2012-07-02 6:39 Stephen Rothwell
2012-06-04 4:58 Stephen Rothwell
2012-05-31 4:24 Stephen Rothwell
2012-05-31 4:13 Stephen Rothwell
2012-05-31 7:25 ` Johannes Weiner
2012-05-31 8:24 ` Stephen Rothwell
2012-05-31 8:27 ` Stephen Rothwell
2012-05-21 8:23 Stephen Rothwell
2012-05-21 8:13 Stephen Rothwell
2012-05-21 8:16 ` Cyrill Gorcunov
2012-03-08 6:53 Stephen Rothwell
2012-03-08 7:32 ` Andrew Morton
2012-03-08 7:41 ` Stephen Rothwell
2012-03-08 7:50 ` Andrew Morton
2012-03-08 7:50 ` Xiao Guangrong
2012-03-08 9:59 ` Xiao Guangrong
2012-03-08 21:24 ` Andrew Morton
2012-03-08 23:42 ` Linus Torvalds
2011-12-28 7:54 Stephen Rothwell
2011-11-08 3:24 Stephen Rothwell
2011-11-01 8:16 Stephen Rothwell
2011-11-01 10:47 ` Tao Ma
2011-09-16 6:09 Stephen Rothwell
2011-08-15 4:52 Stephen Rothwell
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=20130416172556.46cb5439c5f6d0b3da12bb15@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
/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).