Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8780fb25 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf sort: Add sort option for physical address 



Add a new sort option "phys_daddr" for --mem-mode sort.  With this
option applied, perf can sort and report by sample's physical address.

Signed-off-by: default avatarKan Liang <kan.liang@intel.com>
Tested-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarStephane Eranian <eranian@google.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1504026672-7304-3-git-send-email-kan.liang@intel.com


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

tools/perf/Documentation/perf-report.txt

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ OPTIONS 
	- mem: type of memory access for the data at the time of the sample

	- snoop: type of snoop (if any) for the data at the time of the sample

	- dcacheline: the cacheline the data address is on at the time of the sample

	- phys_daddr: physical address of data being executed on at the time of sample



	And the default sort keys are changed to local_weight, mem, sym, dso,

	symbol_daddr, dso_daddr, snoop, tlb, locked, see '--mem-mode'.

tools/perf/util/hist.c

+4 −0
Original line number Diff line number Diff line
@@ -167,6 +167,10 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h) 
			symlen = unresolved_col_width + 4 + 2;

			hists__set_unres_dso_col_len(hists, HISTC_MEM_DADDR_DSO);

		}



		hists__new_col_len(hists, HISTC_MEM_PHYS_DADDR,

				   unresolved_col_width + 4 + 2);



	} else {

		symlen = unresolved_col_width + 4 + 2;

		hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL, symlen);

tools/perf/util/hist.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum hist_column { 
	HISTC_GLOBAL_WEIGHT,

	HISTC_MEM_DADDR_SYMBOL,

	HISTC_MEM_DADDR_DSO,

	HISTC_MEM_PHYS_DADDR,

	HISTC_MEM_LOCKED,

	HISTC_MEM_TLB,

	HISTC_MEM_LVL,

tools/perf/util/machine.c

+6 −2
Original line number Diff line number Diff line
@@ -1635,10 +1635,12 @@ static void ip__resolve_ams(struct thread *thread, 
	ams->al_addr = al.addr;

	ams->sym = al.sym;

	ams->map = al.map;

	ams->phys_addr = 0;

}



static void ip__resolve_data(struct thread *thread,

			     u8 m, struct addr_map_symbol *ams, u64 addr)

			     u8 m, struct addr_map_symbol *ams,

			     u64 addr, u64 phys_addr)

{

	struct addr_location al;
@@ -1658,6 +1660,7 @@ static void ip__resolve_data(struct thread *thread, 
	ams->al_addr = al.addr;

	ams->sym = al.sym;

	ams->map = al.map;

	ams->phys_addr = phys_addr;

}



struct mem_info *sample__resolve_mem(struct perf_sample *sample,
@@ -1669,7 +1672,8 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample, 
		return NULL;



	ip__resolve_ams(al->thread, &mi->iaddr, sample->ip);

	ip__resolve_data(al->thread, al->cpumode, &mi->daddr, sample->addr);

	ip__resolve_data(al->thread, al->cpumode, &mi->daddr,

			 sample->addr, sample->phys_addr);

	mi->data_src.val = sample->data_src;



	return mi;

tools/perf/util/session.c

+3 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,9 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event, 
	if (sample_type & PERF_SAMPLE_DATA_SRC)

		printf(" . data_src: 0x%"PRIx64"\n", sample->data_src);



	if (sample_type & PERF_SAMPLE_PHYS_ADDR)

		printf(" .. phys_addr: 0x%"PRIx64"\n", sample->phys_addr);



	if (sample_type & PERF_SAMPLE_TRANSACTION)

		printf("... transaction: %" PRIx64 "\n", sample->transaction);