Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fc632ce authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Move perf_event_attr field from perf's evsel to libperf's perf_evsel 



Move the perf_event_attr struct fron 'struct evsel' to 'struct perf_evsel'.

Committer notes:

Fixed up these:

 tools/perf/arch/arm/util/auxtrace.c
 tools/perf/arch/arm/util/cs-etm.c
 tools/perf/arch/arm64/util/arm-spe.c
 tools/perf/arch/s390/util/auxtrace.c
 tools/perf/util/cs-etm.c

Also

  cc1: warnings being treated as errors
  tests/sample-parsing.c: In function 'do_test':
  tests/sample-parsing.c:162: error: missing initializer
  tests/sample-parsing.c:162: error: (near initialization for 'evsel.core.cpus')

   	struct evsel evsel = {
   		.needs_swap = false,
  -		.core.attr = {
  -			.sample_type = sample_type,
  -			.read_format = read_format,
  +		.core = {
  +			. attr = {
  +				.sample_type = sample_type,
  +				.read_format = read_format,
  +			},

  [perfbuilder@a70e4eeb5549 /]$ gcc --version |& head -1
  gcc (GCC) 4.4.7

Also we don't need to include perf_event.h in
tools/perf/lib/include/perf/evsel.h, forward declaring 'struct
perf_event_attr' is enough. And this even fixes the build in some
systems where things are used somewhere down the include path from
perf_event.h without defining __always_inline.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-43-jolsa@kernel.org


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

tools/perf/arch/arm/util/auxtrace.c

+2 −2
Original line number Diff line number Diff line
@@ -70,14 +70,14 @@ struct auxtrace_record 


	evlist__for_each_entry(evlist, evsel) {

		if (cs_etm_pmu &&

		    evsel->attr.type == cs_etm_pmu->type)

		    evsel->core.attr.type == cs_etm_pmu->type)

			found_etm = true;



		if (!nr_spes)

			continue;



		for (i = 0; i < nr_spes; i++) {

			if (evsel->attr.type == arm_spe_pmus[i]->type) {

			if (evsel->core.attr.type == arm_spe_pmus[i]->type) {

				found_spe = true;

				break;

			}

tools/perf/arch/arm/util/cs-etm.c

+14 −14
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int cs_etm_set_context_id(struct auxtrace_record *itr, 
	}



	/* All good, let the kernel know */

	evsel->attr.config |= (1 << ETM_OPT_CTXTID);

	evsel->core.attr.config |= (1 << ETM_OPT_CTXTID);

	err = 0;



out:
@@ -144,7 +144,7 @@ static int cs_etm_set_timestamp(struct auxtrace_record *itr, 
	}



	/* All good, let the kernel know */

	evsel->attr.config |= (1 << ETM_OPT_TS);

	evsel->core.attr.config |= (1 << ETM_OPT_TS);

	err = 0;



out:
@@ -215,7 +215,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, 
	int ret = -EINVAL;

	u32 hash;



	if (evsel->attr.config2 & GENMASK(31, 0))

	if (evsel->core.attr.config2 & GENMASK(31, 0))

		return 0;



	list_for_each_entry(term, &evsel->config_terms, list) {
@@ -233,7 +233,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, 
			return ret;

		}



		evsel->attr.config2 |= hash;

		evsel->core.attr.config2 |= hash;

		return 0;

	}
@@ -264,14 +264,14 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 
		opts->record_switch_events = true;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel->attr.type == cs_etm_pmu->type) {

		if (evsel->core.attr.type == cs_etm_pmu->type) {

			if (cs_etm_evsel) {

				pr_err("There may be only one %s event\n",

				       CORESIGHT_ETM_PMU_NAME);

				return -EINVAL;

			}

			evsel->attr.freq = 0;

			evsel->attr.sample_period = 1;

			evsel->core.attr.freq = 0;

			evsel->core.attr.sample_period = 1;

			cs_etm_evsel = evsel;

			opts->full_auxtrace = true;

		}
@@ -416,8 +416,8 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 
		tracking_evsel = perf_evlist__last(evlist);

		perf_evlist__set_tracking_event(evlist, tracking_evsel);



		tracking_evsel->attr.freq = 0;

		tracking_evsel->attr.sample_period = 1;

		tracking_evsel->core.attr.freq = 0;

		tracking_evsel->core.attr.sample_period = 1;



		/* In per-cpu case, always need the time of mmap events etc */

		if (!cpu_map__empty(cpus))
@@ -438,7 +438,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr) 
	struct evsel *evsel;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel->attr.type == cs_etm_pmu->type) {

		if (evsel->core.attr.type == cs_etm_pmu->type) {

			/*

			 * Variable perf_event_attr::config is assigned to

			 * ETMv3/PTM.  The bit fields have been made to match
@@ -447,7 +447,7 @@ static u64 cs_etm_get_config(struct auxtrace_record *itr) 
			 * drivers/hwtracing/coresight/coresight-perf.c for

			 * details.

			 */

			config = evsel->attr.config;

			config = evsel->core.attr.config;

			break;

		}

	}
@@ -820,7 +820,7 @@ static int cs_etm_snapshot_start(struct auxtrace_record *itr) 
	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->attr.type == ptr->cs_etm_pmu->type)

		if (evsel->core.attr.type == ptr->cs_etm_pmu->type)

			return evsel__disable(evsel);

	}

	return -EINVAL;
@@ -833,7 +833,7 @@ static int cs_etm_snapshot_finish(struct auxtrace_record *itr) 
	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->attr.type == ptr->cs_etm_pmu->type)

		if (evsel->core.attr.type == ptr->cs_etm_pmu->type)

			return evsel__enable(evsel);

	}

	return -EINVAL;
@@ -861,7 +861,7 @@ static int cs_etm_read_finish(struct auxtrace_record *itr, int idx) 
	struct evsel *evsel;



	evlist__for_each_entry(ptr->evlist, evsel) {

		if (evsel->attr.type == ptr->cs_etm_pmu->type)

		if (evsel->core.attr.type == ptr->cs_etm_pmu->type)

			return perf_evlist__enable_event_idx(ptr->evlist,

							     evsel, idx);

	}

tools/perf/arch/arm64/util/arm-spe.c

+6 −6
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
	sper->evlist = evlist;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel->attr.type == arm_spe_pmu->type) {

		if (evsel->core.attr.type == arm_spe_pmu->type) {

			if (arm_spe_evsel) {

				pr_err("There may be only one " ARM_SPE_PMU_NAME "x event\n");

				return -EINVAL;

			}

			evsel->attr.freq = 0;

			evsel->attr.sample_period = 1;

			evsel->core.attr.freq = 0;

			evsel->core.attr.sample_period = 1;

			arm_spe_evsel = evsel;

			opts->full_auxtrace = true;

		}
@@ -130,8 +130,8 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
	tracking_evsel = perf_evlist__last(evlist);

	perf_evlist__set_tracking_event(evlist, tracking_evsel);



	tracking_evsel->attr.freq = 0;

	tracking_evsel->attr.sample_period = 1;

	tracking_evsel->core.attr.freq = 0;

	tracking_evsel->core.attr.sample_period = 1;

	perf_evsel__set_sample_bit(tracking_evsel, TIME);

	perf_evsel__set_sample_bit(tracking_evsel, CPU);

	perf_evsel__reset_sample_bit(tracking_evsel, BRANCH_STACK);
@@ -163,7 +163,7 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx) 
	struct evsel *evsel;



	evlist__for_each_entry(sper->evlist, evsel) {

		if (evsel->attr.type == sper->arm_spe_pmu->type)

		if (evsel->core.attr.type == sper->arm_spe_pmu->type)

			return perf_evlist__enable_event_idx(sper->evlist,

							     evsel, idx);

	}

tools/perf/arch/s390/util/auxtrace.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct auxtrace_record *auxtrace_record__init(struct evlist *evlist, 
		return NULL;



	evlist__for_each_entry(evlist, pos) {

		if (pos->attr.config == PERF_EVENT_CPUM_SF_DIAG) {

		if (pos->core.attr.config == PERF_EVENT_CPUM_SF_DIAG) {

			diagnose = 1;

			break;

		}

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+3 −3
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 


	evsel = perf_evlist__first(evlist);



	evsel->attr.comm = 1;

	evsel->attr.disabled = 1;

	evsel->attr.enable_on_exec = 0;

	evsel->core.attr.comm = 1;

	evsel->core.attr.disabled = 1;

	evsel->core.attr.enable_on_exec = 0;



	CHECK__(evlist__open(evlist));