wait: use wrapper functions
PATCH v2 1/1 wait: use wrapper functions
use wrapper functions
epoll should not touch flags in wait_queue_t. This patch introduces a new function __add_wait_queue_excl(), for the users, who use wait queue as a LIFO queue.
__add_wait_queue_tail_excl() is introduced too instead of add_wait_queue_exclusive_locked(). remove_wait_queue_locked() is removed, as it is a duplicate of __remove_wait_queue(), disliked by users, and with less users.
----
fs/eventpoll.c | 3 +-- include/linux/wait.h | 35 +++++++++++++++-------------------- kernel/cgroup.c | 2 +- kernel/sched.c | 3 +-- 4 files changed, 18 insertions(+), 25 deletions(-)
fs/eventpoll.c +1 -2
@@ -1140,8 +1140,7 @@ retry:* ep_poll_callback() when events will become available. */ init_waitqueue_entry (&wait, current); - wait.flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue (&ep->wq, &wait); +__add_wait_queue_excl (&ep->wq, &wait);for (;;) {/*
include/linux/wait.h +15 -20
@@ -127,12 +127,26 @@ static inline void __add_wait_queue(wait_queue_head_t *head, wait_queue_t *new)/* * Used for wake-one threads: */ +static inline void __add_wait_queue_excl (wait_queue_head_t *q, +wait_queue_t *wait) +{ + wait->flags |=WQ_FLAG_EXCLUSIVE ; +__add_wait_queue (q, wait); +} +static inline void __add_wait_queue_tail (wait_queue_head_t *head, -wait_queue_t *new) +wait_queue_t *new) {list_add_tail (&new->task_list, &head->task_list); } +static inline void __add_wait_queue_tail_excl (wait_queue_head_t *q, +wait_queue_t *wait) +{ + wait->flags |=WQ_FLAG_EXCLUSIVE ; +__add_wait_queue_tail (q, wait); +} +static inline void __remove_wait_queue (wait_queue_head_t *head,wait_queue_t *old) {
@@ -404,25 +418,6 @@ do { \ })/* -* Must be called with the spinlock in the wait_queue_head_t held. -*/ -static inline void add_wait_queue_exclusive_locked (wait_queue_head_t *q, -wait_queue_t * wait) -{ - wait->flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_tail (q, wait); -} - -/* -* Must be called with the spinlock in the wait_queue_head_t held. -*/ -static inline void remove_wait_queue_locked (wait_queue_head_t *q, -wait_queue_t * wait) -{ -__remove_wait_queue (q, wait); -} - -/* * These are the old interfaces to sleep waiting for an event. * They are racy. DO NOT use them, use the wait_event* interfaces above. * We plan to remove these interfaces.
kernel/cgroup.c +1 -1
@@ -3010,7 +3010,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode,unsigned long flags = (unsigned long )key;if (flags &POLLHUP ) { -remove_wait_queue_locked (event->wqh, &event->wait); +__remove_wait_queue (event->wqh, &event->wait);spin_lock (&cgrp->event_list_lock);list_del (&event->list);spin_unlock (&cgrp->event_list_lock);
kernel/sched.c +1 -2
@@ -4039,8 +4039,7 @@ do_wait_for_common(struct completion *x, long timeout, int state)if (!x->done) {DECLARE_WAITQUEUE (wait, current); - wait.flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_tail (&x->wait, &wait); +__add_wait_queue_tail_excl (&x->wait, &wait); do { if (signal_pending_state(state, current)) { timeout = -ERESTARTSYS;
Peter Zijlstra
maintainerQuoted 6 lines · Changli Gao
use wrapper functions
epoll should not touch flags in
wait_queue_t. This patch introduces a new function__add_wait_queue_excl(), for the users, who use wait queue as a LIFO queue.
Quoted 6 lines
__add_wait_queue_tail_excl()is introduced too instead ofadd_wait_queue_exclusive_locked().remove_wait_queue_locked()is removed, as it is a duplicate of__remove_wait_queue(), disliked by users, and with less users.Signed-off-by Changli Gao <[email protected]>
Looks good to me. I can feed it to Ingo if he doesn't pick it up himself.
A message that is not in the archive (sent off-list or not yet received): 1273214006-2979-1-git-send-email-xiaosuo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 6 lines · Changli Gao
use wrapper functions
epoll should not touch flags in
wait_queue_t. This patch introduces a new function__add_wait_queue_excl(), for the users, who use wait queue as a LIFO queue.
Quoted 6 lines
__add_wait_queue_tail_excl()is introduced too instead ofadd_wait_queue_exclusive_locked().remove_wait_queue_locked()is removed, as it is a duplicate of__remove_wait_queue(), disliked by users, and with less users.Signed-off-by Changli Gao <[email protected]>
Looks good to me. I can feed it to Ingo if he doesn't pick it up himself.
[tip:sched/core] sched, wait: Use wrapper functions
In reply to a message not in the archiveCommit-ID: a93d2f1744206827ccf416e2cdc5018aa503314e Gitweb: http://git.kernel.org/tip/a93d2f1744206827ccf416e2cdc5018aa503314e Author: Changli Gao <[email protected]> AuthorDate: Fri, 7 May 2010 14:33:26 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 May 2010 17:43:58 +0200
sched, wait: Use wrapper functions
epoll should not touch flags in wait_queue_t. This patch introduces a new function __add_wait_queue_exclusive(), for the users, who use wait queue as a LIFO queue.
__add_wait_queue_tail_exclusive() is introduced too instead of add_wait_queue_exclusive_locked(). remove_wait_queue_locked() is removed, as it is a duplicate of __remove_wait_queue(), disliked by users, and with less users.
LKML-Reference: <1273214006-2979-1-git-send-email-xiaosuo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
--- fs/eventpoll.c | 3 +-- include/linux/wait.h | 35 +++++++++++++++-------------------- kernel/cgroup.c | 2 +- kernel/sched.c | 3 +-- 4 files changed, 18 insertions(+), 25 deletions(-)
fs/eventpoll.c +1 -2
@@ -1140,8 +1140,7 @@ retry:* ep_poll_callback() when events will become available. */ init_waitqueue_entry (&wait, current); - wait.flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue (&ep->wq, &wait); +__add_wait_queue_exclusive (&ep->wq, &wait);for (;;) {/*
include/linux/wait.h +15 -20
@@ -127,12 +127,26 @@ static inline void __add_wait_queue(wait_queue_head_t *head, wait_queue_t *new)/* * Used for wake-one threads: */ +static inline void __add_wait_queue_exclusive (wait_queue_head_t *q, +wait_queue_t *wait) +{ + wait->flags |=WQ_FLAG_EXCLUSIVE ; +__add_wait_queue (q, wait); +} +static inline void __add_wait_queue_tail (wait_queue_head_t *head, -wait_queue_t *new) +wait_queue_t *new) {list_add_tail (&new->task_list, &head->task_list); } +static inline void __add_wait_queue_tail_exclusive (wait_queue_head_t *q, +wait_queue_t *wait) +{ + wait->flags |=WQ_FLAG_EXCLUSIVE ; +__add_wait_queue_tail (q, wait); +} +static inline void __remove_wait_queue (wait_queue_head_t *head,wait_queue_t *old) {
@@ -404,25 +418,6 @@ do { \ })/* -* Must be called with the spinlock in the wait_queue_head_t held. -*/ -static inline void add_wait_queue_exclusive_locked (wait_queue_head_t *q, -wait_queue_t * wait) -{ - wait->flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_tail (q, wait); -} - -/* -* Must be called with the spinlock in the wait_queue_head_t held. -*/ -static inline void remove_wait_queue_locked (wait_queue_head_t *q, -wait_queue_t * wait) -{ -__remove_wait_queue (q, wait); -} - -/* * These are the old interfaces to sleep waiting for an event. * They are racy. DO NOT use them, use the wait_event* interfaces above. * We plan to remove these interfaces.
kernel/cgroup.c +1 -1
@@ -3010,7 +3010,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode,unsigned long flags = (unsigned long )key;if (flags &POLLHUP ) { -remove_wait_queue_locked (event->wqh, &event->wait); +__remove_wait_queue (event->wqh, &event->wait);spin_lock (&cgrp->event_list_lock);list_del (&event->list);spin_unlock (&cgrp->event_list_lock);
kernel/sched.c +1 -2
@@ -3983,8 +3983,7 @@ do_wait_for_common(struct completion *x, long timeout, int state)if (!x->done) {DECLARE_WAITQUEUE (wait, current); - wait.flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_tail (&x->wait, &wait); +__add_wait_queue_tail_exclusive (&x->wait, &wait); do { if (signal_pending_state(state, current)) { timeout = -ERESTARTSYS;
Quoted 3 lines · On Fri, 7 May 2010 14:33:26 +0800 Changli Gao…
epoll should not touch flags in
wait_queue_t. This patch introduces a new function__add_wait_queue_excl(), for the users, who use wait queue as a LIFO queue.
__add_wait_queue_exclusive(), please. Let's be consistent.
Peter Zijlstra
maintainerQuoted 8 lines · Andrew Morton
Quoted 3 lines · On Fri, 7 May 2010 14:33:26 +0800 Changli Gao <[email protected]> wrote:
epoll should not touch flags in
wait_queue_t. This patch introduces a new function__add_wait_queue_excl(), for the users, who use wait queue as a LIFO queue.
__add_wait_queue_exclusive(), please. Let's be consistent.
done
A message that is not in the archive (sent off-list or not yet received): 20100507135220.a972a6b2.akpm-de/[email protected]
Quoted 8 lines · Andrew Morton
Quoted 3 lines · On Fri, 7 May 2010 14:33:26 +0800 Changli Gao…
epoll should not touch flags in
wait_queue_t. This patch introduces a new function__add_wait_queue_excl(), for the users, who use wait queue as a LIFO queue.
__add_wait_queue_exclusive(), please. Let's be consistent.
done
[tip:sched/core] sched, wait: Use wrapper functions
In reply to Changli GaoCommit-ID: a93d2f1744206827ccf416e2cdc5018aa503314e Gitweb: http://git.kernel.org/tip/a93d2f1744206827ccf416e2cdc5018aa503314e Author: Changli Gao <[email protected]> AuthorDate: Fri, 7 May 2010 14:33:26 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 May 2010 17:43:58 +0200
sched, wait: Use wrapper functions
epoll should not touch flags in wait_queue_t. This patch introduces a new function __add_wait_queue_exclusive(), for the users, who use wait queue as a LIFO queue.
__add_wait_queue_tail_exclusive() is introduced too instead of add_wait_queue_exclusive_locked(). remove_wait_queue_locked() is removed, as it is a duplicate of __remove_wait_queue(), disliked by users, and with less users.
LKML-Reference: <[email protected]>
--- fs/eventpoll.c | 3 +-- include/linux/wait.h | 35 +++++++++++++++-------------------- kernel/cgroup.c | 2 +- kernel/sched.c | 3 +-- 4 files changed, 18 insertions(+), 25 deletions(-)
fs/eventpoll.c +1 -2
@@ -1140,8 +1140,7 @@ retry:* ep_poll_callback() when events will become available. */ init_waitqueue_entry (&wait, current); - wait.flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue (&ep->wq, &wait); +__add_wait_queue_exclusive (&ep->wq, &wait);for (;;) {/*
include/linux/wait.h +15 -20
@@ -127,12 +127,26 @@ static inline void __add_wait_queue(wait_queue_head_t *head, wait_queue_t *new)/* * Used for wake-one threads: */ +static inline void __add_wait_queue_exclusive (wait_queue_head_t *q, +wait_queue_t *wait) +{ + wait->flags |=WQ_FLAG_EXCLUSIVE ; +__add_wait_queue (q, wait); +} +static inline void __add_wait_queue_tail (wait_queue_head_t *head, -wait_queue_t *new) +wait_queue_t *new) {list_add_tail (&new->task_list, &head->task_list); } +static inline void __add_wait_queue_tail_exclusive (wait_queue_head_t *q, +wait_queue_t *wait) +{ + wait->flags |=WQ_FLAG_EXCLUSIVE ; +__add_wait_queue_tail (q, wait); +} +static inline void __remove_wait_queue (wait_queue_head_t *head,wait_queue_t *old) {
@@ -404,25 +418,6 @@ do { \ })/* -* Must be called with the spinlock in the wait_queue_head_t held. -*/ -static inline void add_wait_queue_exclusive_locked (wait_queue_head_t *q, -wait_queue_t * wait) -{ - wait->flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_tail (q, wait); -} - -/* -* Must be called with the spinlock in the wait_queue_head_t held. -*/ -static inline void remove_wait_queue_locked (wait_queue_head_t *q, -wait_queue_t * wait) -{ -__remove_wait_queue (q, wait); -} - -/* * These are the old interfaces to sleep waiting for an event. * They are racy. DO NOT use them, use the wait_event* interfaces above. * We plan to remove these interfaces.
kernel/cgroup.c +1 -1
@@ -3010,7 +3010,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode,unsigned long flags = (unsigned long )key;if (flags &POLLHUP ) { -remove_wait_queue_locked (event->wqh, &event->wait); +__remove_wait_queue (event->wqh, &event->wait);spin_lock (&cgrp->event_list_lock);list_del (&event->list);spin_unlock (&cgrp->event_list_lock);
kernel/sched.c +1 -2
@@ -3983,8 +3983,7 @@ do_wait_for_common(struct completion *x, long timeout, int state)if (!x->done) {DECLARE_WAITQUEUE (wait, current); - wait.flags |=WQ_FLAG_EXCLUSIVE ; -__add_wait_queue_tail (&x->wait, &wait); +__add_wait_queue_tail_exclusive (&x->wait, &wait); do { if (signal_pending_state(state, current)) { timeout = -ERESTARTSYS;