kmem-update.patch

   1 From 071c76b533ed92a4107cd162826a08a18b9ff91c Mon Sep 17 00:00:00 2001
   2 From: Michael Jeanson <mjeanson@efficios.com>
   3 Date: Tue, 28 Nov 2017 16:02:45 -0500
   4 Subject: [PATCH] Fix: update kmem instrumentation for kernel 4.15
   5
   6 See upstream commit:
   7
   8   commit 2d4894b5d2ae0fe1725ea7abd57b33bfbbe45492
   9   Author: Mel Gorman <mgorman@techsingularity.net>
  10   Date:   Wed Nov 15 17:37:59 2017 -0800
  11
  12     mm: remove cold parameter from free_hot_cold_page*
  13
  14 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
  15 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  16 ---
  17  instrumentation/events/lttng-module/kmem.h | 27 +++++++++++++++++++++++++--
  18  1 file changed, 25 insertions(+), 2 deletions(-)
  19
  20 diff --git a/instrumentation/events/lttng-module/kmem.h b/instrumentation/events/lttng-module/kmem.h
  21 index ad7bf77..c3fa25a 100644
  22 --- a/instrumentation/events/lttng-module/kmem.h
  23 +++ b/instrumentation/events/lttng-module/kmem.h
  24 @@ -132,11 +132,33 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_direct, kmem_mm_page_free_direct,
  25         )
  26  )
  27
  28 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
  29 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
  30 +LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
  31 +
  32 +       TP_PROTO(struct page *page),
  33 +
  34 +       TP_ARGS(page),
  35 +
  36 +       TP_FIELDS(
  37 +               ctf_integer_hex(struct page *, page, page)
  38 +               ctf_integer(unsigned long, pfn, page_to_pfn(page))
  39 +       )
  40 +)
  41 +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
  42  LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched,
  43 +
  44 +       TP_PROTO(struct page *page, int cold),
  45 +
  46 +       TP_ARGS(page, cold),
  47 +
  48 +       TP_FIELDS(
  49 +               ctf_integer_hex(struct page *, page, page)
  50 +               ctf_integer(unsigned long, pfn, page_to_pfn(page))
  51 +               ctf_integer(int, cold, cold)
  52 +       )
  53 +)
  54  #else
  55  LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free,
  56 -#endif
  57
  58         TP_PROTO(struct page *page, int cold),
  59
  60 @@ -148,6 +170,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_pagevec_free, kmem_pagevec_free,
  61                 ctf_integer(int, cold, cold)
  62         )
  63  )
  64 +#endif
  65
  66  LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc,
  67