Messages in this thread | | | Date | Thu, 12 Jan 2012 10:41:50 -0800 | From | Josh Triplett <> | Subject | Re: [PATCH] rcu: avoid checking for constant |
| |
On Thu, Jan 12, 2012 at 04:38:52PM +0100, Jan Engelhardt wrote: > On Thursday 2012-01-12 12:58, Josh Triplett wrote: > >> Same impression here. BUILD_BUG_ON_ZERO was introduced by > >> > >> commit 4552d5dc08b79868829b4be8951b29b07284753f > >> Author: Jan Beulich <jbeulich@novell.com> > >> Date: Mon Jun 26 13:57:28 2006 +0200 > >> > >> while Rusty's CCAN archive calls it "BUILD_BUG_OR_ZERO" (since either > >> it's a bug, or returning neutral zero). > > > >Sounds like a good target for a fix at some point. > > What names do you propose? I have BUILD_BUG_ON_EXPR for some of my code, > though in the kernel, it has both _ON_ZERO and _ON_NULL.
BUILD_BUG_OR_ZERO (and BUILD_BUG_OR_NULL) seem like improvements over _ON_ZERO and _ON_NULL; that would remove the ambiguity we both tripped over.
> rcu: avoid checking for constant > > When compiling kernel or module code with -O0, "offset" is no longer > considered a constant, and therefore always triggers the build error > that BUILD_BUG_ON is defined to yield. > > Therefore, change the innards of kfree_rcu so that the offset is not > tunneled through a function argument before checking it. > > Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> --- a/include/linux/rcupdate.h > +++ b/include/linux/rcupdate.h > @@ -795,24 +795,6 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) > #define RCU_INIT_POINTER(p, v) \ > p = (typeof(*v) __force __rcu *)(v) > > -static __always_inline bool __is_kfree_rcu_offset(unsigned long offset) > -{ > - return offset < 4096; > -} > - > -static __always_inline > -void __kfree_rcu(struct rcu_head *head, unsigned long offset) > -{ > - typedef void (*rcu_callback)(struct rcu_head *); > - > - BUILD_BUG_ON(!__builtin_constant_p(offset)); > - > - /* See the kfree_rcu() header comment. */ > - BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); > - > - call_rcu(head, (rcu_callback)offset); > -} > - > /** > * kfree_rcu() - kfree an object after a grace period. > * @ptr: pointer to kfree > @@ -835,7 +817,18 @@ void __kfree_rcu(struct rcu_head *head, unsigned long offset) > * > * Note that the allowable offset might decrease in the future, for example, > * to allow something like kmem_cache_free_rcu(). > + * > + * The BUILD_BUG_ON check must not involve any function calls, hence the > + * checks are done in macros here. > */ > +#define __is_kfree_rcu_offset(offset) ((offset) < 4096) > + > +#define __kfree_rcu(head, offset) \ > + do { \ > + BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); \ > + call_rcu(head, (void (*)(struct rcu_head *))(unsigned long)(offset)); \ > + } while (0) > + > #define kfree_rcu(ptr, rcu_head) \ > __kfree_rcu(&((ptr)->rcu_head), offsetof(typeof(*(ptr)), rcu_head))
- Josh Triplett
| |