Re: [PATCH v3 04/14] mm, tracing: unify mm flags handling in tracepoints and printk

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri 18-12-15 10:03:16, Vlastimil Babka wrote:
> In tracepoints, it's possible to print gfp flags in a human-friendly format
> through a macro show_gfp_flags(), which defines a translation array and passes
> is to __print_flags(). Since the following patch will introduce support for
> gfp flags printing in printk(), it would be nice to reuse the array. This is
> not straightforward, since __print_flags() can't simply reference an array
> defined in a .c file such as mm/debug.c - it has to be a macro to allow the
> macro magic to communicate the format to userspace tools such as trace-cmd.
> 
> The solution is to create a macro __def_gfpflag_names which is used both in
> show_gfp_flags(), and to define the gfpflag_names[] array in mm/debug.c.
> 
> On the other hand, mm/debug.c also defines translation tables for page
> flags and vma flags, and desire was expressed (but not implemented in this
> series) to use these also from tracepoints. Thus, this patch also renames the
> events/gfpflags.h file to events/mmflags.h and moves the table definitions
> there, using the same macro approach as for gfpflags. This allows translating
> all three kinds of mm-specific flags both in tracepoints and printk.
> 
> Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx>
> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
> Cc: Minchan Kim <minchan@xxxxxxxxxx>
> Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
> Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
> Cc: Mel Gorman <mgorman@xxxxxxx>
> Cc: Michal Hocko <mhocko@xxxxxxx>

the IF_HAVE_PG_MLOCK trick was a news to me. I wasn't aware of the fact
that #define cannot contain #ifdef code.

Reviewed-by: Michal Hocko <mhocko@xxxxxxxx>

> ---
>  include/linux/gfp.h                |   2 +-
>  include/trace/events/btrfs.h       |   2 +-
>  include/trace/events/compaction.h  |   2 +-
>  include/trace/events/gfpflags.h    |  48 -----------
>  include/trace/events/huge_memory.h |   2 -
>  include/trace/events/kmem.h        |   2 +-
>  include/trace/events/mmflags.h     | 161 +++++++++++++++++++++++++++++++++++++
>  include/trace/events/vmscan.h      |   2 +-
>  mm/debug.c                         |  88 +++-----------------
>  tools/perf/builtin-kmem.c          |   2 +-
>  10 files changed, 178 insertions(+), 133 deletions(-)
>  delete mode 100644 include/trace/events/gfpflags.h
>  create mode 100644 include/trace/events/mmflags.h
> 
> diff --git a/include/linux/gfp.h b/include/linux/gfp.h
> index eed323f58547..f6a5e2ba7152 100644
> --- a/include/linux/gfp.h
> +++ b/include/linux/gfp.h
> @@ -11,7 +11,7 @@ struct vm_area_struct;
>  
>  /*
>   * In case of changes, please don't forget to update
> - * include/trace/events/gfpflags.h and tools/perf/builtin-kmem.c
> + * include/trace/events/mmflags.h and tools/perf/builtin-kmem.c
>   */
>  
>  /* Plain integer GFP bitmasks. Do not use this directly. */
> diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
> index b4473dab39d6..27843f5eccde 100644
> --- a/include/trace/events/btrfs.h
> +++ b/include/trace/events/btrfs.h
> @@ -6,7 +6,7 @@
>  
>  #include <linux/writeback.h>
>  #include <linux/tracepoint.h>
> -#include <trace/events/gfpflags.h>
> +#include <trace/events/mmflags.h>
>  
>  struct btrfs_root;
>  struct btrfs_fs_info;
> diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h
> index c92d1e1cbad9..111e5666e5eb 100644
> --- a/include/trace/events/compaction.h
> +++ b/include/trace/events/compaction.h
> @@ -7,7 +7,7 @@
>  #include <linux/types.h>
>  #include <linux/list.h>
>  #include <linux/tracepoint.h>
> -#include <trace/events/gfpflags.h>
> +#include <trace/events/mmflags.h>
>  
>  #define COMPACTION_STATUS					\
>  	EM( COMPACT_DEFERRED,		"deferred")		\
> diff --git a/include/trace/events/gfpflags.h b/include/trace/events/gfpflags.h
> deleted file mode 100644
> index 8395798d97b0..000000000000
> --- a/include/trace/events/gfpflags.h
> +++ /dev/null
> @@ -1,48 +0,0 @@
> -/*
> - * The order of these masks is important. Matching masks will be seen
> - * first and the left over flags will end up showing by themselves.
> - *
> - * For example, if we have GFP_KERNEL before GFP_USER we wil get:
> - *
> - *  GFP_KERNEL|GFP_HARDWALL
> - *
> - * Thus most bits set go first.
> - */
> -#define show_gfp_flags(flags)						\
> -	(flags) ? __print_flags(flags, "|",				\
> -	{(unsigned long)GFP_TRANSHUGE,		"GFP_TRANSHUGE"},	\
> -	{(unsigned long)GFP_HIGHUSER_MOVABLE,	"GFP_HIGHUSER_MOVABLE"}, \
> -	{(unsigned long)GFP_HIGHUSER,		"GFP_HIGHUSER"},	\
> -	{(unsigned long)GFP_USER,		"GFP_USER"},		\
> -	{(unsigned long)GFP_TEMPORARY,		"GFP_TEMPORARY"},	\
> -	{(unsigned long)GFP_KERNEL,		"GFP_KERNEL"},		\
> -	{(unsigned long)GFP_NOFS,		"GFP_NOFS"},		\
> -	{(unsigned long)GFP_ATOMIC,		"GFP_ATOMIC"},		\
> -	{(unsigned long)GFP_NOIO,		"GFP_NOIO"},		\
> -	{(unsigned long)GFP_NOWAIT,		"GFP_NOWAIT"},		\
> -	{(unsigned long)__GFP_DMA,		"GFP_DMA"},		\
> -	{(unsigned long)__GFP_DMA32,		"GFP_DMA32"},		\
> -	{(unsigned long)__GFP_HIGH,		"GFP_HIGH"},		\
> -	{(unsigned long)__GFP_ATOMIC,		"__GFP_ATOMIC"},	\
> -	{(unsigned long)__GFP_IO,		"GFP_IO"},		\
> -	{(unsigned long)__GFP_FS,		"GFP_FS"},		\
> -	{(unsigned long)__GFP_COLD,		"GFP_COLD"},		\
> -	{(unsigned long)__GFP_NOWARN,		"GFP_NOWARN"},		\
> -	{(unsigned long)__GFP_REPEAT,		"GFP_REPEAT"},		\
> -	{(unsigned long)__GFP_NOFAIL,		"GFP_NOFAIL"},		\
> -	{(unsigned long)__GFP_NORETRY,		"GFP_NORETRY"},		\
> -	{(unsigned long)__GFP_COMP,		"GFP_COMP"},		\
> -	{(unsigned long)__GFP_ZERO,		"GFP_ZERO"},		\
> -	{(unsigned long)__GFP_NOMEMALLOC,	"GFP_NOMEMALLOC"},	\
> -	{(unsigned long)__GFP_MEMALLOC,		"GFP_MEMALLOC"},	\
> -	{(unsigned long)__GFP_HARDWALL,		"GFP_HARDWALL"},	\
> -	{(unsigned long)__GFP_THISNODE,		"GFP_THISNODE"},	\
> -	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\
> -	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\
> -	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\
> -	{(unsigned long)__GFP_WRITE,		"GFP_WRITE"},		\
> -	{(unsigned long)__GFP_DIRECT_RECLAIM,	"GFP_DIRECT_RECLAIM"},	\
> -	{(unsigned long)__GFP_KSWAPD_RECLAIM,	"GFP_KSWAPD_RECLAIM"},	\
> -	{(unsigned long)__GFP_OTHER_NODE,	"GFP_OTHER_NODE"}	\
> -	) : "none"
> -
> diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h
> index bfcf4a16aa94..8c62d1cac3b6 100644
> --- a/include/trace/events/huge_memory.h
> +++ b/include/trace/events/huge_memory.h
> @@ -6,8 +6,6 @@
>  
>  #include  <linux/tracepoint.h>
>  
> -#include <trace/events/gfpflags.h>
> -
>  #define SCAN_STATUS							\
>  	EM( SCAN_FAIL,			"failed")			\
>  	EM( SCAN_SUCCEED,		"succeeded")			\
> diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
> index f7554fd7fc62..ca7217389067 100644
> --- a/include/trace/events/kmem.h
> +++ b/include/trace/events/kmem.h
> @@ -6,7 +6,7 @@
>  
>  #include <linux/types.h>
>  #include <linux/tracepoint.h>
> -#include <trace/events/gfpflags.h>
> +#include <trace/events/mmflags.h>
>  
>  DECLARE_EVENT_CLASS(kmem_alloc,
>  
> diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
> new file mode 100644
> index 000000000000..1cabf464cd8f
> --- /dev/null
> +++ b/include/trace/events/mmflags.h
> @@ -0,0 +1,161 @@
> +/*
> + * The order of these masks is important. Matching masks will be seen
> + * first and the left over flags will end up showing by themselves.
> + *
> + * For example, if we have GFP_KERNEL before GFP_USER we wil get:
> + *
> + *  GFP_KERNEL|GFP_HARDWALL
> + *
> + * Thus most bits set go first.
> + */
> +
> +#define __def_gfpflag_names						\
> +	{(unsigned long)GFP_TRANSHUGE,		"GFP_TRANSHUGE"},	\
> +	{(unsigned long)GFP_HIGHUSER_MOVABLE,	"GFP_HIGHUSER_MOVABLE"},\
> +	{(unsigned long)GFP_HIGHUSER,		"GFP_HIGHUSER"},	\
> +	{(unsigned long)GFP_USER,		"GFP_USER"},		\
> +	{(unsigned long)GFP_TEMPORARY,		"GFP_TEMPORARY"},	\
> +	{(unsigned long)GFP_KERNEL,		"GFP_KERNEL"},		\
> +	{(unsigned long)GFP_NOFS,		"GFP_NOFS"},		\
> +	{(unsigned long)GFP_ATOMIC,		"GFP_ATOMIC"},		\
> +	{(unsigned long)GFP_NOIO,		"GFP_NOIO"},		\
> +	{(unsigned long)GFP_NOWAIT,		"GFP_NOWAIT"},		\
> +	{(unsigned long)__GFP_DMA,		"GFP_DMA"},		\
> +	{(unsigned long)__GFP_DMA32,		"GFP_DMA32"},		\
> +	{(unsigned long)__GFP_HIGH,		"GFP_HIGH"},		\
> +	{(unsigned long)__GFP_ATOMIC,		"__GFP_ATOMIC"},	\
> +	{(unsigned long)__GFP_IO,		"GFP_IO"},		\
> +	{(unsigned long)__GFP_FS,		"GFP_FS"},		\
> +	{(unsigned long)__GFP_COLD,		"GFP_COLD"},		\
> +	{(unsigned long)__GFP_NOWARN,		"GFP_NOWARN"},		\
> +	{(unsigned long)__GFP_REPEAT,		"GFP_REPEAT"},		\
> +	{(unsigned long)__GFP_NOFAIL,		"GFP_NOFAIL"},		\
> +	{(unsigned long)__GFP_NORETRY,		"GFP_NORETRY"},		\
> +	{(unsigned long)__GFP_COMP,		"GFP_COMP"},		\
> +	{(unsigned long)__GFP_ZERO,		"GFP_ZERO"},		\
> +	{(unsigned long)__GFP_NOMEMALLOC,	"GFP_NOMEMALLOC"},	\
> +	{(unsigned long)__GFP_MEMALLOC,		"GFP_MEMALLOC"},	\
> +	{(unsigned long)__GFP_HARDWALL,		"GFP_HARDWALL"},	\
> +	{(unsigned long)__GFP_THISNODE,		"GFP_THISNODE"},	\
> +	{(unsigned long)__GFP_RECLAIMABLE,	"GFP_RECLAIMABLE"},	\
> +	{(unsigned long)__GFP_MOVABLE,		"GFP_MOVABLE"},		\
> +	{(unsigned long)__GFP_NOTRACK,		"GFP_NOTRACK"},		\
> +	{(unsigned long)__GFP_WRITE,		"GFP_WRITE"},		\
> +	{(unsigned long)__GFP_DIRECT_RECLAIM,	"GFP_DIRECT_RECLAIM"},	\
> +	{(unsigned long)__GFP_KSWAPD_RECLAIM,	"GFP_KSWAPD_RECLAIM"},	\
> +	{(unsigned long)__GFP_OTHER_NODE,	"GFP_OTHER_NODE"}	\
> +
> +#define show_gfp_flags(flags)						\
> +	(flags) ? __print_flags(flags, "|",				\
> +	__def_gfpflag_names						\
> +	) : "none"
> +
> +#ifdef CONFIG_MMU
> +#define IF_HAVE_PG_MLOCK(flag,string) ,{1UL << flag, string}
> +#else
> +#define IF_HAVE_PG_MLOCK(flag,string)
> +#endif
> +
> +#ifdef CONFIG_ARCH_USES_PG_UNCACHED
> +#define IF_HAVE_PG_UNCACHED(flag,string) ,{1UL << flag, string}
> +#else
> +#define IF_HAVE_PG_UNCACHED(flag,string)
> +#endif
> +
> +#ifdef CONFIG_MEMORY_FAILURE
> +#define IF_HAVE_PG_HWPOISON(flag,string) ,{1UL << flag, string}
> +#else
> +#define IF_HAVE_PG_HWPOISON(flag,string)
> +#endif
> +
> +#if defined(CONFIG_IDLE_PAGE_TRACKING) && defined(CONFIG_64BIT)
> +#define IF_HAVE_PG_IDLE(flag,string) ,{1UL << flag, string}
> +#else
> +#define IF_HAVE_PG_IDLE(flag,string)
> +#endif
> +
> +#define __def_pageflag_names						\
> +	{1UL << PG_locked,		"locked"	},		\
> +	{1UL << PG_error,		"error"		},		\
> +	{1UL << PG_referenced,		"referenced"	},		\
> +	{1UL << PG_uptodate,		"uptodate"	},		\
> +	{1UL << PG_dirty,		"dirty"		},		\
> +	{1UL << PG_lru,			"lru"		},		\
> +	{1UL << PG_active,		"active"	},		\
> +	{1UL << PG_slab,		"slab"		},		\
> +	{1UL << PG_owner_priv_1,	"owner_priv_1"	},		\
> +	{1UL << PG_arch_1,		"arch_1"	},		\
> +	{1UL << PG_reserved,		"reserved"	},		\
> +	{1UL << PG_private,		"private"	},		\
> +	{1UL << PG_private_2,		"private_2"	},		\
> +	{1UL << PG_writeback,		"writeback"	},		\
> +	{1UL << PG_head,		"head"		},		\
> +	{1UL << PG_swapcache,		"swapcache"	},		\
> +	{1UL << PG_mappedtodisk,	"mappedtodisk"	},		\
> +	{1UL << PG_reclaim,		"reclaim"	},		\
> +	{1UL << PG_swapbacked,		"swapbacked"	},		\
> +	{1UL << PG_unevictable,		"unevictable"	}		\
> +IF_HAVE_PG_MLOCK(PG_mlocked,		"mlocked"	)		\
> +IF_HAVE_PG_UNCACHED(PG_uncached,	"uncached"	)		\
> +IF_HAVE_PG_HWPOISON(PG_hwpoison,	"hwpoison"	)		\
> +IF_HAVE_PG_IDLE(PG_young,		"young"		)		\
> +IF_HAVE_PG_IDLE(PG_idle,		"idle"		)
> +
> +#define show_page_flags(flags)						\
> +	(flags) ? __print_flags(flags, "|",				\
> +	__def_pageflag_names						\
> +	) : "none"
> +
> +#if defined(CONFIG_X86)
> +#define __VM_ARCH_SPECIFIC {VM_PAT,     "pat"           }
> +#elif defined(CONFIG_PPC)
> +#define __VM_ARCH_SPECIFIC {VM_SAO,     "sao"           }
> +#elif defined(CONFIG_PARISC) || defined(CONFIG_METAG) || defined(CONFIG_IA64)
> +#define __VM_ARCH_SPECIFIC {VM_GROWSUP,	"growsup"	}
> +#elif !defined(CONFIG_MMU)
> +#define __VM_ARCH_SPECIFIC {VM_MAPPED_COPY,"mappedcopy"	}
> +#else
> +#define __VM_ARCH_SPECIFIC {VM_ARCH_1,	"arch_1"	}
> +#endif
> +
> +#ifdef CONFIG_MEM_SOFT_DIRTY
> +#define IF_HAVE_VM_SOFTDIRTY(flag,name) {flag, name },
> +#else
> +#define IF_HAVE_VM_SOFTDIRTY(flag,name)
> +#endif
> +
> +#define __def_vmaflag_names						\
> +	{VM_READ,			"read"		},		\
> +	{VM_WRITE,			"write"		},		\
> +	{VM_EXEC,			"exec"		},		\
> +	{VM_SHARED,			"shared"	},		\
> +	{VM_MAYREAD,			"mayread"	},		\
> +	{VM_MAYWRITE,			"maywrite"	},		\
> +	{VM_MAYEXEC,			"mayexec"	},		\
> +	{VM_MAYSHARE,			"mayshare"	},		\
> +	{VM_GROWSDOWN,			"growsdown"	},		\
> +	{VM_PFNMAP,			"pfnmap"	},		\
> +	{VM_DENYWRITE,			"denywrite"	},		\
> +	{VM_LOCKONFAULT,		"lockonfault"	},		\
> +	{VM_LOCKED,			"locked"	},		\
> +	{VM_IO,				"io"		},		\
> +	{VM_SEQ_READ,			"seqread"	},		\
> +	{VM_RAND_READ,			"randread"	},		\
> +	{VM_DONTCOPY,			"dontcopy"	},		\
> +	{VM_DONTEXPAND,			"dontexpand"	},		\
> +	{VM_ACCOUNT,			"account"	},		\
> +	{VM_NORESERVE,			"noreserve"	},		\
> +	{VM_HUGETLB,			"hugetlb"	},		\
> +	__VM_ARCH_SPECIFIC				,		\
> +	{VM_DONTDUMP,			"dontdump"	},		\
> +IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY,	"softdirty"	)		\
> +	{VM_MIXEDMAP,			"mixedmap"	},		\
> +	{VM_HUGEPAGE,			"hugepage"	},		\
> +	{VM_NOHUGEPAGE,			"nohugepage"	},		\
> +	{VM_MERGEABLE,			"mergeable"	}		\
> +
> +#define show_vma_flags(flags)						\
> +	(flags) ? __print_flags(flags, "|",				\
> +	__def_vmaflag_names						\
> +	) : "none"
> +
> diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
> index 31763dd8db1c..0101ef37f1ee 100644
> --- a/include/trace/events/vmscan.h
> +++ b/include/trace/events/vmscan.h
> @@ -8,7 +8,7 @@
>  #include <linux/tracepoint.h>
>  #include <linux/mm.h>
>  #include <linux/memcontrol.h>
> -#include <trace/events/gfpflags.h>
> +#include <trace/events/mmflags.h>
>  
>  #define RECLAIM_WB_ANON		0x0001u
>  #define RECLAIM_WB_FILE		0x0002u
> diff --git a/mm/debug.c b/mm/debug.c
> index 836276586185..85f71e4ce59f 100644
> --- a/mm/debug.c
> +++ b/mm/debug.c
> @@ -9,41 +9,14 @@
>  #include <linux/mm.h>
>  #include <linux/trace_events.h>
>  #include <linux/memcontrol.h>
> +#include <trace/events/mmflags.h>
>  
>  static const struct trace_print_flags pageflag_names[] = {
> -	{1UL << PG_locked,		"locked"	},
> -	{1UL << PG_error,		"error"		},
> -	{1UL << PG_referenced,		"referenced"	},
> -	{1UL << PG_uptodate,		"uptodate"	},
> -	{1UL << PG_dirty,		"dirty"		},
> -	{1UL << PG_lru,			"lru"		},
> -	{1UL << PG_active,		"active"	},
> -	{1UL << PG_slab,		"slab"		},
> -	{1UL << PG_owner_priv_1,	"owner_priv_1"	},
> -	{1UL << PG_arch_1,		"arch_1"	},
> -	{1UL << PG_reserved,		"reserved"	},
> -	{1UL << PG_private,		"private"	},
> -	{1UL << PG_private_2,		"private_2"	},
> -	{1UL << PG_writeback,		"writeback"	},
> -	{1UL << PG_head,		"head"		},
> -	{1UL << PG_swapcache,		"swapcache"	},
> -	{1UL << PG_mappedtodisk,	"mappedtodisk"	},
> -	{1UL << PG_reclaim,		"reclaim"	},
> -	{1UL << PG_swapbacked,		"swapbacked"	},
> -	{1UL << PG_unevictable,		"unevictable"	},
> -#ifdef CONFIG_MMU
> -	{1UL << PG_mlocked,		"mlocked"	},
> -#endif
> -#ifdef CONFIG_ARCH_USES_PG_UNCACHED
> -	{1UL << PG_uncached,		"uncached"	},
> -#endif
> -#ifdef CONFIG_MEMORY_FAILURE
> -	{1UL << PG_hwpoison,		"hwpoison"	},
> -#endif
> -#if defined(CONFIG_IDLE_PAGE_TRACKING) && defined(CONFIG_64BIT)
> -	{1UL << PG_young,		"young"		},
> -	{1UL << PG_idle,		"idle"		},
> -#endif
> +	__def_pageflag_names
> +};
> +
> +static const struct trace_print_flags gfpflag_names[] = {
> +	__def_gfpflag_names
>  };
>  
>  static void dump_flags(unsigned long flags,
> @@ -108,47 +81,8 @@ EXPORT_SYMBOL(dump_page);
>  
>  #ifdef CONFIG_DEBUG_VM
>  
> -static const struct trace_print_flags vmaflags_names[] = {
> -	{VM_READ,			"read"		},
> -	{VM_WRITE,			"write"		},
> -	{VM_EXEC,			"exec"		},
> -	{VM_SHARED,			"shared"	},
> -	{VM_MAYREAD,			"mayread"	},
> -	{VM_MAYWRITE,			"maywrite"	},
> -	{VM_MAYEXEC,			"mayexec"	},
> -	{VM_MAYSHARE,			"mayshare"	},
> -	{VM_GROWSDOWN,			"growsdown"	},
> -	{VM_PFNMAP,			"pfnmap"	},
> -	{VM_DENYWRITE,			"denywrite"	},
> -	{VM_LOCKONFAULT,		"lockonfault"	},
> -	{VM_LOCKED,			"locked"	},
> -	{VM_IO,				"io"		},
> -	{VM_SEQ_READ,			"seqread"	},
> -	{VM_RAND_READ,			"randread"	},
> -	{VM_DONTCOPY,			"dontcopy"	},
> -	{VM_DONTEXPAND,			"dontexpand"	},
> -	{VM_ACCOUNT,			"account"	},
> -	{VM_NORESERVE,			"noreserve"	},
> -	{VM_HUGETLB,			"hugetlb"	},
> -#if defined(CONFIG_X86)
> -	{VM_PAT,			"pat"		},
> -#elif defined(CONFIG_PPC)
> -	{VM_SAO,			"sao"		},
> -#elif defined(CONFIG_PARISC) || defined(CONFIG_METAG) || defined(CONFIG_IA64)
> -	{VM_GROWSUP,			"growsup"	},
> -#elif !defined(CONFIG_MMU)
> -	{VM_MAPPED_COPY,		"mappedcopy"	},
> -#else
> -	{VM_ARCH_1,			"arch_1"	},
> -#endif
> -	{VM_DONTDUMP,			"dontdump"	},
> -#ifdef CONFIG_MEM_SOFT_DIRTY
> -	{VM_SOFTDIRTY,			"softdirty"	},
> -#endif
> -	{VM_MIXEDMAP,			"mixedmap"	},
> -	{VM_HUGEPAGE,			"hugepage"	},
> -	{VM_NOHUGEPAGE,			"nohugepage"	},
> -	{VM_MERGEABLE,			"mergeable"	},
> +static const struct trace_print_flags vmaflag_names[] = {
> +	__def_vmaflag_names
>  };
>  
>  void dump_vma(const struct vm_area_struct *vma)
> @@ -162,7 +96,7 @@ void dump_vma(const struct vm_area_struct *vma)
>  		(unsigned long)pgprot_val(vma->vm_page_prot),
>  		vma->anon_vma, vma->vm_ops, vma->vm_pgoff,
>  		vma->vm_file, vma->vm_private_data);
> -	dump_flags(vma->vm_flags, vmaflags_names, ARRAY_SIZE(vmaflags_names));
> +	dump_flags(vma->vm_flags, vmaflag_names, ARRAY_SIZE(vmaflag_names));
>  }
>  EXPORT_SYMBOL(dump_vma);
>  
> @@ -233,8 +167,8 @@ void dump_mm(const struct mm_struct *mm)
>  		""		/* This is here to not have a comma! */
>  		);
>  
> -		dump_flags(mm->def_flags, vmaflags_names,
> -				ARRAY_SIZE(vmaflags_names));
> +		dump_flags(mm->def_flags, vmaflag_names,
> +				ARRAY_SIZE(vmaflag_names));
>  }
>  
>  #endif		/* CONFIG_DEBUG_VM */
> diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
> index acb0d011803a..d99083170315 100644
> --- a/tools/perf/builtin-kmem.c
> +++ b/tools/perf/builtin-kmem.c
> @@ -602,7 +602,7 @@ static int gfpcmp(const void *a, const void *b)
>  	return fa->flags - fb->flags;
>  }
>  
> -/* see include/trace/events/gfpflags.h */
> +/* see include/trace/events/mmflags.h */
>  static const struct {
>  	const char *original;
>  	const char *compact;
> -- 
> 2.6.3

-- 
Michal Hocko
SUSE Labs

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]