Skip to content

Commit 951ba9f

Browse files
mrutland-armgregkh
authored andcommitted
percpu: make this_cpu_generic_read() atomic w.r.t. interrupts
commit e88d62cd4b2f0b1ae55e9008e79c2794b1fc914d upstream. As raw_cpu_generic_read() is a plain read from a raw_cpu_ptr() address, it's possible (albeit unlikely) that the compiler will split the access across multiple instructions. In this_cpu_generic_read() we disable preemption but not interrupts before calling raw_cpu_generic_read(). Thus, an interrupt could be taken in the middle of the split load instructions. If a this_cpu_write() or RMW this_cpu_*() op is made to the same variable in the interrupt handling path, this_cpu_read() will return a torn value. For native word types, we can avoid tearing using READ_ONCE(), but this won't work in all cases (e.g. 64-bit types on most 32-bit platforms). This patch reworks this_cpu_generic_read() to use READ_ONCE() where possible, otherwise falling back to disabling interrupts. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Christoph Lameter <cl@linux.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Pranith Kumar <bobby.prani@gmail.com> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-arch@vger.kernel.org Signed-off-by: Tejun Heo <tj@kernel.org> [Mark: backport to v4.4.y] Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e1fe381 commit 951ba9f

1 file changed

Lines changed: 22 additions & 2 deletions

File tree

include/asm-generic/percpu.h

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,35 @@ do { \
105105
(__ret); \
106106
})
107107

108-
#define this_cpu_generic_read(pcp) \
108+
#define __this_cpu_generic_read_nopreempt(pcp) \
109109
({ \
110110
typeof(pcp) __ret; \
111111
preempt_disable(); \
112-
__ret = *this_cpu_ptr(&(pcp)); \
112+
__ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \
113113
preempt_enable(); \
114114
__ret; \
115115
})
116116

117+
#define __this_cpu_generic_read_noirq(pcp) \
118+
({ \
119+
typeof(pcp) __ret; \
120+
unsigned long __flags; \
121+
raw_local_irq_save(__flags); \
122+
__ret = *raw_cpu_ptr(&(pcp)); \
123+
raw_local_irq_restore(__flags); \
124+
__ret; \
125+
})
126+
127+
#define this_cpu_generic_read(pcp) \
128+
({ \
129+
typeof(pcp) __ret; \
130+
if (__native_word(pcp)) \
131+
__ret = __this_cpu_generic_read_nopreempt(pcp); \
132+
else \
133+
__ret = __this_cpu_generic_read_noirq(pcp); \
134+
__ret; \
135+
})
136+
117137
#define this_cpu_generic_to_op(pcp, val, op) \
118138
do { \
119139
unsigned long __flags; \

0 commit comments

Comments
 (0)