1
0
Fork 0
alistair23-linux/tools/include/uapi/asm-generic
Arnaldo Carvalho de Melo b1ba55cf1c tools headers uapi: Sync asm-generic/mman-common.h with the kernel
To pick the changes from:

  1a4e58cce8 ("mm: introduce MADV_PAGEOUT")
  9c276cc65a ("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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-n40y6c4sa49p29q6sl8w3ufx@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2019-09-30 17:28:44 -03:00
..
bitsperlong.h tools: Copy the bitsperlong.h files from the kernel 2016-07-12 15:20:39 -03:00
bpf_perf_event.h selftests/bpf: sync kernel headers and introduce arch support in Makefile 2017-12-05 15:02:41 +01:00
errno-base.h tools include asm-generic: Grab errno.h and errno-base.h 2018-01-23 09:51:37 -03:00
errno.h tools include asm-generic: Grab errno.h and errno-base.h 2018-01-23 09:51:37 -03:00
fcntl.h tools include uapi asm-generic: Grab a copy of fcntl.h 2017-07-18 23:13:55 -03:00
ioctls.h tools uapi asm-generic: Synchronize ioctls.h 2018-11-19 12:31:45 -08:00
mman-common-tools.h tools headers uapi: Sync asm-generic/mman-common.h and linux/mman.h 2019-03-28 14:31:56 -03:00
mman-common.h tools headers uapi: Sync asm-generic/mman-common.h with the kernel 2019-09-30 17:28:44 -03:00
mman.h tools headers UAPI: Update tools's copy of mman.h headers 2019-07-29 09:02:58 -03:00
socket.h bpf: Sync asm-generic/socket.h to tools/ 2019-06-15 01:21:45 +02:00
unistd.h tools uapi asm-generic: Sync unistd.h with the kernel sources 2019-09-20 14:59:28 -03:00