Commit 63df0e4b authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf map: Add accessor for dso 



Later changes will add reference count checking for struct map, with
dso being the most frequently accessed variable. Add an accessor so
that the reference count check is only necessary in one place.

Additional changes:
 - add a dso variable to avoid repeated map__dso calls.
 - in builtin-mem.c dump_raw_samples, code only partially tested for
   dso == NULL. Make the possibility of NULL consistent.
 - in thread.c thread__memcpy fix use of spaces and use tabs.

Committer notes:

Did missing conversions on these files:

   tools/perf/arch/powerpc/util/skip-callchain-idx.c
   tools/perf/arch/powerpc/util/sym-handling.c
   tools/perf/ui/browsers/hists.c
   tools/perf/ui/gtk/annotate.c
   tools/perf/util/cs-etm.c
   tools/perf/util/thread.c
   tools/perf/util/unwind-libunwind-local.c
   tools/perf/util/unwind-libunwind.c

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Hao Luo <haoluo@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Song Liu <song@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/20230320212248.1175731-2-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5ab6d715

tools/perf/arch/powerpc/util/skip-callchain-idx.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain) 
	thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);



	if (al.map)

		dso = al.map->dso;

		dso = map__dso(al.map);



	if (!dso) {

		pr_debug("%" PRIx64 " dso is NULL\n", ip);

tools/perf/arch/powerpc/util/sym-handling.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void arch__fix_tev_from_maps(struct perf_probe_event *pev, 


	lep_offset = PPC64_LOCAL_ENTRY_OFFSET(sym->arch_sym);



	if (map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS)

	if (map__dso(map)->symtab_type == DSO_BINARY_TYPE__KALLSYMS)

		tev->point.offset += PPC64LE_LEP_OFFSET;

	else if (lep_offset) {

		if (pev->uprobes)

tools/perf/builtin-annotate.c

+6 −5
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int process_branch_callback(struct evsel *evsel, 
		return 0;



	if (a.map != NULL)

		a.map->dso->hit = 1;

		map__dso(a.map)->hit = 1;



	hist__account_cycles(sample->branch_stack, al, sample, false, NULL);
@@ -235,10 +235,11 @@ static int evsel__add_sample(struct evsel *evsel, struct perf_sample *sample, 
		 * the DSO?

		 */

		if (al->sym != NULL) {

			rb_erase_cached(&al->sym->rb_node,

				 &al->map->dso->symbols);

			struct dso *dso = map__dso(al->map);



			rb_erase_cached(&al->sym->rb_node, &dso->symbols);

			symbol__delete(al->sym);

			dso__reset_find_symbol_cache(al->map->dso);

			dso__reset_find_symbol_cache(dso);

		}

		return 0;

	}
@@ -320,7 +321,7 @@ static void hists__find_annotations(struct hists *hists, 
		struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);

		struct annotation *notes;



		if (he->ms.sym == NULL || he->ms.map->dso->annotate_warned)

		if (he->ms.sym == NULL || map__dso(he->ms.map)->annotate_warned)

			goto find_next;



		if (ann->sym_hist_filter &&

tools/perf/builtin-buildid-list.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


static int buildid__map_cb(struct map *map, void *arg __maybe_unused)

{

	const struct dso *dso = map->dso;

	const struct dso *dso = map__dso(map);

	char bid_buf[SBUILD_ID_SIZE];



	memset(bid_buf, 0, sizeof(bid_buf));

tools/perf/builtin-inject.c

+5 −3
Original line number Diff line number Diff line
@@ -753,9 +753,11 @@ int perf_event__inject_buildid(struct perf_tool *tool, union perf_event *event, 
	}



	if (thread__find_map(thread, sample->cpumode, sample->ip, &al)) {

		if (!al.map->dso->hit) {

			al.map->dso->hit = 1;

			dso__inject_build_id(al.map->dso, tool, machine,

		struct dso *dso = map__dso(al.map);



		if (!dso->hit) {

			dso->hit = 1;

			dso__inject_build_id(dso, tool, machine,

					     sample->cpumode, al.map->flags);

		}

	}