[lkml]   [2016]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH RT 14/20] sched,preempt: Fix preempt_count manipulations
4.1.27-rt31-rc1 stable review patch.
If anyone has any objections, please let me know.


From: Peter Zijlstra <>

Vikram reported that his ARM64 compiler managed to 'optimize' away the
preempt_count manipulations in code like:


Irrespective of that fact that that is horrible code that should be
fixed for many reasons, it does highlight a deficiency in the generic
preempt_count manipulators. As it is never right to combine/elide
preempt_count manipulations like this.

Therefore sprinkle some volatile in the two generic accessors to
ensure the compiler is aware of the fact that the preempt_count is
observed outside of the regular program-order view and thus cannot be
optimized away like this.

x86; the only arch not using the generic code is not affected as we
do all this in asm in order to use the segment base per-cpu stuff.

Cc: Thomas Gleixner <>
Fixes: a787870924db ("sched, arch: Create asm/preempt.h")
Reported-by: Vikram Mulukutla <>
Tested-by: Vikram Mulukutla <>
Signed-off-by: Peter Zijlstra (Intel) <>
Signed-off-by: Sebastian Andrzej Siewior <>
Signed-off-by: Steven Rostedt <>
include/asm-generic/preempt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/preempt.h b/include/asm-generic/preempt.h
index b6a53e8e526a..c91d3d764c36 100644
--- a/include/asm-generic/preempt.h
+++ b/include/asm-generic/preempt.h
@@ -7,10 +7,10 @@

static __always_inline int preempt_count(void)
- return current_thread_info()->preempt_count;
+ return READ_ONCE(current_thread_info()->preempt_count);

-static __always_inline int *preempt_count_ptr(void)
+static __always_inline volatile int *preempt_count_ptr(void)
return &current_thread_info()->preempt_count;

 \ /
  Last update: 2016-07-12 16:41    [W:0.130 / U:1.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site