Commit 6339998d authored Mar 04, 2020 by Arnaldo Carvalho de Melo

tools headers UAPI: Update tools's copy of linux/perf_event.h



To get the changes in:

  bbfd5e4f ("perf/core: Add new branch sample type for HW index of raw branch records")

This silences this perf tools build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h' differs from latest version at 'include/uapi/linux/perf_event.h'
  diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.h

This update is a prerequisite to adding support for the HW index of raw
branch records.

Acked-by: Kan Liang <kan.liang@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pavel Gerasimov <pavel.gerasimov@intel.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vitaly Slobodskoy <vitaly.slobodskoy@intel.com>
Link: http://lore.kernel.org/lkml/20200304134902.GB12612@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 401d61cb

tools/include/uapi/linux/perf_event.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -181,6 +181,8 @@ enum perf_branch_sample_type_shift {

		PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT = 16, /* save branch type */

		PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT = 17, /* save low level index of raw branch records */

		PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */
		};

		@@ -208,6 +210,8 @@ enum perf_branch_sample_type {
		PERF_SAMPLE_BRANCH_TYPE_SAVE =
		1U << PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT,

		PERF_SAMPLE_BRANCH_HW_INDEX = 1U << PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT,

		PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
		};

		@@ -853,7 +857,9 @@ enum perf_event_type {
		* char data[size];}&& PERF_SAMPLE_RAW
		*
		* { u64 nr;
		* { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK
		* { u64 hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX
		* { u64 from, to, flags } lbr[nr];
		* } && PERF_SAMPLE_BRANCH_STACK
		*
		* { u64 abi; # enum perf_sample_regs_abi
		* u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER

Admin message