Commit 76db7aab authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync include/uapi/linux/perf_event.h header with the kernel 



Sync the new sample type for the branch counters feature.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.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: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tinghao Zhang <tinghao.zhang@intel.com>
Link: https://lore.kernel.org/r/20231025201626.3000228-6-kan.liang@linux.intel.com


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

tools/include/uapi/linux/perf_event.h

+13 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ enum perf_branch_sample_type_shift { 


	PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT	= 18, /* save privilege mode */



	PERF_SAMPLE_BRANCH_COUNTERS_SHIFT	= 19, /* save occurrences of events on a branch */



	PERF_SAMPLE_BRANCH_MAX_SHIFT		/* non-ABI */

};
@@ -235,6 +237,8 @@ enum perf_branch_sample_type { 


	PERF_SAMPLE_BRANCH_PRIV_SAVE	= 1U << PERF_SAMPLE_BRANCH_PRIV_SAVE_SHIFT,



	PERF_SAMPLE_BRANCH_COUNTERS	= 1U << PERF_SAMPLE_BRANCH_COUNTERS_SHIFT,



	PERF_SAMPLE_BRANCH_MAX		= 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,

};
@@ -982,6 +986,12 @@ enum perf_event_type { 
	 *	{ u64                   nr;

	 *	  { u64	hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX

	 *        { u64 from, to, flags } lbr[nr];

	 *        #

	 *        # The format of the counters is decided by the

	 *        # "branch_counter_nr" and "branch_counter_width",

	 *        # which are defined in the ABI.

	 *        #

	 *        { u64 counters; } cntr[nr] && PERF_SAMPLE_BRANCH_COUNTERS

	 *      } && PERF_SAMPLE_BRANCH_STACK

	 *

	 * 	{ u64			abi; # enum perf_sample_regs_abi
@@ -1427,6 +1437,9 @@ struct perf_branch_entry { 
		reserved:31;

};



/* Size of used info bits in struct perf_branch_entry */

#define PERF_BRANCH_ENTRY_INFO_BITS_MAX		33



union perf_sample_weight {

	__u64		full;

#if defined(__LITTLE_ENDIAN_BITFIELD)