refcount: always allow checked forms
Subsystems (2)
Mark Rutland
reviewerPATCH v2 1/1 refcount: always allow checked forms
In many cases, it would be useful to be able to use the full sanity-checked refcount helpers regardless of CONFIG_REFCOUNT_FULL, as this would help to avoid duplicate warnings where callers try to sanity-check refcount manipulation.
This patch refactors things such that the full refcount helpers were always built, as refcount_${op}_checked(), such that they can be used regardless of CONFIG_REFCOUNT_FULL. This will allow code which *always* wants a checked refcount to opt-in, avoiding the need to duplicate the logic for warnings.
There should be no functional change as a result of this patch.
--- include/linux/refcount.h | 27 +++++++++++++++++------- lib/refcount.c | 53 +++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 35 deletions(-)
Since v1 [1]:
* Fix refcount_inc_checked() name
* Accumulate acks
Kees, per your reply [2], I'm assuming that either you or David will end up picking this up as part of a series usingthe checked forms.
Mark.
[1] https://lkml.kernel.org/r/[email protected]
[2] https://lkml.kernel.org/r/CAGXu5jLATGcq_mgetUurBriCaPmBQmBwxVW7aa9fAKM2XeSjHw@mail.gmail.com
include/linux/refcount.h +20 -7
@@ -42,17 +42,30 @@ static inline unsigned int refcount_read(const refcount_t *r)return atomic_read (&r->refs); } +extern __must_check bool refcount_add_not_zero_checked (unsigned int i,refcount_t *r); +extern void refcount_add_checked (unsigned int i,refcount_t *r); + +extern __must_check bool refcount_inc_not_zero_checked (refcount_t *r); +extern void refcount_inc_checked (refcount_t *r); + +extern __must_check bool refcount_sub_and_test_checked (unsigned int i,refcount_t *r); + +extern __must_check bool refcount_dec_and_test_checked (refcount_t *r); +extern void refcount_dec_checked (refcount_t *r); +#ifdef CONFIG_REFCOUNT_FULL -extern __must_check bool refcount_add_not_zero (unsigned int i,refcount_t *r); -extern void refcount_add (unsigned int i,refcount_t *r); -extern __must_check bool refcount_inc_not_zero (refcount_t *r); -extern void refcount_inc (refcount_t *r); +#define refcount_add_not_zero refcount_add_not_zero_checked +#define refcount_add refcount_add_checked + +#define refcount_inc_not_zero refcount_inc_not_zero_checked +#define refcount_inc refcount_inc_checked + +#define refcount_sub_and_test refcount_sub_and_test_checked -extern __must_check bool refcount_sub_and_test (unsigned int i,refcount_t *r); +#define refcount_dec_and_test refcount_dec_and_test_checked +#define refcount_dec refcount_dec_checked -extern __must_check bool refcount_dec_and_test (refcount_t *r); -extern void refcount_dec (refcount_t *r);#else # ifdef CONFIG_ARCH_HAS_REFCOUNT # include <asm/refcount.h>
lib/refcount.c +25 -28
140 lines not on this page · raw message
Signature · 1 line
2.11.0
Quoted 20 lines · Mark Rutland
In many cases, it would be useful to be able to use the full sanity-checked refcount helpers regardless of
CONFIG_REFCOUNT_FULL, as this would help to avoid duplicate warnings where callers try to sanity-check refcount manipulation.This patch refactors things such that the full refcount helpers were always built, as refcount_${op}_checked(), such that they can be used regardless of
CONFIG_REFCOUNT_FULL. This will allow code which *always* wants a checked refcount to opt-in, avoiding the need to duplicate the logic for warnings.There should be no functional change as a result of this patch.
Signed-off-by Mark Rutland <[email protected]>Acked-by Kees Cook <[email protected]>Reviewed-by David Sterba <[email protected]>Cc Boqun Feng <[email protected]>Cc Ingo Molnar <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Will Deacon <[email protected]>
Quoted 4 lines
--- include/linux/refcount.h | 27 +++++++++++++++++------- lib/refcount.c | 53 +++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 35 deletions(-)
Looks good to me:
Will
Quoted 26 lines · Will Deacon
Quoted 20 lines · Mark Rutland
In many cases, it would be useful to be able to use the full sanity-checked refcount helpers regardless of
CONFIG_REFCOUNT_FULL, as this would help to avoid duplicate warnings where callers try to sanity-check refcount manipulation.This patch refactors things such that the full refcount helpers were always built, as refcount_${op}_checked(), such that they can be used regardless of
CONFIG_REFCOUNT_FULL. This will allow code which *always* wants a checked refcount to opt-in, avoiding the need to duplicate the logic for warnings.There should be no functional change as a result of this patch.
Signed-off-by Mark Rutland <[email protected]>Acked-by Kees Cook <[email protected]>Reviewed-by David Sterba <[email protected]>Cc Boqun Feng <[email protected]>Cc Ingo Molnar <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Will Deacon <[email protected]>Quoted 4 lines
--- include/linux/refcount.h | 27 +++++++++++++++++------- lib/refcount.c | 53 +++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 35 deletions(-)
Quoted 3 lines
Looks good to me:
Acked-by Will Deacon <[email protected]>
Peter, Ingo, can this go via the atomics tree? That's been the traditional location for the refcount patches.
Thanks!
-Kees
Signature · 2 lines
Kees Cook Pixel Security
Quoted 27 lines · Kees Cook
Quoted 26 lines · Will Deacon
Quoted 24 lines · Mark Rutland
In many cases, it would be useful to be able to use the full sanity-checked refcount helpers regardless of
CONFIG_REFCOUNT_FULL, as this would help to avoid duplicate warnings where callers try to sanity-check refcount manipulation.This patch refactors things such that the full refcount helpers were always built, as refcount_${op}_checked(), such that they can be used regardless of
CONFIG_REFCOUNT_FULL. This will allow code which *always* wants a checked refcount to opt-in, avoiding the need to duplicate the logic for warnings.There should be no functional change as a result of this patch.
Signed-off-by Mark Rutland <[email protected]>Acked-by Kees Cook <[email protected]>Reviewed-by David Sterba <[email protected]>Cc Boqun Feng <[email protected]>Cc Ingo Molnar <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Will Deacon <[email protected]>--- include/linux/refcount.h | 27 +++++++++++++++++------- lib/refcount.c | 53 +++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 35 deletions(-)
Quoted 6 lines
Quoted 3 lines
Looks good to me:
Acked-by Will Deacon <[email protected]>Peter, Ingo, can this go via the atomics tree? That's been the traditional location for the refcount patches.
Sure, will have a look tomorrow!
Ingo
tip-bot for Mark Rutland
merge bot[tip:locking/core] locking/refcount: Always allow checked forms
In reply to Mark Rutlandlocking/refcount: Always allow checked forms
Commit-ID: afed7bcf9487bb28e2e2b016a195085c07416c0b Gitweb: https://git.kernel.org/tip/afed7bcf9487bb28e2e2b016a195085c07416c0b Author: Mark Rutland <[email protected]> AuthorDate: Wed, 11 Jul 2018 10:36:07 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 13 Jul 2018 15:23:25 +0200
locking/refcount: Always allow checked forms
In many cases, it would be useful to be able to use the full sanity-checked refcount helpers regardless of CONFIG_REFCOUNT_FULL, as this would help to avoid duplicate warnings where callers try to sanity-check refcount manipulation.
This patch refactors things such that the full refcount helpers were always built, as refcount_${op}_checked(), such that they can be used regardless of CONFIG_REFCOUNT_FULL. This will allow code which *always* wants a checked refcount to opt-in, avoiding the need to duplicate the logic for warnings.
There should be no functional change as a result of this patch.
--- include/linux/refcount.h | 27 +++++++++++++++++------- lib/refcount.c | 53 +++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 35 deletions(-)
include/linux/refcount.h +20 -7
@@ -43,17 +43,30 @@ static inline unsigned int refcount_read(const refcount_t *r)return atomic_read (&r->refs); } +extern __must_check bool refcount_add_not_zero_checked (unsigned int i,refcount_t *r); +extern void refcount_add_checked (unsigned int i,refcount_t *r); + +extern __must_check bool refcount_inc_not_zero_checked (refcount_t *r); +extern void refcount_inc_checked (refcount_t *r); + +extern __must_check bool refcount_sub_and_test_checked (unsigned int i,refcount_t *r); + +extern __must_check bool refcount_dec_and_test_checked (refcount_t *r); +extern void refcount_dec_checked (refcount_t *r); +#ifdef CONFIG_REFCOUNT_FULL -extern __must_check bool refcount_add_not_zero (unsigned int i,refcount_t *r); -extern void refcount_add (unsigned int i,refcount_t *r); -extern __must_check bool refcount_inc_not_zero (refcount_t *r); -extern void refcount_inc (refcount_t *r); +#define refcount_add_not_zero refcount_add_not_zero_checked +#define refcount_add refcount_add_checked + +#define refcount_inc_not_zero refcount_inc_not_zero_checked +#define refcount_inc refcount_inc_checked + +#define refcount_sub_and_test refcount_sub_and_test_checked -extern __must_check bool refcount_sub_and_test (unsigned int i,refcount_t *r); +#define refcount_dec_and_test refcount_dec_and_test_checked +#define refcount_dec refcount_dec_checked -extern __must_check bool refcount_dec_and_test (refcount_t *r); -extern void refcount_dec (refcount_t *r);#else # ifdef CONFIG_ARCH_HAS_REFCOUNT # include <asm/refcount.h>
lib/refcount.c +25 -28
140 lines not on this page · raw message