Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78ddb08f authored by Johannes Weiner's avatar Johannes Weiner Committed by Ingo Molnar
Browse files

wait: don't use __wake_up_common() 



'777c6c5f wait: prevent exclusive waiter starvation' made
__wake_up_common() global to be used from abort_exclusive_wait().

It was needed to do a wake-up with the waitqueue lock held while
passing down a key to the wake-up function.

Since '4ede816a epoll keyed wakeups: add __wake_up_locked_key() and
__wake_up_sync_key()' there is an appropriate wrapper for this case:
__wake_up_locked_key().

Use it here and make __wake_up_common() private to the scheduler
again.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1239720785-19661-1-git-send-email-hannes@cmpxchg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e790fb0b

include/linux/wait.h

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ static inline void __remove_wait_queue(wait_queue_head_t *head, 
	list_del(&old->task_list);

}



void __wake_up_common(wait_queue_head_t *q, unsigned int mode,

			int nr_exclusive, int sync, void *key);

void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key);

void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key);

void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode, int nr,

kernel/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -5345,7 +5345,7 @@ EXPORT_SYMBOL(default_wake_function); 
 * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns

 * zero in this (rare) case, and we handle it by continuing to scan the queue.

 */

void __wake_up_common(wait_queue_head_t *q, unsigned int mode,

static void __wake_up_common(wait_queue_head_t *q, unsigned int mode,

			int nr_exclusive, int sync, void *key)

{

	wait_queue_t *curr, *next;

kernel/wait.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait, 
	if (!list_empty(&wait->task_list))

		list_del_init(&wait->task_list);

	else if (waitqueue_active(q))

		__wake_up_common(q, mode, 1, 0, key);

		__wake_up_locked_key(q, mode, key);

	spin_unlock_irqrestore(&q->lock, flags);

}

EXPORT_SYMBOL(abort_exclusive_wait);