Commit 07ad6f31 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf session: Add e_flags to the e_machine helper 



Allow e_flags as well as e_machine to be computed using the e_machine
helper.

This isn't currently used, the argument is always NULL, but it will be
used for a new header feature.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Aditya Bodkhe <aditya.b1@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Jones <ajones@ventanamicro.com>
Cc: Anubhav Shelat <ashelat@redhat.com>
Cc: Anup Patel <anup@brainfault.org>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Blake Jones <blakejones@google.com>
Cc: Chun-Tse Shao <ctshao@google.com>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quan Zhou <zhouquan@iscas.ac.cn>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Swapnil Sapkal <swapnil.sapkal@amd.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yunseong Kim <ysk@kzalloc.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 43af5484

tools/perf/builtin-kvm.c

+5 −4
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static bool handle_end_event(struct perf_kvm_stat *kvm, 


	if (kvm->duration && time_diff > kvm->duration) {

		char decode[KVM_EVENT_NAME_LEN];

		uint16_t e_machine = perf_session__e_machine(kvm->session);

		uint16_t e_machine = perf_session__e_machine(kvm->session, /*e_flags=*/NULL);



		kvm->events_ops->decode_key(kvm, &event->key, decode);

		if (!skip_event(e_machine, decode)) {
@@ -1187,7 +1187,7 @@ static int cpu_isa_config(struct perf_kvm_stat *kvm) 
		return -EINVAL;

	}



	e_machine = perf_session__e_machine(kvm->session);

	e_machine = perf_session__e_machine(kvm->session, /*e_flags=*/NULL);

	err = cpu_isa_init(kvm, e_machine, cpuid);

	if (err == -ENOTSUP)

		pr_err("CPU %s is not supported.\n", cpuid);
@@ -1549,7 +1549,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm) 
static int read_events(struct perf_kvm_stat *kvm)

{

	int ret;



	uint16_t e_machine;

	struct perf_data file = {

		.path  = kvm->file_name,

		.mode  = PERF_DATA_MODE_READ,
@@ -1574,7 +1574,8 @@ static int read_events(struct perf_kvm_stat *kvm) 
		goto out_delete;

	}



	if (!register_kvm_events_ops(kvm, perf_session__e_machine(kvm->session))) {

	e_machine = perf_session__e_machine(kvm->session, /*e_flags=*/NULL);

	if (!register_kvm_events_ops(kvm, e_machine)) {

		ret = -EINVAL;

		goto out_delete;

	}

tools/perf/builtin-report.c

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int report__setup_sample_type(struct report *rep) 
		}

	}



	callchain_param_setup(sample_type, perf_session__e_machine(session));

	callchain_param_setup(sample_type, perf_session__e_machine(session, /*e_flags=*/NULL));



	if (rep->stitch_lbr && (callchain_param.record_mode != CALLCHAIN_LBR)) {

		ui__warning("Can't find LBR callchain. Switch off --stitch-lbr.\n"
@@ -1296,7 +1296,7 @@ static int process_attr(const struct perf_tool *tool __maybe_unused, 
	 */

	sample_type = evlist__combined_sample_type(*pevlist);

	session = (*pevlist)->session;

	callchain_param_setup(sample_type, perf_session__e_machine(session));

	callchain_param_setup(sample_type, perf_session__e_machine(session, /*e_flags=*/NULL));

	return 0;

}

tools/perf/builtin-script.c

+4 −2
Original line number Diff line number Diff line
@@ -2818,6 +2818,7 @@ static int process_attr(const struct perf_tool *tool, union perf_event *event, 
	struct perf_script *scr = container_of(tool, struct perf_script, tool);

	struct evlist *evlist;

	struct evsel *evsel, *pos;

	uint16_t e_machine;

	u64 sample_type;

	int err;
@@ -2859,7 +2860,8 @@ static int process_attr(const struct perf_tool *tool, union perf_event *event, 
	 * on events sample_type.

	 */

	sample_type = evlist__combined_sample_type(evlist);

	callchain_param_setup(sample_type, perf_session__e_machine(evsel__session(evsel)));

	e_machine = perf_session__e_machine(evsel__session(evsel), /*e_flags=*/NULL);

	callchain_param_setup(sample_type, e_machine);



	/* Enable fields for callchain entries */

	if (symbol_conf.use_callchain &&
@@ -3834,7 +3836,7 @@ static void script__setup_sample_type(struct perf_script *script) 
	struct perf_session *session = script->session;

	u64 sample_type = evlist__combined_sample_type(session->evlist);



	callchain_param_setup(sample_type, perf_session__e_machine(session));

	callchain_param_setup(sample_type, perf_session__e_machine(session, /*e_flags=*/NULL));



	if (script->stitch_lbr && (callchain_param.record_mode != CALLCHAIN_LBR)) {

		pr_warning("Can't find LBR callchain. Switch off --stitch-lbr.\n"

tools/perf/util/evsel.c

+3 −3
Original line number Diff line number Diff line
@@ -1008,11 +1008,11 @@ int evsel__group_desc(struct evsel *evsel, char *buf, size_t size) 
	return ret;

}



uint16_t evsel__e_machine(struct evsel *evsel)

uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags)

{

	struct perf_session *session = evsel__session(evsel);



	return session ? perf_session__e_machine(session) : EM_HOST;

	return perf_session__e_machine(session, e_flags);

}



static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *opts,
@@ -1050,7 +1050,7 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *o 


	if (param->record_mode == CALLCHAIN_DWARF) {

		if (!function) {

			uint16_t e_machine = evsel__e_machine(evsel);

			uint16_t e_machine = evsel__e_machine(evsel, /*e_flags=*/NULL);



			evsel__set_sample_bit(evsel, REGS_USER);

			evsel__set_sample_bit(evsel, STACK_USER);

tools/perf/util/evsel.h

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static inline bool evsel__is_dummy_event(struct evsel *evsel) 


struct perf_session *evsel__session(struct evsel *evsel);

struct perf_env *evsel__env(struct evsel *evsel);

uint16_t evsel__e_machine(struct evsel *evsel);

uint16_t evsel__e_machine(struct evsel *evsel, uint32_t *e_flags);



int evsel__store_ids(struct evsel *evsel, struct evlist *evlist);