| Message ID | 20180919220444.23190-15-linux@rasmusvillemoes.dk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | various dynamic_debug patches | expand |
On Thu, Sep 20, 2018 at 12:04:36AM +0200, Rasmus Villemoes wrote: > First, the btrfs_debug macros open-code (one possible definition of) > DYNAMIC_DEBUG_BRANCH, so they don't benefit from the HAVE_JUMP_LABEL > optimization. > > Second, changes on x86-64 later in this series require that all struct > _ddebug descriptors in a translation unit use distinct identifiers. > > Using the new _dynamic_func_call_no_desc helper macro from > dynamic_debug.h takes care of both of these. > > Cc: linux-btrfs@vger.kernel.org > Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Acked-by: David Sterba <dsterba@suse.com> Per the cover letter, I assume you'll take it through your git tree.
On 2018-09-20 15:10, David Sterba wrote: > On Thu, Sep 20, 2018 at 12:04:36AM +0200, Rasmus Villemoes wrote: >> First, the btrfs_debug macros open-code (one possible definition of) >> DYNAMIC_DEBUG_BRANCH, so they don't benefit from the HAVE_JUMP_LABEL >> optimization. >> >> Second, changes on x86-64 later in this series require that all struct >> _ddebug descriptors in a translation unit use distinct identifiers. >> >> Using the new _dynamic_func_call_no_desc helper macro from >> dynamic_debug.h takes care of both of these. >> >> Cc: linux-btrfs@vger.kernel.org >> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > > Acked-by: David Sterba <dsterba@suse.com> > > Per the cover letter, I assume you'll take it through your git tree. Thanks. I don't have a git tree feeding to -next myself, but these will probably be routed through akpm or x86. Rasmus
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 2cddfe7806a4..7ae6cdad5b38 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3353,31 +3353,17 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...); #if defined(CONFIG_DYNAMIC_DEBUG) #define btrfs_debug(fs_info, fmt, args...) \ -do { \ - DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ - if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) \ - btrfs_printk(fs_info, KERN_DEBUG fmt, ##args); \ -} while (0) -#define btrfs_debug_in_rcu(fs_info, fmt, args...) \ -do { \ - DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ - if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) \ - btrfs_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args); \ -} while (0) + _dynamic_func_call_no_desc(fmt, btrfs_printk, \ + fs_info, KERN_DEBUG fmt, ##args) +#define btrfs_debug_in_rcu(fs_info, fmt, args...) \ + _dynamic_func_call_no_desc(fmt, btrfs_printk_in_rcu, \ + fs_info, KERN_DEBUG fmt, ##args) #define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \ -do { \ - DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ - if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) \ - btrfs_printk_rl_in_rcu(fs_info, KERN_DEBUG fmt, \ - ##args);\ -} while (0) -#define btrfs_debug_rl(fs_info, fmt, args...) \ -do { \ - DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ - if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT)) \ - btrfs_printk_ratelimited(fs_info, KERN_DEBUG fmt, \ - ##args); \ -} while (0) + _dynamic_func_call_no_desc(fmt, btrfs_printk_rl_in_rcu, \ + fs_info, KERN_DEBUG fmt, ##args) +#define btrfs_debug_rl(fs_info, fmt, args...) \ + _dynamic_func_call_no_desc(fmt, btrfs_printk_ratelimited, \ + fs_info, KERN_DEBUG fmt, ##args) #elif defined(DEBUG) #define btrfs_debug(fs_info, fmt, args...) \ btrfs_printk(fs_info, KERN_DEBUG fmt, ##args)
First, the btrfs_debug macros open-code (one possible definition of) DYNAMIC_DEBUG_BRANCH, so they don't benefit from the HAVE_JUMP_LABEL optimization. Second, changes on x86-64 later in this series require that all struct _ddebug descriptors in a translation unit use distinct identifiers. Using the new _dynamic_func_call_no_desc helper macro from dynamic_debug.h takes care of both of these. Cc: linux-btrfs@vger.kernel.org Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- fs/btrfs/ctree.h | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-)