Merge 4.5-rc4 into driver-core-next

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

5 files changed, 63 insertions, 26 deletions

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 81a2eb77ba7f..05d815851be1 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -2068,6 +2068,15 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
                 err = -ENOMEM;
                 goto err_free_queues;
         }
+
+        /*
+         * Since this thread will not be kept in any rbtree not in a
+         * list, initialize its list node so that at thread__put() the
+         * current thread lifetime assuption is kept and we don't segfault
+         * at list_del_init().
+         */
+        INIT_LIST_HEAD(&pt->unknown_thread->node);
+
         err = thread__set_comm(pt->unknown_thread, "unknown", 0);
         if (err)
                 goto err_delete_thread;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 4f7b0efdde2f..813d9b272c81 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -399,6 +399,9 @@ static void tracepoint_error(struct parse_events_error *e, int err,
 {
         char help[BUFSIZ];
 
+        if (!e)
+                return;
+
         /*
          * We get error directly from syscall errno ( > 0),
          * or from encoded pointer's error ( < 0).
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 2be10fb27172..4ce5c5e18f48 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -686,8 +686,9 @@ static int call_probe_finder(Dwarf_Die *sc_die, struct probe_finder *pf)
                 pf->fb_ops = NULL;
 #if _ELFUTILS_PREREQ(0, 142)
         } else if (nops == 1 && pf->fb_ops[0].atom == DW_OP_call_frame_cfa &&
-                   pf->cfi != NULL) {
-                if (dwarf_cfi_addrframe(pf->cfi, pf->addr, &frame) != 0 ||
+                   (pf->cfi_eh != NULL || pf->cfi_dbg != NULL)) {
+                if ((dwarf_cfi_addrframe(pf->cfi_eh, pf->addr, &frame) != 0 &&
+                     (dwarf_cfi_addrframe(pf->cfi_dbg, pf->addr, &frame) != 0)) ||
                     dwarf_frame_cfa(frame, &pf->fb_ops, &nops) != 0) {
                         pr_warning("Failed to get call frame on 0x%jx\n",
                                    (uintmax_t)pf->addr);
@@ -1015,8 +1016,7 @@ static int pubname_search_cb(Dwarf *dbg, Dwarf_Global *gl, void *data)
         return DWARF_CB_OK;
 }
 
-/* Find probe points from debuginfo */
-static int debuginfo__find_probes(struct debuginfo *dbg,
+static int debuginfo__find_probe_location(struct debuginfo *dbg,
                                   struct probe_finder *pf)
 {
         struct perf_probe_point *pp = &pf->pev->point;
@@ -1025,27 +1025,6 @@ static int debuginfo__find_probes(struct debuginfo *dbg,
         Dwarf_Die *diep;
         int ret = 0;
 
-#if _ELFUTILS_PREREQ(0, 142)
-        Elf *elf;
-        GElf_Ehdr ehdr;
-        GElf_Shdr shdr;
-
-        /* Get the call frame information from this dwarf */
-        elf = dwarf_getelf(dbg->dbg);
-        if (elf == NULL)
-                return -EINVAL;
-
-        if (gelf_getehdr(elf, &ehdr) == NULL)
-                return -EINVAL;
-
-        if (elf_section_by_name(elf, &ehdr, &shdr, ".eh_frame", NULL) &&
-            shdr.sh_type == SHT_PROGBITS) {
-                pf->cfi = dwarf_getcfi_elf(elf);
-        } else {
-                pf->cfi = dwarf_getcfi(dbg->dbg);
-        }
-#endif
-
         off = 0;
         pf->lcache = intlist__new(NULL);
         if (!pf->lcache)
@@ -1108,6 +1087,39 @@ found:
         return ret;
 }
 
+/* Find probe points from debuginfo */
+static int debuginfo__find_probes(struct debuginfo *dbg,
+                                  struct probe_finder *pf)
+{
+        int ret = 0;
+
+#if _ELFUTILS_PREREQ(0, 142)
+        Elf *elf;
+        GElf_Ehdr ehdr;
+        GElf_Shdr shdr;
+
+        if (pf->cfi_eh || pf->cfi_dbg)
+                return debuginfo__find_probe_location(dbg, pf);
+
+        /* Get the call frame information from this dwarf */
+        elf = dwarf_getelf(dbg->dbg);
+        if (elf == NULL)
+                return -EINVAL;
+
+        if (gelf_getehdr(elf, &ehdr) == NULL)
+                return -EINVAL;
+
+        if (elf_section_by_name(elf, &ehdr, &shdr, ".eh_frame", NULL) &&
+            shdr.sh_type == SHT_PROGBITS)
+                pf->cfi_eh = dwarf_getcfi_elf(elf);
+
+        pf->cfi_dbg = dwarf_getcfi(dbg->dbg);
+#endif
+
+        ret = debuginfo__find_probe_location(dbg, pf);
+        return ret;
+}
+
 struct local_vars_finder {
         struct probe_finder *pf;
         struct perf_probe_arg *args;
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index bed82716e1b4..0aec7704e395 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -76,7 +76,10 @@ struct probe_finder {
 
         /* For variable searching */
 #if _ELFUTILS_PREREQ(0, 142)
-        Dwarf_CFI               *cfi;           /* Call Frame Information */
+        /* Call Frame Information from .eh_frame */
+        Dwarf_CFI               *cfi_eh;
+        /* Call Frame Information from .debug_frame */
+        Dwarf_CFI               *cfi_dbg;
 #endif
         Dwarf_Op                *fb_ops;        /* Frame base attribute */
         struct perf_probe_arg   *pvar;          /* Current target variable */
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 2b58edccd56f..afb0c45eba34 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -311,6 +311,16 @@ int perf_stat_process_counter(struct perf_stat_config *config,
 
         aggr->val = aggr->ena = aggr->run = 0;
 
+        /*
+         * We calculate counter's data every interval,
+         * and the display code shows ps->res_stats
+         * avg value. We need to zero the stats for
+         * interval mode, otherwise overall avg running
+         * averages will be shown for each interval.
+         */
+        if (config->interval)
+                init_stats(ps->res_stats);
+
         if (counter->per_pkg)
                 zero_per_pkg(counter);