epoll keyed wakeups - make __wake_up_sync accept a key parameter
PATCH 2/7 epoll keyed wakeups - make __wake_up_sync accept a key parameter
The following patch adds an extra "key" parameter to __wake_up_sync(). This allows the caller of this function (and all related macros) to specify a key to be passed to the wakeup callbacks.
Signed-off-by Davide Libenzi <[email protected]>
- Davide
--- include/linux/wait.h | 6 ++++-- kernel/sched.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
include/linux/wait.h +4 -2
@@ -134,7 +134,8 @@ static inline void __remove_wait_queue(wvoid __wake_up (wait_queue_head_t *q,unsigned int mode,int nr,void *key);extern void __wake_up_locked (wait_queue_head_t *q,unsigned int mode,void *key); -extern void __wake_up_sync (wait_queue_head_t *q,unsigned int mode,int nr); +extern void __wake_up_sync (wait_queue_head_t *q,unsigned int mode,int nr, +void *key);void __wake_up_bit (wait_queue_head_t *,void *,int );int __wait_on_bit (wait_queue_head_t *,struct wait_bit_queue *,int (*)(void *),unsigned );int __wait_on_bit_lock (wait_queue_head_t *,struct wait_bit_queue *,int (*)(void *),unsigned );
@@ -151,7 +152,8 @@ wait_queue_head_t *bit_waitqueue(void *,#define wake_up_interruptible (x) __wake_up(x, TASK_INTERRUPTIBLE, 1, NULL)#define wake_up_interruptible_nr (x, nr) __wake_up(x, TASK_INTERRUPTIBLE, nr, NULL)#define wake_up_interruptible_all (x) __wake_up(x, TASK_INTERRUPTIBLE, 0, NULL) -#define wake_up_interruptible_sync (x) __wake_up_sync((x), TASK_INTERRUPTIBLE, 1) +#define wake_up_interruptible_sync (x) __wake_up_sync((x), TASK_INTERRUPTIBLE, 1, \ + NULL)#ifdef CONFIG_DEBUG_LOCK_ALLOC /*
kernel/sched.c +4 -2
@@ -4732,6 +4732,7 @@ void __wake_up_locked(wait_queue_head_t* @q: the waitqueue * @mode: which threads * @nr_exclusive: how many wake-one or wake-many threads to wake up +* @key: is directly passed to the wakeup function * * The sync wakeup differs that the waker knows that it will schedule * away soon, so while the target thread will be woken up, it will not
@@ -4741,7 +4742,8 @@ void __wake_up_locked(wait_queue_head_t* On UP it can prevent extra preemption. */ void -__wake_up_sync (wait_queue_head_t *q,unsigned int mode,int nr_exclusive) +__wake_up_sync (wait_queue_head_t *q,unsigned int mode,int nr_exclusive, +void *key) {unsigned long flags;int sync =1 ;
@@ -4753,7 +4755,7 @@ __wake_up_sync(wait_queue_head_t *q, uns sync =0 ;spin_lock_irqsave (&q->lock, flags); -__wake_up_common (q, mode, nr_exclusive, sync,NULL ); +__wake_up_common (q, mode, nr_exclusive, sync, key);spin_unlock_irqrestore (&q->lock, flags); }EXPORT_SYMBOL_GPL (__wake_up_sync);/* For internal use only */