Merge tag 'perf-core-for-mingo-4.12-20170314' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

New features:

- Add PERF_RECORD_NAMESPACES so that the kernel can record information
  required to associate samples to namespaces, helping in container
  problem characterization.

  Now the 'perf record has a --namespace' option to ask for such info,
  and when present, it can be used, initially, via a new sort order,
  'cgroup_id', allowing histogram entry bucketization by a (device, inode)
  based cgroup identifier (Hari Bathini)

- Add --next option to 'perf sched timehist', showing what is the next
  thread to run (Brendan Gregg)

Fixes:

- Fix segfault with basic block 'cycles' sort dimension (Changbin Du)

- Add c2c to command-list.txt, making it appear in the 'perf help'
  output (Changbin Du)

- Fix zeroing of 'abs_path' variable in the perf hists browser switch
  file code (Changbin Du)

- Hide tips messages when -q/--quiet is given to 'perf report' (Namhyung Kim)

Infrastructure changes:

- Use ref_reloc_sym + offset to setup kretprobes (Naveen Rao)

- Ignore generated files pmu-events/{jevents,pmu-events.c} for git (Changbin Du)

Documentation changes:

- Document +field style argument support for --field option (Changbin Du)

- Clarify 'perf c2c --stats' help message (Namhyung Kim)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 33 insertions, 1 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 000fdb211c7d..f19a82362851 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1112,6 +1112,7 @@ extern int perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks
 
 extern void perf_event_exec(void);
 extern void perf_event_comm(struct task_struct *tsk, bool exec);
+extern void perf_event_namespaces(struct task_struct *tsk);
 extern void perf_event_fork(struct task_struct *tsk);
 
 /* Callchains */
@@ -1315,6 +1316,7 @@ static inline int perf_unregister_guest_info_callbacks
 static inline void perf_event_mmap(struct vm_area_struct *vma)          { }
 static inline void perf_event_exec(void)                                { }
 static inline void perf_event_comm(struct task_struct *tsk, bool exec)  { }
+static inline void perf_event_namespaces(struct task_struct *tsk)       { }
 static inline void perf_event_fork(struct task_struct *tsk)             { }
 static inline void perf_event_init(void)                                { }
 static inline int  perf_swevent_get_recursion_context(void)             { return -1; }
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index c66a485a24ac..bec0aad0e15c 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -344,7 +344,8 @@ struct perf_event_attr {
                                 use_clockid    :  1, /* use @clockid for time fields */
                                 context_switch :  1, /* context switch data */
                                 write_backward :  1, /* Write ring buffer from end to beginning */
-                                __reserved_1   : 36;
+                                namespaces     :  1, /* include namespaces data */
+                                __reserved_1   : 35;
 
         union {
                 __u32           wakeup_events;    /* wakeup every n events */
@@ -610,6 +611,23 @@ struct perf_event_header {
         __u16   size;
 };
 
+struct perf_ns_link_info {
+        __u64   dev;
+        __u64   ino;
+};
+
+enum {
+        NET_NS_INDEX            = 0,
+        UTS_NS_INDEX            = 1,
+        IPC_NS_INDEX            = 2,
+        PID_NS_INDEX            = 3,
+        USER_NS_INDEX           = 4,
+        MNT_NS_INDEX            = 5,
+        CGROUP_NS_INDEX         = 6,
+
+        NR_NAMESPACES,          /* number of available namespaces */
+};
+
 enum perf_event_type {
 
         /*
@@ -862,6 +880,18 @@ enum perf_event_type {
          */
         PERF_RECORD_SWITCH_CPU_WIDE             = 15,
 
+        /*
+         * struct {
+         *      struct perf_event_header        header;
+         *      u32                             pid;
+         *      u32                             tid;
+         *      u64                             nr_namespaces;
+         *      { u64                           dev, inode; } [nr_namespaces];
+         *      struct sample_id                sample_id;
+         * };
+         */
+        PERF_RECORD_NAMESPACES                  = 16,
+
         PERF_RECORD_MAX,                        /* non-ABI */
 };