aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-16 14:51:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-16 14:51:08 -0400
commit271ecc5253e2b317d729d366560789cd7f93836c (patch)
treed3a60bc4dfa8245ff934f357f2367db76b59e7cf /include/trace
parentaa6865d836418eb2ba888a4cb1318a28e9aa2e0c (diff)
parent63c06227a22b098a3849c5c99e836aea161ca0d7 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge first patch-bomb from Andrew Morton: - some misc things - ofs2 updates - about half of MM - checkpatch updates - autofs4 update * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits) autofs4: fix string.h include in auto_dev-ioctl.h autofs4: use pr_xxx() macros directly for logging autofs4: change log print macros to not insert newline autofs4: make autofs log prints consistent autofs4: fix some white space errors autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked() autofs4: fix coding style line length in autofs4_wait() autofs4: fix coding style problem in autofs4_get_set_timeout() autofs4: coding style fixes autofs: show pipe inode in mount options kallsyms: add support for relative offsets in kallsyms address table kallsyms: don't overload absolute symbol type for percpu symbols x86: kallsyms: disable absolute percpu symbols on !SMP checkpatch: fix another left brace warning checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses checkpatch: warn on bare unsigned or signed declarations without int checkpatch: exclude asm volatile from complex macro check mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate() mm: migrate: consolidate mem_cgroup_migrate() calls mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous ...
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/btrfs.h2
-rw-r--r--include/trace/events/compaction.h2
-rw-r--r--include/trace/events/gfpflags.h43
-rw-r--r--include/trace/events/huge_memory.h2
-rw-r--r--include/trace/events/kmem.h2
-rw-r--r--include/trace/events/mmflags.h164
-rw-r--r--include/trace/events/vmscan.h2
7 files changed, 168 insertions, 49 deletions
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index d866f21efbbf..677807f29a1c 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -6,7 +6,7 @@
6 6
7#include <linux/writeback.h> 7#include <linux/writeback.h>
8#include <linux/tracepoint.h> 8#include <linux/tracepoint.h>
9#include <trace/events/gfpflags.h> 9#include <trace/events/mmflags.h>
10 10
11struct btrfs_root; 11struct btrfs_root;
12struct btrfs_fs_info; 12struct 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 @@
7#include <linux/types.h> 7#include <linux/types.h>
8#include <linux/list.h> 8#include <linux/list.h>
9#include <linux/tracepoint.h> 9#include <linux/tracepoint.h>
10#include <trace/events/gfpflags.h> 10#include <trace/events/mmflags.h>
11 11
12#define COMPACTION_STATUS \ 12#define COMPACTION_STATUS \
13 EM( COMPACT_DEFERRED, "deferred") \ 13 EM( COMPACT_DEFERRED, "deferred") \
diff --git a/include/trace/events/gfpflags.h b/include/trace/events/gfpflags.h
deleted file mode 100644
index dde6bf092c8a..000000000000
--- a/include/trace/events/gfpflags.h
+++ /dev/null
@@ -1,43 +0,0 @@
1/*
2 * The order of these masks is important. Matching masks will be seen
3 * first and the left over flags will end up showing by themselves.
4 *
5 * For example, if we have GFP_KERNEL before GFP_USER we wil get:
6 *
7 * GFP_KERNEL|GFP_HARDWALL
8 *
9 * Thus most bits set go first.
10 */
11#define show_gfp_flags(flags) \
12 (flags) ? __print_flags(flags, "|", \
13 {(unsigned long)GFP_TRANSHUGE, "GFP_TRANSHUGE"}, \
14 {(unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE"}, \
15 {(unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER"}, \
16 {(unsigned long)GFP_USER, "GFP_USER"}, \
17 {(unsigned long)GFP_TEMPORARY, "GFP_TEMPORARY"}, \
18 {(unsigned long)GFP_KERNEL, "GFP_KERNEL"}, \
19 {(unsigned long)GFP_NOFS, "GFP_NOFS"}, \
20 {(unsigned long)GFP_ATOMIC, "GFP_ATOMIC"}, \
21 {(unsigned long)GFP_NOIO, "GFP_NOIO"}, \
22 {(unsigned long)__GFP_HIGH, "GFP_HIGH"}, \
23 {(unsigned long)__GFP_ATOMIC, "GFP_ATOMIC"}, \
24 {(unsigned long)__GFP_IO, "GFP_IO"}, \
25 {(unsigned long)__GFP_COLD, "GFP_COLD"}, \
26 {(unsigned long)__GFP_NOWARN, "GFP_NOWARN"}, \
27 {(unsigned long)__GFP_REPEAT, "GFP_REPEAT"}, \
28 {(unsigned long)__GFP_NOFAIL, "GFP_NOFAIL"}, \
29 {(unsigned long)__GFP_NORETRY, "GFP_NORETRY"}, \
30 {(unsigned long)__GFP_COMP, "GFP_COMP"}, \
31 {(unsigned long)__GFP_ZERO, "GFP_ZERO"}, \
32 {(unsigned long)__GFP_NOMEMALLOC, "GFP_NOMEMALLOC"}, \
33 {(unsigned long)__GFP_MEMALLOC, "GFP_MEMALLOC"}, \
34 {(unsigned long)__GFP_HARDWALL, "GFP_HARDWALL"}, \
35 {(unsigned long)__GFP_THISNODE, "GFP_THISNODE"}, \
36 {(unsigned long)__GFP_RECLAIMABLE, "GFP_RECLAIMABLE"}, \
37 {(unsigned long)__GFP_MOVABLE, "GFP_MOVABLE"}, \
38 {(unsigned long)__GFP_NOTRACK, "GFP_NOTRACK"}, \
39 {(unsigned long)__GFP_DIRECT_RECLAIM, "GFP_DIRECT_RECLAIM"}, \
40 {(unsigned long)__GFP_KSWAPD_RECLAIM, "GFP_KSWAPD_RECLAIM"}, \
41 {(unsigned long)__GFP_OTHER_NODE, "GFP_OTHER_NODE"} \
42 ) : "GFP_NOWAIT"
43
diff --git a/include/trace/events/huge_memory.h b/include/trace/events/huge_memory.h
index 47c6212d8f3c..551ba4acde4d 100644
--- a/include/trace/events/huge_memory.h
+++ b/include/trace/events/huge_memory.h
@@ -6,8 +6,6 @@
6 6
7#include <linux/tracepoint.h> 7#include <linux/tracepoint.h>
8 8
9#include <trace/events/gfpflags.h>
10
11#define SCAN_STATUS \ 9#define SCAN_STATUS \
12 EM( SCAN_FAIL, "failed") \ 10 EM( SCAN_FAIL, "failed") \
13 EM( SCAN_SUCCEED, "succeeded") \ 11 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 @@
6 6
7#include <linux/types.h> 7#include <linux/types.h>
8#include <linux/tracepoint.h> 8#include <linux/tracepoint.h>
9#include <trace/events/gfpflags.h> 9#include <trace/events/mmflags.h>
10 10
11DECLARE_EVENT_CLASS(kmem_alloc, 11DECLARE_EVENT_CLASS(kmem_alloc,
12 12
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
new file mode 100644
index 000000000000..a849185c82f0
--- /dev/null
+++ b/include/trace/events/mmflags.h
@@ -0,0 +1,164 @@
1/*
2 * The order of these masks is important. Matching masks will be seen
3 * first and the left over flags will end up showing by themselves.
4 *
5 * For example, if we have GFP_KERNEL before GFP_USER we wil get:
6 *
7 * GFP_KERNEL|GFP_HARDWALL
8 *
9 * Thus most bits set go first.
10 */
11
12#define __def_gfpflag_names \
13 {(unsigned long)GFP_TRANSHUGE, "GFP_TRANSHUGE"}, \
14 {(unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE"},\
15 {(unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER"}, \
16 {(unsigned long)GFP_USER, "GFP_USER"}, \
17 {(unsigned long)GFP_TEMPORARY, "GFP_TEMPORARY"}, \
18 {(unsigned long)GFP_KERNEL_ACCOUNT, "GFP_KERNEL_ACCOUNT"}, \
19 {(unsigned long)GFP_KERNEL, "GFP_KERNEL"}, \
20 {(unsigned long)GFP_NOFS, "GFP_NOFS"}, \
21 {(unsigned long)GFP_ATOMIC, "GFP_ATOMIC"}, \
22 {(unsigned long)GFP_NOIO, "GFP_NOIO"}, \
23 {(unsigned long)GFP_NOWAIT, "GFP_NOWAIT"}, \
24 {(unsigned long)GFP_DMA, "GFP_DMA"}, \
25 {(unsigned long)__GFP_HIGHMEM, "__GFP_HIGHMEM"}, \
26 {(unsigned long)GFP_DMA32, "GFP_DMA32"}, \
27 {(unsigned long)__GFP_HIGH, "__GFP_HIGH"}, \
28 {(unsigned long)__GFP_ATOMIC, "__GFP_ATOMIC"}, \
29 {(unsigned long)__GFP_IO, "__GFP_IO"}, \
30 {(unsigned long)__GFP_FS, "__GFP_FS"}, \
31 {(unsigned long)__GFP_COLD, "__GFP_COLD"}, \
32 {(unsigned long)__GFP_NOWARN, "__GFP_NOWARN"}, \
33 {(unsigned long)__GFP_REPEAT, "__GFP_REPEAT"}, \
34 {(unsigned long)__GFP_NOFAIL, "__GFP_NOFAIL"}, \
35 {(unsigned long)__GFP_NORETRY, "__GFP_NORETRY"}, \
36 {(unsigned long)__GFP_COMP, "__GFP_COMP"}, \
37 {(unsigned long)__GFP_ZERO, "__GFP_ZERO"}, \
38 {(unsigned long)__GFP_NOMEMALLOC, "__GFP_NOMEMALLOC"}, \
39 {(unsigned long)__GFP_MEMALLOC, "__GFP_MEMALLOC"}, \
40 {(unsigned long)__GFP_HARDWALL, "__GFP_HARDWALL"}, \
41 {(unsigned long)__GFP_THISNODE, "__GFP_THISNODE"}, \
42 {(unsigned long)__GFP_RECLAIMABLE, "__GFP_RECLAIMABLE"}, \
43 {(unsigned long)__GFP_MOVABLE, "__GFP_MOVABLE"}, \
44 {(unsigned long)__GFP_ACCOUNT, "__GFP_ACCOUNT"}, \
45 {(unsigned long)__GFP_NOTRACK, "__GFP_NOTRACK"}, \
46 {(unsigned long)__GFP_WRITE, "__GFP_WRITE"}, \
47 {(unsigned long)__GFP_RECLAIM, "__GFP_RECLAIM"}, \
48 {(unsigned long)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"},\
49 {(unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"},\
50 {(unsigned long)__GFP_OTHER_NODE, "__GFP_OTHER_NODE"} \
51
52#define show_gfp_flags(flags) \
53 (flags) ? __print_flags(flags, "|", \
54 __def_gfpflag_names \
55 ) : "none"
56
57#ifdef CONFIG_MMU
58#define IF_HAVE_PG_MLOCK(flag,string) ,{1UL << flag, string}
59#else
60#define IF_HAVE_PG_MLOCK(flag,string)
61#endif
62
63#ifdef CONFIG_ARCH_USES_PG_UNCACHED
64#define IF_HAVE_PG_UNCACHED(flag,string) ,{1UL << flag, string}
65#else
66#define IF_HAVE_PG_UNCACHED(flag,string)
67#endif
68
69#ifdef CONFIG_MEMORY_FAILURE
70#define IF_HAVE_PG_HWPOISON(flag,string) ,{1UL << flag, string}
71#else
72#define IF_HAVE_PG_HWPOISON(flag,string)
73#endif
74
75#if defined(CONFIG_IDLE_PAGE_TRACKING) && defined(CONFIG_64BIT)
76#define IF_HAVE_PG_IDLE(flag,string) ,{1UL << flag, string}
77#else
78#define IF_HAVE_PG_IDLE(flag,string)
79#endif
80
81#define __def_pageflag_names \
82 {1UL << PG_locked, "locked" }, \
83 {1UL << PG_error, "error" }, \
84 {1UL << PG_referenced, "referenced" }, \
85 {1UL << PG_uptodate, "uptodate" }, \
86 {1UL << PG_dirty, "dirty" }, \
87 {1UL << PG_lru, "lru" }, \
88 {1UL << PG_active, "active" }, \
89 {1UL << PG_slab, "slab" }, \
90 {1UL << PG_owner_priv_1, "owner_priv_1" }, \
91 {1UL << PG_arch_1, "arch_1" }, \
92 {1UL << PG_reserved, "reserved" }, \
93 {1UL << PG_private, "private" }, \
94 {1UL << PG_private_2, "private_2" }, \
95 {1UL << PG_writeback, "writeback" }, \
96 {1UL << PG_head, "head" }, \
97 {1UL << PG_swapcache, "swapcache" }, \
98 {1UL << PG_mappedtodisk, "mappedtodisk" }, \
99 {1UL << PG_reclaim, "reclaim" }, \
100 {1UL << PG_swapbacked, "swapbacked" }, \
101 {1UL << PG_unevictable, "unevictable" } \
102IF_HAVE_PG_MLOCK(PG_mlocked, "mlocked" ) \
103IF_HAVE_PG_UNCACHED(PG_uncached, "uncached" ) \
104IF_HAVE_PG_HWPOISON(PG_hwpoison, "hwpoison" ) \
105IF_HAVE_PG_IDLE(PG_young, "young" ) \
106IF_HAVE_PG_IDLE(PG_idle, "idle" )
107
108#define show_page_flags(flags) \
109 (flags) ? __print_flags(flags, "|", \
110 __def_pageflag_names \
111 ) : "none"
112
113#if defined(CONFIG_X86)
114#define __VM_ARCH_SPECIFIC {VM_PAT, "pat" }
115#elif defined(CONFIG_PPC)
116#define __VM_ARCH_SPECIFIC {VM_SAO, "sao" }
117#elif defined(CONFIG_PARISC) || defined(CONFIG_METAG) || defined(CONFIG_IA64)
118#define __VM_ARCH_SPECIFIC {VM_GROWSUP, "growsup" }
119#elif !defined(CONFIG_MMU)
120#define __VM_ARCH_SPECIFIC {VM_MAPPED_COPY,"mappedcopy" }
121#else
122#define __VM_ARCH_SPECIFIC {VM_ARCH_1, "arch_1" }
123#endif
124
125#ifdef CONFIG_MEM_SOFT_DIRTY
126#define IF_HAVE_VM_SOFTDIRTY(flag,name) {flag, name },
127#else
128#define IF_HAVE_VM_SOFTDIRTY(flag,name)
129#endif
130
131#define __def_vmaflag_names \
132 {VM_READ, "read" }, \
133 {VM_WRITE, "write" }, \
134 {VM_EXEC, "exec" }, \
135 {VM_SHARED, "shared" }, \
136 {VM_MAYREAD, "mayread" }, \
137 {VM_MAYWRITE, "maywrite" }, \
138 {VM_MAYEXEC, "mayexec" }, \
139 {VM_MAYSHARE, "mayshare" }, \
140 {VM_GROWSDOWN, "growsdown" }, \
141 {VM_PFNMAP, "pfnmap" }, \
142 {VM_DENYWRITE, "denywrite" }, \
143 {VM_LOCKONFAULT, "lockonfault" }, \
144 {VM_LOCKED, "locked" }, \
145 {VM_IO, "io" }, \
146 {VM_SEQ_READ, "seqread" }, \
147 {VM_RAND_READ, "randread" }, \
148 {VM_DONTCOPY, "dontcopy" }, \
149 {VM_DONTEXPAND, "dontexpand" }, \
150 {VM_ACCOUNT, "account" }, \
151 {VM_NORESERVE, "noreserve" }, \
152 {VM_HUGETLB, "hugetlb" }, \
153 __VM_ARCH_SPECIFIC , \
154 {VM_DONTDUMP, "dontdump" }, \
155IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \
156 {VM_MIXEDMAP, "mixedmap" }, \
157 {VM_HUGEPAGE, "hugepage" }, \
158 {VM_NOHUGEPAGE, "nohugepage" }, \
159 {VM_MERGEABLE, "mergeable" } \
160
161#define show_vma_flags(flags) \
162 (flags) ? __print_flags(flags, "|", \
163 __def_vmaflag_names \
164 ) : "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 @@
8#include <linux/tracepoint.h> 8#include <linux/tracepoint.h>
9#include <linux/mm.h> 9#include <linux/mm.h>
10#include <linux/memcontrol.h> 10#include <linux/memcontrol.h>
11#include <trace/events/gfpflags.h> 11#include <trace/events/mmflags.h>
12 12
13#define RECLAIM_WB_ANON 0x0001u 13#define RECLAIM_WB_ANON 0x0001u
14#define RECLAIM_WB_FILE 0x0002u 14#define RECLAIM_WB_FILE 0x0002u
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-01 00:37:03 -0400