From: Peter Zijlstra <peterz@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>,
Paul McKenney <paulmck@linux.vnet.ibm.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 1/6] sched, wait: Make the signal_pending() checks consistent
Date: Mon, 30 Sep 2013 17:22:43 +0200 [thread overview]
Message-ID: <20130930152624.738543200@infradead.org> (raw)
In-Reply-To: <20130930152242.207382649@infradead.org>
[-- Attachment #1: peterz-wait-change-signal.patch --]
[-- Type: text/plain, Size: 2702 bytes --]
There's two patterns to check signals in the __wait_event*() macros:
if (!signal_pending(current)) {
schedule();
continue;
}
ret = -ERESTARTSYS;
break;
And the more natural:
if (signal_pending(current)) {
ret = -ERESTARTSYS;
break;
}
schedule();
Change them all into the latter form.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
---
include/linux/tty.h | 13 ++++++-------
include/linux/wait.h | 35 ++++++++++++++++-------------------
2 files changed, 22 insertions(+), 26 deletions(-)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -686,14 +686,13 @@ do { \
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
- if (!signal_pending(current)) { \
- tty_unlock(tty); \
- schedule(); \
- tty_lock(tty); \
- continue; \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ break; \
} \
- ret = -ERESTARTSYS; \
- break; \
+ tty_unlock(tty); \
+ schedule(); \
+ tty_lock(tty); \
} \
finish_wait(&wq, &__wait); \
} while (0)
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -261,12 +261,11 @@ do { \
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
- if (!signal_pending(current)) { \
- schedule(); \
- continue; \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ break; \
} \
- ret = -ERESTARTSYS; \
- break; \
+ schedule(); \
} \
finish_wait(&wq, &__wait); \
} while (0)
@@ -302,14 +301,13 @@ do { \
prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \
if (condition) \
break; \
- if (!signal_pending(current)) { \
- ret = schedule_timeout(ret); \
- if (!ret) \
- break; \
- continue; \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ break; \
} \
- ret = -ERESTARTSYS; \
- break; \
+ ret = schedule_timeout(ret); \
+ if (!ret) \
+ break; \
} \
if (!ret && (condition)) \
ret = 1; \
@@ -439,14 +437,13 @@ do { \
finish_wait(&wq, &__wait); \
break; \
} \
- if (!signal_pending(current)) { \
- schedule(); \
- continue; \
- } \
- ret = -ERESTARTSYS; \
- abort_exclusive_wait(&wq, &__wait, \
+ if (signal_pending(current)) { \
+ ret = -ERESTARTSYS; \
+ abort_exclusive_wait(&wq, &__wait, \
TASK_INTERRUPTIBLE, NULL); \
- break; \
+ break; \
+ } \
+ schedule(); \
} \
} while (0)
next prev parent reply other threads:[~2013-09-30 15:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-30 15:22 [PATCH 0/6] sched, wait: Collapse __wait_event macros -v4 Peter Zijlstra
2013-09-30 15:22 ` Peter Zijlstra [this message]
2013-09-30 15:22 ` [PATCH 2/6] sched, wait: Change timeout logic Peter Zijlstra
2013-09-30 15:48 ` Linus Torvalds
2013-09-30 16:09 ` Peter Zijlstra
2013-09-30 15:22 ` [PATCH 3/6] sched, wait: Change the wait_exclusive control flow Peter Zijlstra
2013-09-30 15:22 ` [PATCH 4/6] sched, wait: Collapse __wait_event macros Peter Zijlstra
2013-09-30 15:22 ` [PATCH 5/6] sched, wait: Also use ___wait_event() for __wait_event_hrtimeout Peter Zijlstra
2013-09-30 15:22 ` [PATCH 6/6] sched, wait: Make the __wait_event*() interface more friendly Peter Zijlstra
2013-10-01 6:39 ` Ingo Molnar
2013-09-30 15:50 ` [PATCH 0/6] sched, wait: Collapse __wait_event macros -v4 Linus Torvalds
2013-09-30 16:11 ` Peter Zijlstra
2013-09-30 17:40 ` Oleg Nesterov
2013-09-30 18:00 ` Oleg Nesterov
2013-09-30 18:09 ` Peter Zijlstra
2013-09-30 18:13 ` Oleg Nesterov
2013-10-01 14:09 ` Oleg Nesterov
2013-10-01 14:39 ` Peter Zijlstra
2013-10-01 15:16 ` Oleg Nesterov
2013-10-01 17:01 ` [RFC] introduce prepare_to_wait_event() Oleg Nesterov
2013-10-01 17:25 ` Peter Zijlstra
2013-10-01 17:33 ` Oleg Nesterov
2013-10-01 17:44 ` 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=20130930152624.738543200@infradead.org \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®