perf tools: Add a 'struct map_groups' pointer to 'struct map_symbol'

And fill it whenever we setup a a 'struct map_symbol', now we need to
use it, next cset.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-fzwfcnddenz1o7uj1fzw3g46@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 8f89c5a4781f9eaff9ea9f4130f109628d2e5ee4..5cefce33b66bb9b09c477bce508cec7081bdc865 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -1106,6 +1106,7 @@ int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *samp
 int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,
                        bool hide_unresolved)
 {
+       al->mg  = node->ms.mg;
        al->map = node->ms.map;
        al->sym = node->ms.sym;
        al->srcline = node->srcline;

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index dec996133cdf608517bd50de01a4f00819270d16..0a8d72ae93cac4260fe31d5fbf01dfb453f5a4b9 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -692,6 +692,7 @@ __hists__add_entry(struct hists *hists,
                        .ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0,
                },
                .ms = {
+                       .mg     = al->mg,
                        .map    = al->map,
                        .sym    = al->sym,
                },
@@ -759,6 +760,7 @@ struct hist_entry *hists__add_entry_block(struct hists *hists,
                .block_info = block_info,
                .hists = hists,
                .ms = {
+                       .mg  = al->mg,
                        .map = al->map,
                        .sym = al->sym,
                },
@@ -893,6 +895,7 @@ iter_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *al)
        if (iter->curr >= iter->total)
                return 0;
 
+       al->mg  = bi[i].to.ms.mg;
        al->map = bi[i].to.ms.map;
        al->sym = bi[i].to.ms.sym;
        al->addr = bi[i].to.addr;
@@ -1069,6 +1072,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
                .comm = thread__comm(al->thread),
                .ip = al->addr,
                .ms = {
+                       .mg  = al->mg,
                        .map = al->map,
                        .sym = al->sym,
                },

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 614094d87f05c003cad64f3d4a04c23b1db1f078..6a0f5c25ce3e2649978964a07413cd3f3ee6de3a 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1968,6 +1968,7 @@ static void ip__resolve_ams(struct thread *thread,
 
        ams->addr = ip;
        ams->al_addr = al.addr;
+       ams->ms.mg  = al.mg;
        ams->ms.sym = al.sym;
        ams->ms.map = al.map;
        ams->phys_addr = 0;
@@ -1985,6 +1986,7 @@ static void ip__resolve_data(struct thread *thread,
 
        ams->addr = addr;
        ams->al_addr = al.addr;
+       ams->ms.mg  = al.mg;
        ams->ms.sym = al.sym;
        ams->ms.map = al.map;
        ams->phys_addr = phys_addr;
@@ -2101,6 +2103,7 @@ static int add_callchain_ip(struct thread *thread,
                iter_cycles = iter->cycles;
        }
 
+       ms.mg  = al.mg;
        ms.map = al.map;
        ms.sym = al.sym;
        srcline = callchain_srcline(&ms, al.addr);

diff --git a/tools/perf/util/map_symbol.h b/tools/perf/util/map_symbol.h
index f71cbe1a26a9b2001fac58654e8a0019d404809b..2964d971aeab1dc30098a2ec221b2a75850b3e07 100644 (file)
--- a/tools/perf/util/map_symbol.h
+++ b/tools/perf/util/map_symbol.h
@@ -4,10 +4,12 @@
 
 #include <linux/types.h>
 
+struct map_groups;
 struct map;
 struct symbol;
 
 struct map_symbol {
+       struct map_groups *mg;
        struct map    *map;
        struct symbol *sym;
 };

diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c
index 73c00d776a5fdd33449350d6cf3bf1c12e64c47c..d2a8df01c4a7988a0d07a9d343bf5758554bfbdd 100644 (file)
--- a/tools/perf/util/unwind-libdw.c
+++ b/tools/perf/util/unwind-libdw.c
@@ -81,6 +81,7 @@ static int entry(u64 ip, struct unwind_info *ui)
                return -1;
 
        e->ip     = ip;
+       e->ms.mg  = al.mg;
        e->ms.map = al.map;
        e->ms.sym = al.sym;
 

diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c
index 6e3873dd9a3187e73b9036cb7f2abff5f324d70a..6d53347d674401435100077d96670a05bc7a40a1 100644 (file)
--- a/tools/perf/util/unwind-libunwind-local.c
+++ b/tools/perf/util/unwind-libunwind-local.c
@@ -578,6 +578,7 @@ static int entry(u64 ip, struct thread *thread,
        e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
        e.ip     = ip;
        e.ms.map = al.map;
+       e.ms.mg  = al.mg;
 
        pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
                 al.sym ? al.sym->name : "''",