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

Commit c796bbbe authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Ingo Molnar
Browse files

perf/core: Move set_filter() out of CONFIG_EVENT_TRACING 



For instruction trace filtering, namely, for communicating filter
definitions from userspace, I'd like to re-use the SET_FILTER code
that the tracepoints are using currently.

To that end, move the relevant code out from behind the
CONFIG_EVENT_TRACING dependency.

Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/1461771888-10409-2-git-send-email-alexander.shishkin@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1a618c2c

kernel/events/core.c

+22 −23
Original line number Diff line number Diff line
@@ -7235,24 +7235,6 @@ static inline void perf_tp_register(void) 
	perf_pmu_register(&perf_tracepoint, "tracepoint", PERF_TYPE_TRACEPOINT);

}



static int perf_event_set_filter(struct perf_event *event, void __user *arg)

{

	char *filter_str;

	int ret;



	if (event->attr.type != PERF_TYPE_TRACEPOINT)

		return -EINVAL;



	filter_str = strndup_user(arg, PAGE_SIZE);

	if (IS_ERR(filter_str))

		return PTR_ERR(filter_str);



	ret = ftrace_profile_set_filter(event, event->attr.config, filter_str);



	kfree(filter_str);

	return ret;

}



static void perf_event_free_filter(struct perf_event *event)

{

	ftrace_profile_free_filter(event);
@@ -7307,11 +7289,6 @@ static inline void perf_tp_register(void) 
{

}



static int perf_event_set_filter(struct perf_event *event, void __user *arg)

{

	return -ENOENT;

}



static void perf_event_free_filter(struct perf_event *event)

{

}
@@ -7339,6 +7316,28 @@ void perf_bp_event(struct perf_event *bp, void *data) 
}

#endif



static int perf_event_set_filter(struct perf_event *event, void __user *arg)

{

	char *filter_str;

	int ret = -EINVAL;



	if (event->attr.type != PERF_TYPE_TRACEPOINT ||

	    !IS_ENABLED(CONFIG_EVENT_TRACING))

		return -EINVAL;



	filter_str = strndup_user(arg, PAGE_SIZE);

	if (IS_ERR(filter_str))

		return PTR_ERR(filter_str);



	if (IS_ENABLED(CONFIG_EVENT_TRACING) &&

	    event->attr.type == PERF_TYPE_TRACEPOINT)

		ret = ftrace_profile_set_filter(event, event->attr.config,

						filter_str);



	kfree(filter_str);

	return ret;

}



/*

 * hrtimer based swevent callback

 */