The patch titled
remove rcu_assign_pointer(NULL) penalty with type/macro safety
has been added to the -mm tree. Its filename is
remove-rcu_assign_pointernull-penalty-with-type-macro-safety.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: remove rcu_assign_pointer(NULL) penalty with type/macro safety
From: "Paul E. McKenney" <paulmck@xxxxxxxxxxxxxxxxxx>
This is an updated version of the patch posted last November:
http://archives.free.net.ph/message/20071201.003721.cd6ff17c.en.html
This new version permits arguments with side effects, for example:
rcu_assign_pointer(global_p, p++);
and also verifies that the arguments are pointers, while still avoiding the
unnecessary memory barrier when assigning NULL to a pointer. This
memory-barrier avoidance means that rcu_assign_pointer() is now only
permitted for pointers (not array indexes), and so this version emits a
compiler warning if the first argument is not a pointer. I built a "make
allyesconfig" version on an x86 system, and received no such warnings. If
RCU is ever applied to array indexes, then the second patch in this series
should be applied, and the resulting rcu_assign_index() be used.
Given the rather surprising history of subtlely broken implementations of
rcu_assign_pointer(), I took the precaution of generating a full set of
test cases and verified that memory barriers and compiler warnings were
emitted when required. I guess it is the simple things that get you...
Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/rcupdate.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff -puN include/linux/rcupdate.h~remove-rcu_assign_pointernull-penalty-with-type-macro-safety include/linux/rcupdate.h
--- a/include/linux/rcupdate.h~remove-rcu_assign_pointernull-penalty-with-type-macro-safety
+++ a/include/linux/rcupdate.h
@@ -172,14 +172,19 @@ struct rcu_head {
* structure after the pointer assignment. More importantly, this
* call documents which pointers will be dereferenced by RCU read-side
* code.
+ *
+ * Throws a compiler warning for non-pointer arguments.
+ *
+ * Does not insert a memory barrier for a NULL pointer.
*/
-#define rcu_assign_pointer(p, v) \
+#define rcu_assign_pointer(p, v) \
({ \
- if (!__builtin_constant_p(v) || \
- ((v) != NULL)) \
+ typeof(*p) *_________p1 = (v); \
+ \
+ if (!__builtin_constant_p(v) || (_________p1 != NULL)) \
smp_wmb(); \
- (p) = (v); \
+ (p) = _________p1; \
})
/**
_
Patches currently in -mm which might be from paulmck@xxxxxxxxxxxxxxxxxx are
rcupdate-fix-comment.patch
remove-rcu_assign_pointernull-penalty-with-type-macro-safety.patch
git-sched.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
