Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools, perf: make gfp_compact_table up to date

When updating tracing's show_gfp_flags() I have noticed that perf's
gfp_compact_table is also outdated. Fill in the missing flags and place
a note in gfp.h to increase chance that future updates are synced.
Convert the __GFP_X flags from "GFP_X" to "__GFP_X" strings in line with
the previous patch.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: David Rientjes <rientjes@google.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>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Vlastimil Babka and committed by
Linus Torvalds
14e0a214 1f7866b4

+29 -20
+1 -1
include/linux/gfp.h
··· 11 11 12 12 /* 13 13 * In case of changes, please don't forget to update 14 - * include/trace/events/gfpflags.h 14 + * include/trace/events/gfpflags.h and tools/perf/builtin-kmem.c 15 15 */ 16 16 17 17 /* Plain integer GFP bitmasks. Do not use this directly. */
+28 -19
tools/perf/builtin-kmem.c
··· 612 612 { "GFP_HIGHUSER", "HU" }, 613 613 { "GFP_USER", "U" }, 614 614 { "GFP_TEMPORARY", "TMP" }, 615 + { "GFP_KERNEL_ACCOUNT", "KAC" }, 615 616 { "GFP_KERNEL", "K" }, 616 617 { "GFP_NOFS", "NF" }, 617 618 { "GFP_ATOMIC", "A" }, 618 619 { "GFP_NOIO", "NI" }, 619 - { "GFP_HIGH", "H" }, 620 - { "GFP_WAIT", "W" }, 621 - { "GFP_IO", "I" }, 622 - { "GFP_COLD", "CO" }, 623 - { "GFP_NOWARN", "NWR" }, 624 - { "GFP_REPEAT", "R" }, 625 - { "GFP_NOFAIL", "NF" }, 626 - { "GFP_NORETRY", "NR" }, 627 - { "GFP_COMP", "C" }, 628 - { "GFP_ZERO", "Z" }, 629 - { "GFP_NOMEMALLOC", "NMA" }, 630 - { "GFP_MEMALLOC", "MA" }, 631 - { "GFP_HARDWALL", "HW" }, 632 - { "GFP_THISNODE", "TN" }, 633 - { "GFP_RECLAIMABLE", "RC" }, 634 - { "GFP_MOVABLE", "M" }, 635 - { "GFP_NOTRACK", "NT" }, 636 - { "GFP_NO_KSWAPD", "NK" }, 637 - { "GFP_OTHER_NODE", "ON" }, 638 620 { "GFP_NOWAIT", "NW" }, 621 + { "GFP_DMA", "D" }, 622 + { "__GFP_HIGHMEM", "HM" }, 623 + { "GFP_DMA32", "D32" }, 624 + { "__GFP_HIGH", "H" }, 625 + { "__GFP_ATOMIC", "_A" }, 626 + { "__GFP_IO", "I" }, 627 + { "__GFP_FS", "F" }, 628 + { "__GFP_COLD", "CO" }, 629 + { "__GFP_NOWARN", "NWR" }, 630 + { "__GFP_REPEAT", "R" }, 631 + { "__GFP_NOFAIL", "NF" }, 632 + { "__GFP_NORETRY", "NR" }, 633 + { "__GFP_COMP", "C" }, 634 + { "__GFP_ZERO", "Z" }, 635 + { "__GFP_NOMEMALLOC", "NMA" }, 636 + { "__GFP_MEMALLOC", "MA" }, 637 + { "__GFP_HARDWALL", "HW" }, 638 + { "__GFP_THISNODE", "TN" }, 639 + { "__GFP_RECLAIMABLE", "RC" }, 640 + { "__GFP_MOVABLE", "M" }, 641 + { "__GFP_ACCOUNT", "AC" }, 642 + { "__GFP_NOTRACK", "NT" }, 643 + { "__GFP_WRITE", "WR" }, 644 + { "__GFP_RECLAIM", "R" }, 645 + { "__GFP_DIRECT_RECLAIM", "DR" }, 646 + { "__GFP_KSWAPD_RECLAIM", "KR" }, 647 + { "__GFP_OTHER_NODE", "ON" }, 639 648 }; 640 649 641 650 static size_t max_gfp_len;