Commit 5b26af6d authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Peter Zijlstra
Browse files

perf/x86/amd: Support PERF_SAMPLE_PHY_ADDR 



IBS_DC_PHYSADDR provides the physical data address for the tagged load/
store operation. Populate perf sample physical address using it.

Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220928095805.596-7-ravi.bangoria@amd.com
parent cb2bb85f

arch/x86/events/amd/ibs.c

+7 −1
Original line number Diff line number Diff line
@@ -989,6 +989,11 @@ static void perf_ibs_parse_ld_st_data(__u64 sample_type, 
		data->addr = ibs_data->regs[ibs_op_msr_idx(MSR_AMD64_IBSDCLINAD)];

		data->sample_flags |= PERF_SAMPLE_ADDR;

	}



	if (sample_type & PERF_SAMPLE_PHYS_ADDR && op_data3.dc_phy_addr_valid) {

		data->phys_addr = ibs_data->regs[ibs_op_msr_idx(MSR_AMD64_IBSDCPHYSAD)];

		data->sample_flags |= PERF_SAMPLE_PHYS_ADDR;

	}

}



static int perf_ibs_get_offset_max(struct perf_ibs *perf_ibs, u64 sample_type,
@@ -998,7 +1003,8 @@ static int perf_ibs_get_offset_max(struct perf_ibs *perf_ibs, u64 sample_type, 
	    (perf_ibs == &perf_ibs_op &&

	     (sample_type & PERF_SAMPLE_DATA_SRC ||

	      sample_type & PERF_SAMPLE_WEIGHT_TYPE ||

	      sample_type & PERF_SAMPLE_ADDR)))

	      sample_type & PERF_SAMPLE_ADDR ||

	      sample_type & PERF_SAMPLE_PHYS_ADDR)))

		return perf_ibs->offset_max;

	else if (check_rip)

		return 3;

kernel/events/core.c

+2 −1
Original line number Diff line number Diff line
@@ -7435,7 +7435,8 @@ void perf_prepare_sample(struct perf_event_header *header, 
		header->size += size;

	}



	if (sample_type & PERF_SAMPLE_PHYS_ADDR)

	if (sample_type & PERF_SAMPLE_PHYS_ADDR &&

	    filtered_sample_type & PERF_SAMPLE_PHYS_ADDR)

		data->phys_addr = perf_virt_to_phys(data->addr);



#ifdef CONFIG_CGROUP_PERF