tools headers uapi: Sync asm-generic/mman-common.h with the kernel
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: b1ba55cf1cfb9f3e0e00d743534684a25bf66d28 Gitweb: https://git.kernel.org/tip/b1ba55cf1cfb9f3e0e00d743534684a25bf66d28 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 27 Sep 2019 11:30:30 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 30 Sep 2019 17:28:44 -03:00
tools headers uapi: Sync asm-generic/mman-common.h with the kernel
To pick the changes from:
1a4e58cce84e ("mm: introduce MADV_PAGEOUT")
9c276cc65a58 ("mm: introduce MADV_COLD")
That result in these changes in the tools:
$ tools/perf/trace/beauty/madvise_behavior.sh > before $ cp include/uapi/asm-generic/mman-common.h tools/include/uapi/asm-generic/mman-common.h $ git diff diff --git a/tools/include/uapi/asm-generic/mman-common.h b/tools/include/uapi/asm-generic/mman-common.h index 63b1f506ea67..c160a5354eb6 100644 --- a/tools/include/uapi/asm-generic/mman-common.h +++ b/tools/include/uapi/asm-generic/mman-common.h @@ -67,6 +67,9 @@ #define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */ #define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
+#define MADV_COLD 20 /* deactivate these pages */ +#define MADV_PAGEOUT 21 /* reclaim these pages */
+
/* compatibility flags */
#define MAP_FILE 0
$ tools/perf/trace/beauty/madvise_behavior.sh > after $ diff -u before after --- before 2019-09-27 11:29:43.346320100 -0300 +++ after 2019-09-27 11:30:03.838570439 -0300 @@ -16,6 +16,8 @@ [17] = "DODUMP", [18] = "WIPEONFORK", [19] = "KEEPONFORK", + [20] = "COLD", + [21] = "PAGEOUT", [100] = "HWPOISON", [101] = "SOFT_OFFLINE", }; $
I.e. now when madvise gets those behaviours as args, it will be able to translate from the number to a human readable string.
This addresses the following perf build warning:
Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/mman-common.h' differs from latest version at 'include/uapi/asm-generic/mman-common.h' diff -u tools/include/uapi/asm-generic/mman-common.h include/uapi/asm-generic/mman-common.h
--- tools/include/uapi/asm-generic/mman-common.h | 3 +++ 1 file changed, 3 insertions(+)
tools/include/uapi/asm-generic/mman-common.h +3 -0
@@ -67,6 +67,9 @@#define MADV_WIPEONFORK 18/* Zero memory on fork, child only */ #define MADV_KEEPONFORK 19/* Undo MADV_WIPEONFORK */ +#define MADV_COLD 20/* deactivate these pages */ +#define MADV_PAGEOUT 21/* reclaim these pages */ +/* compatibility flags */ #define MAP_FILE 0