2 files changed, 34 insertions, 0 deletions

diff --git a/arch/x86/include/asm/trace/mpx.h b/arch/x86/include/asm/trace/mpx.h
index 5c3af06a2ae1..c13c6fa3fa92 100644
--- a/arch/x86/include/asm/trace/mpx.h
+++ b/arch/x86/include/asm/trace/mpx.h
@@ -63,6 +63,38 @@ TRACE_EVENT(bounds_exception_mpx,
                 __entry->bndstatus)
 );
 
+DECLARE_EVENT_CLASS(mpx_range_trace,
+
+        TP_PROTO(unsigned long start,
+                 unsigned long end),
+        TP_ARGS(start, end),
+
+        TP_STRUCT__entry(
+                __field(unsigned long, start)
+                __field(unsigned long, end)
+        ),
+
+        TP_fast_assign(
+                __entry->start = start;
+                __entry->end   = end;
+        ),
+
+        TP_printk("[0x%p:0x%p]",
+                (void *)__entry->start,
+                (void *)__entry->end
+        )
+);
+
+DEFINE_EVENT(mpx_range_trace, mpx_unmap_zap,
+        TP_PROTO(unsigned long start, unsigned long end),
+        TP_ARGS(start, end)
+);
+
+DEFINE_EVENT(mpx_range_trace, mpx_unmap_search,
+        TP_PROTO(unsigned long start, unsigned long end),
+        TP_ARGS(start, end)
+);
+
 #else
 
 /*
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index 75e5d7043f65..55729ee9263e 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -668,6 +668,7 @@ static int zap_bt_entries(struct mm_struct *mm,
 
                 len = min(vma->vm_end, end) - addr;
                 zap_page_range(vma, addr, len, NULL);
+                trace_mpx_unmap_zap(addr, addr+len);
 
                 vma = vma->vm_next;
                 addr = vma->vm_start;
@@ -840,6 +841,7 @@ static int mpx_unmap_tables(struct mm_struct *mm,
         long __user *bd_entry, *bde_start, *bde_end;
         unsigned long bt_addr;
 
+        trace_mpx_unmap_search(start, end);
         /*
          * "Edge" bounds tables are those which are being used by the region
          * (start -> end), but that may be shared with adjacent areas.  If they