mm, tracing: unify mm flags handling in tracepoints and printk

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@suse.cz>
Reviewed-by: Michal Hocko <mhocko@suse.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 11 insertions, 77 deletions

diff --git a/mm/debug.c b/mm/debug.c
index f05b2d5d6481..410af904a7d5 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 */