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

perf test: Make sample-parsing test aware of PERF_SAMPLE_{CODE,DATA}_PAGE_SIZE 



To fix this:

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

This patchset is still not completely merged, so when adding the
PERF_SAMPLE_CODE_PAGE_SIZE to 'struct perf_sample' we need to add the
bits added in this patch for 'perf_sample.data_page_size'.

Fixes: 251cc77b8176de37 ("tools headers UAPI: Update tools's copy of linux/perf_event.h")
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 47dce51a

tools/perf/tests/sample-parsing.c

+5 −1
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ static bool samples_same(const struct perf_sample *s1, 
	if (type & PERF_SAMPLE_CGROUP)

		COMP(cgroup);



	if (type & PERF_SAMPLE_DATA_PAGE_SIZE)

		COMP(data_page_size);



	if (type & PERF_SAMPLE_AUX) {

		COMP(aux_sample.size);

		if (memcmp(s1->aux_sample.data, s2->aux_sample.data,
@@ -234,6 +237,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) 
		},

		.phys_addr	= 113,

		.cgroup		= 114,

		.data_page_size = 115,

		.aux_sample	= {

			.size	= sizeof(aux_data),

			.data	= (void *)aux_data,
@@ -340,7 +344,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_CGROUP << 1) {

	if (PERF_SAMPLE_MAX > PERF_SAMPLE_CODE_PAGE_SIZE << 1) {

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

		return -1;

	}