Commit 620be847 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf addr_location: Move to its own header 



addr_location is a common abstraction, move it into its own header and
source file in preparation for wider clean up.

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: Ali Saidi <alisaidi@amazon.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Brian Robbins <brianrob@linux.microsoft.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Fangrui Song <maskray@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ivan Babrou <ivan@cloudflare.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Ye Xingchen <ye.xingchen@zte.com.cn>
Cc: Yuan Can <yuancan@huawei.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230608232823.4027869-6-irogers@google.com


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

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line 
perf-y += arm64-frame-pointer-unwind-support.o

perf-y += addr_location.o

perf-y += annotate.o

perf-y += block-info.o

perf-y += block-range.o

tools/perf/util/addr_location.c

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "addr_location.h"

#include "map.h"

#include "thread.h"



/*

 * The preprocess_sample method will return with reference counts for the

 * in it, when done using (and perhaps getting ref counts if needing to

 * keep a pointer to one of those entries) it must be paired with

 * addr_location__put(), so that the refcounts can be decremented.

 */

void addr_location__put(struct addr_location *al)

{

	map__zput(al->map);

	thread__zput(al->thread);

}

tools/perf/util/addr_location.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __PERF_ADDR_LOCATION

#define __PERF_ADDR_LOCATION 1



#include <linux/types.h>



struct thread;

struct maps;

struct map;

struct symbol;



struct addr_location {

	struct thread *thread;

	struct maps   *maps;

	struct map    *map;

	struct symbol *sym;

	const char    *srcline;

	u64	      addr;

	char	      level;

	u8	      filtered;

	u8	      cpumode;

	s32	      cpu;

	s32	      socket;

};



void addr_location__put(struct addr_location *al);



#endif /* __PERF_ADDR_LOCATION */

tools/perf/util/event.c

+0 −12
Original line number Diff line number Diff line
@@ -767,18 +767,6 @@ int machine__resolve(struct machine *machine, struct addr_location *al, 
	return 0;

}



/*

 * The preprocess_sample method will return with reference counts for the

 * in it, when done using (and perhaps getting ref counts if needing to

 * keep a pointer to one of those entries) it must be paired with

 * addr_location__put(), so that the refcounts can be decremented.

 */

void addr_location__put(struct addr_location *al)

{

	map__zput(al->map);

	thread__zput(al->thread);

}



bool is_bts_event(struct perf_event_attr *attr)

{

	return attr->type == PERF_TYPE_HARDWARE &&

tools/perf/util/symbol.h

+1 −16
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/list.h>

#include <linux/rbtree.h>

#include <stdio.h>

#include "addr_location.h"

#include "path.h"

#include "symbol_conf.h"

#include "spark.h"
@@ -120,22 +121,6 @@ struct ref_reloc_sym { 
	u64		unrelocated_addr;

};



struct addr_location {

	struct thread *thread;

	struct maps   *maps;

	struct map    *map;

	struct symbol *sym;

	const char    *srcline;

	u64	      addr;

	char	      level;

	u8	      filtered;

	u8	      cpumode;

	s32	      cpu;

	s32	      socket;

};



void addr_location__put(struct addr_location *al);



int dso__load(struct dso *dso, struct map *map);

int dso__load_vmlinux(struct dso *dso, struct map *map,

		      const char *vmlinux, bool vmlinux_allocated);