Commit d09d31d3 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Junhao He
Browse files

perf: Consolidate branch sample filter helpers 

mainline inclusion
from mainline-v6.1-rc1
commit 03b02db9
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8EC9K
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=03b02db93be407103c385814033633364674a6f6



--------------------------------

Besides the branch type filtering requests, 'event.attr.branch_sample_type'
also contains various flags indicating which additional information should
be captured, along with the base branch record. These flags help configure
the underlying hardware, and capture the branch records appropriately when
required e.g after PMU interrupt. But first, this moves an existing helper
perf_sample_save_hw_index() into the header before adding some more helpers
for other branch sample filter flags.

Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220906084414.396220-1-anshuman.khandual@arm.com


Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent 06c0a4ea

include/linux/perf_event.h

+26 −0
Original line number Diff line number Diff line
@@ -1629,4 +1629,30 @@ extern void __weak arch_perf_update_userpage(struct perf_event *event, 
					     struct perf_event_mmap_page *userpg,

					     u64 now);



#ifdef CONFIG_PERF_EVENTS

static inline bool branch_sample_no_flags(const struct perf_event *event)

{

	return event->attr.branch_sample_type & PERF_SAMPLE_BRANCH_NO_FLAGS;

}



static inline bool branch_sample_no_cycles(const struct perf_event *event)

{

	return event->attr.branch_sample_type & PERF_SAMPLE_BRANCH_NO_CYCLES;

}



static inline bool branch_sample_type(const struct perf_event *event)

{

	return event->attr.branch_sample_type & PERF_SAMPLE_BRANCH_TYPE_SAVE;

}



static inline bool branch_sample_hw_index(const struct perf_event *event)

{

	return event->attr.branch_sample_type & PERF_SAMPLE_BRANCH_HW_INDEX;

}



static inline bool branch_sample_priv(const struct perf_event *event)

{

	return event->attr.branch_sample_type & PERF_SAMPLE_BRANCH_PRIV_SAVE;

}

#endif /* CONFIG_PERF_EVENTS */

#endif /* _LINUX_PERF_EVENT_H */

kernel/events/core.c

+2 −7
Original line number Diff line number Diff line
@@ -6867,11 +6867,6 @@ static void perf_output_read(struct perf_output_handle *handle, 
		perf_output_read_one(handle, event, enabled, running);

}



static inline bool perf_sample_save_hw_index(struct perf_event *event)

{

	return event->attr.branch_sample_type & PERF_SAMPLE_BRANCH_HW_INDEX;

}



void perf_output_sample(struct perf_output_handle *handle,

			struct perf_event_header *header,

			struct perf_sample_data *data,
@@ -6960,7 +6955,7 @@ void perf_output_sample(struct perf_output_handle *handle, 
			     * sizeof(struct perf_branch_entry);



			perf_output_put(handle, data->br_stack->nr);

			if (perf_sample_save_hw_index(event))

			if (branch_sample_hw_index(event))

				perf_output_put(handle, data->br_stack->hw_idx);

			perf_output_copy(handle, data->br_stack->entries, size);

		} else {
@@ -7167,7 +7162,7 @@ void perf_prepare_sample(struct perf_event_header *header, 
	if (sample_type & PERF_SAMPLE_BRANCH_STACK) {

		int size = sizeof(u64); /* nr */

		if (data->br_stack) {

			if (perf_sample_save_hw_index(event))

			if (branch_sample_hw_index(event))

				size += sizeof(u64);



			size += data->br_stack->nr