Commit 71d7924b authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Sync perf_event.h with the kernel sources 



To pick up the changes in:

  2b26f0aa ("perf: Support only inheriting events if cloned with CLONE_THREAD")
  2e498d0a ("perf: Add support for event removal on exec")
  547b6098 ("perf: aux: Add flags for the buffer format")
  55bcf6ef ("perf: Extend PERF_TYPE_HARDWARE and PERF_TYPE_HW_CACHE")
  7dde5176 ("perf: aux: Add CoreSight PMU buffer formats")
  97ba62b2 ("perf: Add support for SIGTRAP on perf events")
  d0d1dd62 ("perf core: Add PERF_COUNT_SW_CGROUP_SWITCHES event")

Also change the expected sizeof(struct perf_event_attr) from 120 to 128 due to
fields being added for the SIGTRAP changes.

Addressing this perf 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

Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Marco Elver <elver@google.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6faf64f5

tools/include/uapi/linux/perf_event.h

+21 −5
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ enum perf_sw_ids { 
	PERF_COUNT_SW_EMULATION_FAULTS		= 8,

	PERF_COUNT_SW_DUMMY			= 9,

	PERF_COUNT_SW_BPF_OUTPUT		= 10,

	PERF_COUNT_SW_CGROUP_SWITCHES		= 11,



	PERF_COUNT_SW_MAX,			/* non-ABI */

};
@@ -326,6 +327,7 @@ enum perf_event_read_format { 
#define PERF_ATTR_SIZE_VER4	104	/* add: sample_regs_intr */

#define PERF_ATTR_SIZE_VER5	112	/* add: aux_watermark */

#define PERF_ATTR_SIZE_VER6	120	/* add: aux_sample_size */

#define PERF_ATTR_SIZE_VER7	128	/* add: sig_data */



/*

 * Hardware event_id to monitor via a performance monitoring event:
@@ -404,7 +406,10 @@ struct perf_event_attr { 
				cgroup         :  1, /* include cgroup events */

				text_poke      :  1, /* include text poke events */

				build_id       :  1, /* use build id in mmap2 events */

				__reserved_1   : 29;

				inherit_thread :  1, /* children only inherit if cloned with CLONE_THREAD */

				remove_on_exec :  1, /* event is removed from task on exec */

				sigtrap        :  1, /* send synchronous SIGTRAP on event */

				__reserved_1   : 26;



	union {

		__u32		wakeup_events;	  /* wakeup every n events */
@@ -456,6 +461,12 @@ struct perf_event_attr { 
	__u16	__reserved_2;

	__u32	aux_sample_size;

	__u32	__reserved_3;



	/*

	 * User provided data if sigtrap=1, passed back to user via

	 * siginfo_t::si_perf, e.g. to permit user to identify the event.

	 */

	__u64	sig_data;

};



/*
@@ -1175,6 +1186,11 @@ enum perf_callchain_context { 
#define PERF_AUX_FLAG_OVERWRITE			0x02	/* snapshot from overwrite mode */

#define PERF_AUX_FLAG_PARTIAL			0x04	/* record contains gaps */

#define PERF_AUX_FLAG_COLLISION			0x08	/* sample collided with another */

#define PERF_AUX_FLAG_PMU_FORMAT_TYPE_MASK	0xff00	/* PMU specific trace format type */



/* CoreSight PMU AUX buffer formats */

#define PERF_AUX_FLAG_CORESIGHT_FORMAT_CORESIGHT	0x0000 /* Default for backward compatibility */

#define PERF_AUX_FLAG_CORESIGHT_FORMAT_RAW		0x0100 /* Raw format of the source */



#define PERF_FLAG_FD_NO_GROUP		(1UL << 0)

#define PERF_FLAG_FD_OUTPUT		(1UL << 1)

tools/perf/tests/attr/base-record

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ group_fd=-1 
flags=0|8

cpu=*

type=0|1

size=120

size=128

config=0

sample_period=*

sample_type=263

tools/perf/tests/attr/base-stat

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ group_fd=-1 
flags=0|8

cpu=*

type=0

size=120

size=128

config=0

sample_period=0

sample_type=65536

tools/perf/tests/attr/system-wide-dummy

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ cpu=* 
pid=-1

flags=8

type=1

size=120

size=128

config=9

sample_period=4000

sample_type=455