Commit-ID: 87ff19cb2f1aa55a5d8b691e6690cc059a59d2ec Gitweb: https://git.kernel.org/tip/87ff19cb2f1aa55a5d8b691e6690cc059a59d2ec Author: Davidlohr Bueso <d...@stgolabs.net> AuthorDate: Sun, 2 Dec 2018 21:31:30 -0800 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 21 Jan 2019 11:18:50 +0100
sched/wake_q: Add branch prediction hint to wake_q_add() cmpxchg The cmpxchg() will fail when the task is already in the process of waking up, and as such is an extremely rare occurrence. Micro-optimize the call and put an unlikely() around it. To no surprise, when using CONFIG_PROFILE_ANNOTATED_BRANCHES under a number of workloads the incorrect rate was a mere 1-2%. Signed-off-by: Davidlohr Bueso <dbu...@suse.de> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Acked-by: Waiman Long <long...@redhat.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Will Deacon <will.dea...@arm.com> Cc: Yongji Xie <elohi...@gmail.com> Cc: andrea.pa...@amarulasolutions.com Cc: lili...@baidu.com Cc: liuq...@baidu.com Cc: ni...@baidu.com Cc: xieyon...@baidu.com Cc: yuanlins...@baidu.com Cc: zhangy...@baidu.com Link: https://lkml.kernel.org/r/20181203053130.gwkw6kg72azt2npb@linux-r8p5 Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d8d76a65cfdd..b05eef7d7a1f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -421,7 +421,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task) * state, even in the failed case, an explicit smp_mb() must be used. */ smp_mb__before_atomic(); - if (cmpxchg_relaxed(&node->next, NULL, WAKE_Q_TAIL)) + if (unlikely(cmpxchg_relaxed(&node->next, NULL, WAKE_Q_TAIL))) return; get_task_struct(task);
