Commit 98dcf14d authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add kernel AUX area sampling definitions 



Add kernel AUX area sampling definitions, which brings perf_event.h into
line with the kernel version.

New sample type PERF_SAMPLE_AUX requests a sample of the AUX area
buffer.  New perf_event_attr member 'aux_sample_size' specifies the
desired size of the sample.

Also add support for parsing samples containing AUX area data i.e.
PERF_SAMPLE_AUX.

Committer notes:

I squashed the first two patches in this series to avoid breaking
automatic bisection, i.e. after applying only the original first patch
in this series we would have:

  # perf test -v parsing
  26: Sample parsing                                        :
  --- start ---
  test child forked, pid 17018
  sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating
  test child finished with -1
  ---- end ----
  Sample parsing: FAILED!
  #

With the two paches combined:

  # perf test parsing
  26: Sample parsing                                        : Ok
  #

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20191115124225.5247-3-adrian.hunter@intel.com


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

tools/include/uapi/linux/perf_event.h

+8 −2
Original line number Diff line number Diff line
@@ -141,8 +141,9 @@ enum perf_event_sample_format { 
	PERF_SAMPLE_TRANSACTION			= 1U << 17,

	PERF_SAMPLE_REGS_INTR			= 1U << 18,

	PERF_SAMPLE_PHYS_ADDR			= 1U << 19,

	PERF_SAMPLE_AUX				= 1U << 20,



	PERF_SAMPLE_MAX = 1U << 20,		/* non-ABI */

	PERF_SAMPLE_MAX = 1U << 21,		/* non-ABI */



	__PERF_SAMPLE_CALLCHAIN_EARLY		= 1ULL << 63, /* non-ABI; internal use */

};
@@ -300,6 +301,7 @@ enum perf_event_read_format { 
					/* add: sample_stack_user */

#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 */



/*

 * Hardware event_id to monitor via a performance monitoring event:
@@ -424,7 +426,9 @@ struct perf_event_attr { 
	 */

	__u32	aux_watermark;

	__u16	sample_max_stack;

	__u16	__reserved_2;	/* align to __u64 */

	__u16	__reserved_2;

	__u32	aux_sample_size;

	__u32	__reserved_3;

};



/*
@@ -864,6 +868,8 @@ enum perf_event_type { 
	 *	{ u64			abi; # enum perf_sample_regs_abi

	 *	  u64			regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR

	 *	{ u64			phys_addr;} && PERF_SAMPLE_PHYS_ADDR

	 *	{ u64			size;

	 *	  char			data[size]; } && PERF_SAMPLE_AUX

	 * };

	 */

	PERF_RECORD_SAMPLE			= 9,

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=112

size=120

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=112

size=120

config=0

sample_period=0

sample_type=65536

tools/perf/tests/sample-parsing.c

+15 −1
Original line number Diff line number Diff line
@@ -150,6 +150,15 @@ static bool samples_same(const struct perf_sample *s1, 
	if (type & PERF_SAMPLE_PHYS_ADDR)

		COMP(phys_addr);



	if (type & PERF_SAMPLE_AUX) {

		COMP(aux_sample.size);

		if (memcmp(s1->aux_sample.data, s2->aux_sample.data,

			   s1->aux_sample.size)) {

			pr_debug("Samples differ at 'aux_sample'\n");

			return false;

		}

	}



	return true;

}
@@ -182,6 +191,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) 
	u64 regs[64];

	const u64 raw_data[] = {0x123456780a0b0c0dULL, 0x1102030405060708ULL};

	const u64 data[] = {0x2211443366558877ULL, 0, 0xaabbccddeeff4321ULL};

	const u64 aux_data[] = {0xa55a, 0, 0xeeddee, 0x0282028202820282};

	struct perf_sample sample = {

		.ip		= 101,

		.pid		= 102,
@@ -218,6 +228,10 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) 
			.regs	= regs,

		},

		.phys_addr	= 113,

		.aux_sample	= {

			.size	= sizeof(aux_data),

			.data	= (void *)aux_data,

		},

	};

	struct sample_read_value values[] = {{1, 5}, {9, 3}, {2, 7}, {6, 4},};

	struct perf_sample sample_out;
@@ -317,7 +331,7 @@ int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_u 
	 * were added.  Please actually update the test rather than just change

	 * the condition below.

	 */

	if (PERF_SAMPLE_MAX > PERF_SAMPLE_PHYS_ADDR << 1) {

	if (PERF_SAMPLE_MAX > PERF_SAMPLE_AUX << 1) {

		pr_debug("sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating\n");

		return -1;

	}

tools/perf/util/event.h

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ enum { 


#define MAX_INSN 16



struct aux_sample {

	u64 size;

	void *data;

};



struct perf_sample {

	u64 ip;

	u32 pid, tid;
@@ -142,6 +147,7 @@ struct perf_sample { 
	struct regs_dump  intr_regs;

	struct stack_dump user_stack;

	struct sample_read read;

	struct aux_sample aux_sample;

};



#define PERF_MEM_DATA_SRC_NONE \

CRA Git | Maintained and supported by SUSTech CRA and CCSE