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

Pull perf updates from Ingo Molnar:
 "Kernel side changes:

   - Clean up the x86 instruction decoder (Masami Hiramatsu)

   - Add new uprobes optimization for PUSH instructions on x86 (Yonghong
     Song)

   - Add MSR_IA32_THERM_STATUS to the MSR events (Stephane Eranian)

   - Fix misc bugs, update documentation, plus various cleanups (Jiri
     Olsa)

  There's a large number of tooling side improvements:

   - Intel-PT/BTS improvements (Adrian Hunter)

   - Numerous 'perf trace' improvements (Arnaldo Carvalho de Melo)

   - Introduce an errno code to string facility (Hendrik Brueckner)

   - Various build system improvements (Jiri Olsa)

   - Add support for CoreSight trace decoding by making the perf tools
     use the external openCSD (Mathieu Poirier, Tor Jeremiassen)

   - Add ARM Statistical Profiling Extensions (SPE) support (Kim
     Phillips)

   - libtraceevent updates (Steven Rostedt)

   - Intel vendor event JSON updates (Andi Kleen)

   - Introduce 'perf report --mmaps' and 'perf report --tasks' to show
     info present in 'perf.data' (Jiri Olsa, Arnaldo Carvalho de Melo)

   - Add infrastructure to record first and last sample time to the
     perf.data file header, so that when processing all samples in a
     'perf record' session, such as when doing build-id processing, or
     when specifically requesting that that info be recorded, use that
     in 'perf report --time', that also got support for percent slices
     in addition to absolute ones.

     I.e. now it is possible to ask for the samples in the 10%-20% time
     slice of a perf.data file (Jin Yao)

   - Allow system wide 'perf stat --per-thread', sorting the result (Jin
     Yao)

     E.g.:

      [root@jouet ~]# perf stat --per-thread --metrics IPC
      ^C
       Performance counter stats for 'system wide':

                  make-22229  23,012,094,032  inst_retired.any   #  0.8 IPC
                   cc1-22419     692,027,497  inst_retired.any   #  0.8 IPC
                   gcc-22418     328,231,855  inst_retired.any   #  0.9 IPC
                   cc1-22509     220,853,647  inst_retired.any   #  0.8 IPC
                   gcc-22486     199,874,810  inst_retired.any   #  1.0 IPC
                    as-22466     177,896,365  inst_retired.any   #  0.9 IPC
                   cc1-22465     150,732,374  inst_retired.any   #  0.8 IPC
                   gcc-22508     112,555,593  inst_retired.any   #  0.9 IPC
                   cc1-22487     108,964,079  inst_retired.any   #  0.7 IPC
       qemu-system-x86-2697       21,330,550  inst_retired.any   #  0.3 IPC
       systemd-journal-551        20,642,951  inst_retired.any   #  0.4 IPC
       docker-containe-17651       9,552,892  inst_retired.any   #  0.5 IPC
       dockerd-current-9809        7,528,586  inst_retired.any   #  0.5 IPC
                  make-22153  12,504,194,380  inst_retired.any   #  0.8 IPC
               python2-22429  12,081,290,954  inst_retired.any   #  0.8 IPC
      <SNIP>
               python2-22429  15,026,328,103  cpu_clk_unhalted.thread
                   cc1-22419     826,660,193  cpu_clk_unhalted.thread
                   gcc-22418     365,321,295  cpu_clk_unhalted.thread
                   cc1-22509     279,169,362  cpu_clk_unhalted.thread
                   gcc-22486     210,156,950  cpu_clk_unhalted.thread
      <SNIP>

           5.638075538 seconds time elapsed

     [root@jouet ~]#

   - Improve shell auto-completion of perf events (Jin Yao)

   - 'perf probe' improvements (Masami Hiramatsu)

   - Improve PMU infrastructure to support amp64's ThunderX2
     implementation defined core events (Ganapatrao Kulkarni)

   - Various annotation related improvements and fixes (Thomas Richter)

   - Clarify usage of 'overwrite' and 'backward' in the evlist/mmap
     code, removing the 'overwrite' parameter from several functions as
     it was always used it as 'false' (Wang Nan)

   - Fix/improve 'perf record' reverse recording support (Wang Nan)

   - Improve command line options documentation (Sihyeon Jang)

   - Optimize sample parsing for ordering events, where we don't need to
     parse all the PERF_SAMPLE_ bits, just the ones leading to the
     timestamp needed to reorder events (Jiri Olsa)

   - Generalize the annotation code to support other source information
     besides objdump/DWARF obtained ones, starting with python scripts,
     that will is slated to be merged soon (Jiri Olsa)

   - ... and a lot more that I failed to list, see the shortlog and
     changelog for details"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (262 commits)
  perf trace beauty flock: Move to separate object file
  perf evlist: Remove fcntl.h from evlist.h
  perf trace beauty futex: Beautify FUTEX_BITSET_MATCH_ANY
  perf trace: Do not print from time delta for interrupted syscall lines
  perf trace: Add --print-sample
  perf bpf: Remove misplaced __maybe_unused attribute
  MAINTAINERS: Adding entry for CoreSight trace decoding
  perf tools: Add mechanic to synthesise CoreSight trace packets
  perf tools: Add full support for CoreSight trace decoding
  pert tools: Add queue management functionality
  perf tools: Add functionality to communicate with the openCSD decoder
  perf tools: Add support for decoding CoreSight trace data
  perf tools: Add decoder mechanic to support dumping trace data
  perf tools: Add processing of coresight metadata
  perf tools: Add initial entry point for decoder CoreSight traces
  perf tools: Integrating the CoreSight decoding library
  perf vendor events intel: Update IvyTown files to V20
  perf vendor events intel: Update IvyBridge files to V20
  perf vendor events intel: Update BroadwellDE events to V7
  perf vendor events intel: Update SkylakeX events to V1.06
  ...

1 files changed, 71 insertions, 16 deletions

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 80fb1593913a..57e38fdf0b34 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -12,6 +12,7 @@
 #include <dirent.h>
 #include <api/fs/fs.h>
 #include <locale.h>
+#include <regex.h>
 #include "util.h"
 #include "pmu.h"
 #include "parse-events.h"
@@ -537,17 +538,45 @@ static bool pmu_is_uncore(const char *name)
 }
 
 /*
+ *  PMU CORE devices have different name other than cpu in sysfs on some
+ *  platforms. looking for possible sysfs files to identify as core device.
+ */
+static int is_pmu_core(const char *name)
+{
+        struct stat st;
+        char path[PATH_MAX];
+        const char *sysfs = sysfs__mountpoint();
+
+        if (!sysfs)
+                return 0;
+
+        /* Look for cpu sysfs (x86 and others) */
+        scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu", sysfs);
+        if ((stat(path, &st) == 0) &&
+                        (strncmp(name, "cpu", strlen("cpu")) == 0))
+                return 1;
+
+        /* Look for cpu sysfs (specific to arm) */
+        scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s/cpus",
+                                sysfs, name);
+        if (stat(path, &st) == 0)
+                return 1;
+
+        return 0;
+}
+
+/*
  * Return the CPU id as a raw string.
  *
  * Each architecture should provide a more precise id string that
  * can be use to match the architecture's "mapfile".
  */
-char * __weak get_cpuid_str(void)
+char * __weak get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
 {
         return NULL;
 }
 
-static char *perf_pmu__getcpuid(void)
+static char *perf_pmu__getcpuid(struct perf_pmu *pmu)
 {
         char *cpuid;
         static bool printed;
@@ -556,7 +585,7 @@ static char *perf_pmu__getcpuid(void)
         if (cpuid)
                 cpuid = strdup(cpuid);
         if (!cpuid)
-                cpuid = get_cpuid_str();
+                cpuid = get_cpuid_str(pmu);
         if (!cpuid)
                 return NULL;
 
@@ -567,22 +596,45 @@ static char *perf_pmu__getcpuid(void)
         return cpuid;
 }
 
-struct pmu_events_map *perf_pmu__find_map(void)
+struct pmu_events_map *perf_pmu__find_map(struct perf_pmu *pmu)
 {
         struct pmu_events_map *map;
-        char *cpuid = perf_pmu__getcpuid();
+        char *cpuid = perf_pmu__getcpuid(pmu);
         int i;
 
+        /* on some platforms which uses cpus map, cpuid can be NULL for
+         * PMUs other than CORE PMUs.
+         */
+        if (!cpuid)
+                return NULL;
+
         i = 0;
         for (;;) {
+                regex_t re;
+                regmatch_t pmatch[1];
+                int match;
+
                 map = &pmu_events_map[i++];
                 if (!map->table) {
                         map = NULL;
                         break;
                 }
 
-                if (!strcmp(map->cpuid, cpuid))
+                if (regcomp(&re, map->cpuid, REG_EXTENDED) != 0) {
+                        /* Warn unable to generate match particular string. */
+                        pr_info("Invalid regular expression %s\n", map->cpuid);
                         break;
+                }
+
+                match = !regexec(&re, cpuid, 1, pmatch, 0);
+                regfree(&re);
+                if (match) {
+                        size_t match_len = (pmatch[0].rm_eo - pmatch[0].rm_so);
+
+                        /* Verify the entire string matched. */
+                        if (match_len == strlen(cpuid))
+                                break;
+                }
         }
         free(cpuid);
         return map;
@@ -593,13 +645,14 @@ struct pmu_events_map *perf_pmu__find_map(void)
  * to the current running CPU. Then, add all PMU events from that table
  * as aliases.
  */
-static void pmu_add_cpu_aliases(struct list_head *head, const char *name)
+static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)
 {
         int i;
         struct pmu_events_map *map;
         struct pmu_event *pe;
+        const char *name = pmu->name;
 
-        map = perf_pmu__find_map();
+        map = perf_pmu__find_map(pmu);
         if (!map)
                 return;
 
@@ -608,7 +661,6 @@ static void pmu_add_cpu_aliases(struct list_head *head, const char *name)
          */
         i = 0;
         while (1) {
-                const char *pname;
 
                 pe = &map->table[i++];
                 if (!pe->name) {
@@ -617,9 +669,13 @@ static void pmu_add_cpu_aliases(struct list_head *head, const char *name)
                         break;
                 }
 
-                pname = pe->pmu ? pe->pmu : "cpu";
-                if (strncmp(pname, name, strlen(pname)))
-                        continue;
+                if (!is_pmu_core(name)) {
+                        /* check for uncore devices */
+                        if (pe->pmu == NULL)
+                                continue;
+                        if (strncmp(pe->pmu, name, strlen(pe->pmu)))
+                                continue;
+                }
 
                 /* need type casts to override 'const' */
                 __perf_pmu__new_alias(head, NULL, (char *)pe->name,
@@ -661,21 +717,20 @@ static struct perf_pmu *pmu_lookup(const char *name)
         if (pmu_aliases(name, &aliases))
                 return NULL;
 
-        pmu_add_cpu_aliases(&aliases, name);
         pmu = zalloc(sizeof(*pmu));
         if (!pmu)
                 return NULL;
 
         pmu->cpus = pmu_cpumask(name);
-
+        pmu->name = strdup(name);
+        pmu->type = type;
         pmu->is_uncore = pmu_is_uncore(name);
+        pmu_add_cpu_aliases(&aliases, pmu);
 
         INIT_LIST_HEAD(&pmu->format);
         INIT_LIST_HEAD(&pmu->aliases);
         list_splice(&format, &pmu->format);
         list_splice(&aliases, &pmu->aliases);
-        pmu->name = strdup(name);
-        pmu->type = type;
         list_add_tail(&pmu->list, &pmus);
 
         pmu->default_config = perf_pmu__get_default_config(pmu);