Commit dce5affb authored Oct 30, 2019 by Alexander Shishkin Committed by Ingo Molnar Nov 13, 2019

perf/aux: Disallow aux_output for kernel events



Commit

  ab43762e ("perf: Allow normal events to output AUX data")

added 'aux_output' bit to the attribute structure, which relies on AUX
events and grouping, neither of which is supported for the kernel events.
This notwithstanding, attempts have been made to use it in the kernel
code, suggesting the necessity of an explicit hard -EINVAL.

Fix this by rejecting attributes with aux_output set for kernel events.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: https://lkml.kernel.org/r/20191030134731.5437-3-alexander.shishkin@linux.intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent f25d8ba9

kernel/events/core.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -11331,6 +11331,13 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
		struct perf_event *event;
		int err;

		/*
		* Grouping is not supported for kernel events, neither is 'AUX',
		* make sure the caller's intentions are adjusted.
		*/
		if (attr->aux_output)
		return ERR_PTR(-EINVAL);

		event = perf_event_alloc(attr, cpu, task, NULL, NULL,
		overflow_handler, context, -1);
		if (IS_ERR(event)) {

Admin message