Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "This is larger than usual: the main reason are the ARM symbol lookup
  speedups that came in late and were hard to resist.

  There's also a kprobes fix and various tooling fixes, plus the minimal
  re-enablement of the mmap2 support interface"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
  x86/kprobes: Fix build errors and blacklist context_track_user
  perf tests: Add test for closing dso objects on EMFILE error
  perf tests: Add test for caching dso file descriptors
  perf tests: Allow reuse of test_file function
  perf tests: Spawn child for each test
  perf tools: Add dso__data_* interface descriptons
  perf tools: Allow to close dso fd in case of open failure
  perf tools: Add file size check and factor dso__data_read_offset
  perf tools: Cache dso data file descriptor
  perf tools: Add global count of opened dso objects
  perf tools: Add global list of opened dso objects
  perf tools: Add data_fd into dso object
  perf tools: Separate dso data related variables
  perf tools: Cache register accesses for unwind processing
  perf record: Fix to honor user freq/interval properly
  perf timechart: Reflow documentation
  perf probe: Improve error messages in --line option
  perf probe: Improve an error message of perf probe --vars mode
  perf probe: Show error code and description in verbose mode
  perf probe: Improve error message for unknown member of data structure
  ...

2 files changed, 36 insertions, 4 deletions

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 019d45008448..5664985c46a0 100644
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/hardirq.h>
 #include <linux/export.h>
+#include <linux/kprobes.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/context_tracking.h>
@@ -104,6 +105,7 @@ void context_tracking_user_enter(void)
         }
         local_irq_restore(flags);
 }
+NOKPROBE_SYMBOL(context_tracking_user_enter);
 
 #ifdef CONFIG_PREEMPT
 /**
@@ -181,6 +183,7 @@ void context_tracking_user_exit(void)
         }
         local_irq_restore(flags);
 }
+NOKPROBE_SYMBOL(context_tracking_user_exit);
 
 /**
  * __context_tracking_task_switch - context switch the syscall callbacks
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 5fa58e4cffac..a33d9a2bcbd7 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -40,6 +40,7 @@
 #include <linux/mm_types.h>
 #include <linux/cgroup.h>
 #include <linux/module.h>
+#include <linux/mman.h>
 
 #include "internal.h"
 
@@ -5128,6 +5129,7 @@ struct perf_mmap_event {
         int                     maj, min;
         u64                     ino;
         u64                     ino_generation;
+        u32                     prot, flags;
 
         struct {
                 struct perf_event_header        header;
@@ -5169,6 +5171,8 @@ static void perf_event_mmap_output(struct perf_event *event,
                 mmap_event->event_id.header.size += sizeof(mmap_event->min);
                 mmap_event->event_id.header.size += sizeof(mmap_event->ino);
                 mmap_event->event_id.header.size += sizeof(mmap_event->ino_generation);
+                mmap_event->event_id.header.size += sizeof(mmap_event->prot);
+                mmap_event->event_id.header.size += sizeof(mmap_event->flags);
         }
 
         perf_event_header__init_id(&mmap_event->event_id.header, &sample, event);
@@ -5187,6 +5191,8 @@ static void perf_event_mmap_output(struct perf_event *event,
                 perf_output_put(&handle, mmap_event->min);
                 perf_output_put(&handle, mmap_event->ino);
                 perf_output_put(&handle, mmap_event->ino_generation);
+                perf_output_put(&handle, mmap_event->prot);
+                perf_output_put(&handle, mmap_event->flags);
         }
 
         __output_copy(&handle, mmap_event->file_name,
@@ -5205,6 +5211,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
         struct file *file = vma->vm_file;
         int maj = 0, min = 0;
         u64 ino = 0, gen = 0;
+        u32 prot = 0, flags = 0;
         unsigned int size;
         char tmp[16];
         char *buf = NULL;
@@ -5235,6 +5242,28 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
                 gen = inode->i_generation;
                 maj = MAJOR(dev);
                 min = MINOR(dev);
+
+                if (vma->vm_flags & VM_READ)
+                        prot |= PROT_READ;
+                if (vma->vm_flags & VM_WRITE)
+                        prot |= PROT_WRITE;
+                if (vma->vm_flags & VM_EXEC)
+                        prot |= PROT_EXEC;
+
+                if (vma->vm_flags & VM_MAYSHARE)
+                        flags = MAP_SHARED;
+                else
+                        flags = MAP_PRIVATE;
+
+                if (vma->vm_flags & VM_DENYWRITE)
+                        flags |= MAP_DENYWRITE;
+                if (vma->vm_flags & VM_MAYEXEC)
+                        flags |= MAP_EXECUTABLE;
+                if (vma->vm_flags & VM_LOCKED)
+                        flags |= MAP_LOCKED;
+                if (vma->vm_flags & VM_HUGETLB)
+                        flags |= MAP_HUGETLB;
+
                 goto got_name;
         } else {
                 name = (char *)arch_vma_name(vma);
@@ -5275,6 +5304,8 @@ got_name:
         mmap_event->min = min;
         mmap_event->ino = ino;
         mmap_event->ino_generation = gen;
+        mmap_event->prot = prot;
+        mmap_event->flags = flags;
 
         if (!(vma->vm_flags & VM_EXEC))
                 mmap_event->event_id.header.misc |= PERF_RECORD_MISC_MMAP_DATA;
@@ -5315,6 +5346,8 @@ void perf_event_mmap(struct vm_area_struct *vma)
                 /* .min (attr_mmap2 only) */
                 /* .ino (attr_mmap2 only) */
                 /* .ino_generation (attr_mmap2 only) */
+                /* .prot (attr_mmap2 only) */
+                /* .flags (attr_mmap2 only) */
         };
 
         perf_event_mmap_event(&mmap_event);
@@ -6897,10 +6930,6 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
         if (ret)
                 return -EFAULT;
 
-        /* disabled for now */
-        if (attr->mmap2)
-                return -EINVAL;
-
         if (attr->__reserved_1)
                 return -EINVAL;