From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Fri, 8 May 2020 14:14:25 +0000 (-0400)
Subject: trace/events/mm_mt: Add maple tree mm tracepoints.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c526139072db87879d6f85bd8bdb5a338fa3d2f;p=users%2Fjedix%2Flinux-maple.git

trace/events/mm_mt: Add maple tree mm tracepoints.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/include/trace/events/mm_mt.h b/include/trace/events/mm_mt.h
index 9bc7fd4d46aef..a73468be8890f 100644
--- a/include/trace/events/mm_mt.h
+++ b/include/trace/events/mm_mt.h
@@ -12,26 +12,29 @@ struct mm_struct;
 struct vm_area_struct;
 
 TRACE_EVENT(__vma_mt_erase,
+
 	TP_PROTO(struct mm_struct *mm, struct vm_area_struct *vma),
 
 	TP_ARGS(mm, vma),
 
-	TP_STRUCT__entry(
-			__field( struct mm_struct, mm)
-			__field( struct vma_area_struct vma)
+	TP_STRUCT__entry (
+			__field( struct mm_struct *, mm)
+			__field( struct vm_area_struct *, vma)
+			__field( unsigned long, vm_start)
+			__field( unsigned long, vm_end)
 	),
 
 	TP_fast_assign(
 			__entry->mm		= mm;
 			__entry->vma		= vma;
 			__entry->vm_start	= vma->vm_start;
-			__entry->vm_end		= vma->vm_end;
+			__entry->vm_end		= vma->vm_end - 1;
 	),
 
 	TP_printk("mt_mod %p, (%p), ERASE, %lu, %lu\n",
 		  __entry->mm, __entry->vma,
 		  (unsigned long) __entry->vm_start,
-		  (unsigned long) __entry->vm_end - 1
+		  (unsigned long) __entry->vm_end
 	)
 );
 
@@ -41,15 +44,17 @@ TRACE_EVENT(__vma_mt_szero,
 	TP_ARGS(mm, vma),
 
 	TP_STRUCT__entry(
-			__field( struct mm_struct, mm)
-			__field( struct vma_area_struct vma)
+			__field( struct mm_struct*, mm)
+			__field( struct vm_area_struct*, vma)
+			__field( unsigned long, vm_start)
+			__field( unsigned long, vm_end)
 	),
 
 	TP_fast_assign(
 			__entry->mm		= mm;
 			__entry->vma		= vma;
 			__entry->vm_start	= vma->vm_start;
-			__entry->vm_end		= vma->vm_end;
+			__entry->vm_end		= vma->vm_end - 1;
 	),
 
 	TP_printk("mt_mod %p, (%p), SNULL, %lu, %lu\n",
@@ -65,15 +70,17 @@ TRACE_EVENT(__vma_mt_store,
 	TP_ARGS(mm, vma),
 
 	TP_STRUCT__entry(
-			__field( struct mm_struct, mm)
-			__field( struct vma_area_struct vma)
+			__field( struct mm_struct*, mm)
+			__field( struct vm_area_struct*, vma)
+			__field( unsigned long, vm_start)
+			__field( unsigned long, vm_end)
 	),
 
 	TP_fast_assign(
 			__entry->mm		= mm;
 			__entry->vma		= vma;
 			__entry->vm_start	= vma->vm_start;
-			__entry->vm_end		= vma->vm_end;
+			__entry->vm_end		= vma->vm_end - 1;
 	),
 
 	TP_printk("mt_mod %p, (%p), STORE, %lu, %lu\n",
@@ -90,7 +97,7 @@ TRACE_EVENT(exit_mmap,
 	TP_ARGS(mm),
 
 	TP_STRUCT__entry(
-			__field( struct mm_struct, mm)
+			__field( struct mm_struct*, mm)
 	),
 
 	TP_fast_assign(
diff --git a/mm/mmap.c b/mm/mmap.c
index 4ac71a1825da1..738ab776a9226 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -57,6 +57,7 @@
 #include <trace/events/mmap.h>
 
 #include "internal.h"
+#define CREATE_TRACE_POINTS
 #include <trace/events/mm_mt.h>
 #define CONFIG_DEBUG_MAPLE_TREE
 #define CONFIG_DEBUG_VM_RB 1