[PATCH] locking/barriers: evaluate the argument to lockless_dereference only once

From	Mateusz Guzik <mguzik@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] locking/barriers: evaluate the argument to lockless_dereference only once
Date	2016-06-07 15:20 +0200
Message-ID	<rHp5f-3b5-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

The commit 25841ee0e9d2a ("Validate lockless_dereference() is used on a
pointer type") added a second use of the parameter to the macro.

This leads to trouble with consumers which use arguments with side
effects.

Instead, reuse the value which was read the first time.

Signed-off-by: Mateusz Guzik <mguzik@redhat.com>

---
 include/linux/compiler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index e9c6417..06f27fd 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -551,8 +551,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
  */
 #define lockless_dereference(p) \
 ({ \
-	__maybe_unused const void * const _________p2 = p; \
 	typeof(p) _________p1 = READ_ONCE(p); \
+	__maybe_unused const void * const _________p2 = _________p1; \
 	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \
 	(_________p1); \
 })
-- 
1.8.3.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] locking/barriers: evaluate the argument to lockless_dereference only once Mateusz Guzik <mguzik@redhat.com> - 2016-06-07 15:20 +0200

csiph-web