percpu_ref: remove unnecessary ACCESS_ONCE() in percpu_ref_tryget_live()
Tejun Heo
maintainerPATCH 1/2 percpu_ref: remove unnecessary ACCESS_ONCE() in percpu_ref_tryget_live()
__ref_is_percpu() needs ACCESS_ONCE() on @ref->percpu_count_ptr because the value is tested for !__PERCPU_REF_ATOMIC, which may be set asynchronously, and then used as a pointer. If the compiler generates a separate fetch when using it as a pointer, __PERCPU_REF_ATOMIC may be set in between contaminating the pointer value.
percpu_ref_tryget_live() also uses ACCESS_ONCE() to test __PERCPU_REF_DEAD; however, there's no reason for this. I just copied ACCESS_ONCE() usage blindly from __ref_is_percpu(). All it does is confusing people trying to understand what's going on.
This patch removes the unnecessary ACCESS_ONCE() usage from percpu_ref_tryget_live() and adds a comment explaining why __ref_is_percpu() needs it.
--- include/linux/percpu-refcount.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
include/linux/percpu-refcount.h +12 -2
@@ -128,7 +128,17 @@ static inline void percpu_ref_kill(strucstatic inline bool __ref_is_percpu (struct percpu_ref *ref,unsigned long __percpu **percpu_countp) { -unsigned long percpu_ptr =ACCESS_ONCE (ref->percpu_count_ptr); +unsigned long percpu_ptr; + +/* +* The value of @ref->percpu_count_ptr is tested for +* !__PERCPU_REF_ATOMIC, which may be set asynchronously, and then +* used as a pointer. If the compiler generates a separate fetch +* when using it as a pointer, __PERCPU_REF_ATOMIC may be set in +* between contaminating the pointer value. Make sure that the +* value is fetched once. +*/ + percpu_ptr =ACCESS_ONCE (ref->percpu_count_ptr);/* paired with smp_store_release() in percpu_ref_reinit() */ smp_read_barrier_depends ();
@@ -215,7 +225,7 @@ static inline bool percpu_ref_tryget_livif (__ref_is_percpu (ref, &percpu_count)) {this_cpu_inc (*percpu_count); ret = true; - }else if (!(ACCESS_ONCE (ref->percpu_count_ptr) & __PERCPU_REF_DEAD)) { + }else if (!(ref->percpu_count_ptr & __PERCPU_REF_DEAD)) { ret =atomic_long_inc_not_zero (&ref->count); }
Tejun Heo
maintainerPATCH 2/2 percpu_ref: implement percpu_ref_is_dying()
Implement percpu_ref_is_dying() which tests whether the ref is dying or dead. This is useful to determine the current state when a percpu_ref is used as a cyclic on/off switch via kill and reinit.
--- include/linux/percpu-refcount.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/linux/percpu-refcount.h +14 -0
@@ -258,6 +258,20 @@ static inline void percpu_ref_put(struct }/** +* percpu_ref_is_dying - test whether a percpu refcount is dying or dead +* @ref: percpu_ref to test +* +* Returns %true if @ref is dying or dead. +* +* This function is safe to call as long as @ref is between init and exit +* and the caller is responsible for synchronizing against state changes. +*/ +static inline bool percpu_ref_is_dying (struct percpu_ref *ref) +{ +return ref->percpu_count_ptr & __PERCPU_REF_DEAD; +} + +/** * percpu_ref_is_zero - test whether a percpu refcount reached zero * @ref: percpu_ref to test *