sched/core: Use try_cmpxchg in set_nr_{and_not,if}_polling
PATCH RESEND 1/1 sched/core: Use try_cmpxchg in set_nr_{and_not,if}_polling
Use try_cmpxchg instead of cmpxchg (*ptr, old, new) != old in set_nr_{and_not,if}_polling. x86 cmpxchg returns success in ZF flag, so this change saves a compare after cmpxchg.
The definition of cmpxchg based fetch_or was changed in the same way as atomic_fetch_##op definitions were changed in e6790e4b5d5e97dc287f3496dd2cf2dbabdfdb35.
Also declare these two functions as inline to ensure inlining. In the case of set_nr_and_not_polling, the compiler (gcc) tries to outsmart itself by constructing the boolean return value with logic operations on the fetched value, and these extra operations enlarge the function over the inlining threshold value.
--- kernel/sched/core.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
kernel/sched/core.c +9 -15
@@ -873,15 +873,11 @@ static inline void hrtick_rq_init(struct rq *rq) ({ \typeof (ptr) _ptr = (ptr); \typeof (mask) _mask = (mask); \ - typeof(*_ptr) _old, _val = *_ptr; \ + typeof(*_ptr) _val = *_ptr; \ \ -for (;;) { \ - _old =cmpxchg (_ptr, _val, _val | _mask); \ -if (_old == _val) \ -break ; \ - _val = _old; \ - } \ - _old; \ +do { \ + }while (!try_cmpxchg (_ptr, &_val, _val | _mask)); \ + _val; \ })#if defined(CONFIG_SMP ) && defined(TIF_POLLING_NRFLAG )
@@ -890,7 +886,7 @@ static inline void hrtick_rq_init(struct rq *rq)* this avoids any races wrt polling state changes and thereby avoids * spurious IPIs. */ -static bool set_nr_and_not_polling (struct task_struct *p) +static inline bool set_nr_and_not_polling (struct task_struct *p) {struct thread_info *ti =task_thread_info (p);return !(fetch_or (&ti->flags, _TIF_NEED_RESCHED) & _TIF_POLLING_NRFLAG);
@@ -905,30 +901,28 @@ static bool set_nr_and_not_polling(struct task_struct *p)static bool set_nr_if_polling (struct task_struct *p) {struct thread_info *ti =task_thread_info (p); - typeof(ti->flags) old, val = READ_ONCE(ti->flags); + typeof(ti->flags) val = READ_ONCE(ti->flags);for (;;) {if (!(val & _TIF_POLLING_NRFLAG))return false;if (val & _TIF_NEED_RESCHED)return true; - old =cmpxchg (&ti->flags, val, val | _TIF_NEED_RESCHED); -if (old == val) +if (try_cmpxchg (&ti->flags, &val, val | _TIF_NEED_RESCHED))break ; - val = old; }return true; }#else -static bool set_nr_and_not_polling (struct task_struct *p) +static inline bool set_nr_and_not_polling (struct task_struct *p) {set_tsk_need_resched (p);return true; }#ifdef CONFIG_SMP -static bool set_nr_if_polling (struct task_struct *p) +static inline bool set_nr_if_polling (struct task_struct *p) {return false; }
Signature · 1 line
2.35.3
The following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: c02d5546ea34d589c83eda5055dbd727a396642b Gitweb: https://git.kernel.org/tip/c02d5546ea34d589c83eda5055dbd727a396642b Author: Uros Bizjak <[email protected]> AuthorDate: Wed, 29 Jun 2022 17:15:52 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Mon, 04 Jul 2022 09:23:08 +02:00
sched/core: Use try_cmpxchg in set_nr_{and_not,if}_polling
Use try_cmpxchg instead of cmpxchg (*ptr, old, new) != old in set_nr_{and_not,if}_polling. x86 cmpxchg returns success in ZF flag, so this change saves a compare after cmpxchg.
The definition of cmpxchg based fetch_or was changed in the same way as atomic_fetch_##op definitions were changed in e6790e4b5d5e97dc287f3496dd2cf2dbabdfdb35.
Also declare these two functions as inline to ensure inlining. In the case of set_nr_and_not_polling, the compiler (gcc) tries to outsmart itself by constructing the boolean return value with logic operations on the fetched value, and these extra operations enlarge the function over the inlining threshold value.
--- kernel/sched/core.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
kernel/sched/core.c +9 -15
@@ -873,15 +873,11 @@ static inline void hrtick_rq_init(struct rq *rq) ({ \typeof (ptr) _ptr = (ptr); \typeof (mask) _mask = (mask); \ - typeof(*_ptr) _old, _val = *_ptr; \ + typeof(*_ptr) _val = *_ptr; \ \ -for (;;) { \ - _old =cmpxchg (_ptr, _val, _val | _mask); \ -if (_old == _val) \ -break ; \ - _val = _old; \ - } \ - _old; \ +do { \ + }while (!try_cmpxchg (_ptr, &_val, _val | _mask)); \ + _val; \ })#if defined(CONFIG_SMP ) && defined(TIF_POLLING_NRFLAG )
@@ -890,7 +886,7 @@ static inline void hrtick_rq_init(struct rq *rq)* this avoids any races wrt polling state changes and thereby avoids * spurious IPIs. */ -static bool set_nr_and_not_polling (struct task_struct *p) +static inline bool set_nr_and_not_polling (struct task_struct *p) {struct thread_info *ti =task_thread_info (p);return !(fetch_or (&ti->flags, _TIF_NEED_RESCHED) & _TIF_POLLING_NRFLAG);
@@ -905,30 +901,28 @@ static bool set_nr_and_not_polling(struct task_struct *p)static bool set_nr_if_polling (struct task_struct *p) {struct thread_info *ti =task_thread_info (p); - typeof(ti->flags) old, val = READ_ONCE(ti->flags); + typeof(ti->flags) val = READ_ONCE(ti->flags);for (;;) {if (!(val & _TIF_POLLING_NRFLAG))return false;if (val & _TIF_NEED_RESCHED)return true; - old =cmpxchg (&ti->flags, val, val | _TIF_NEED_RESCHED); -if (old == val) +if (try_cmpxchg (&ti->flags, &val, val | _TIF_NEED_RESCHED))break ; - val = old; }return true; }#else -static bool set_nr_and_not_polling (struct task_struct *p) +static inline bool set_nr_and_not_polling (struct task_struct *p) {set_tsk_need_resched (p);return true; }#ifdef CONFIG_SMP -static bool set_nr_if_polling (struct task_struct *p) +static inline bool set_nr_if_polling (struct task_struct *p) {return false; }
Steven Rostedt
reviewerQuoted 7 lines · On Wed, 29 Jun 2022 17:15:52 +0200 Uros Bizjak <[email protected]> wrote:
+++
b/kernel/sched/core.ckernel/sched/core.c +1
-1@@ -873,15 +873,11 @@ static inline void hrtick_rq_init(struct rq *rq) ({ \ typeof(ptr) _ptr = (ptr); \ typeof(mask) _mask = (mask); \ - typeof(*_ptr) _old, _val = *_ptr; \ + typeof(*_ptr) _val = *_ptr; \
kernel/sched/core.c static inline void hrtick_rq_init(struct rq *rq) · line 879
Quoted 10 lines
kernel/sched/core.c +2
-7\ -for (;;) { \ - _old =cmpxchg (_ptr, _val, _val | _mask); \ -if (_old == _val) \ -break ; \ - _val = _old; \ - } \ - _old; \ +do { \ + }while (!try_cmpxchg (_ptr, &_val, _val | _mask)); \
I'm curious to why use a do { } while() and not just:
while (!try_cmpxchg(_ptr, &_val, _val | _mask)) ;
I see that this is Peter's recommended way from commit a9ebf306f52c75 ("locking/atomic: Introduce atomic_try_cmpxchg()")
Peter, why the do { } while() ?
Does it generate better asm than while () ; ?
-- Steve
Quoted 2 lines
kernel/sched/core.c +1
-0+ _val; \ })