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

Commit e321ae4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Misc kernel and tooling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools lib traceevent: Fix conversion of pointer to integer of different size
  perf/trace: Properly use u64 to hold event_id
  perf: Remove fragile swevent hlist optimization
  ftrace, perf: Avoid infinite event generation loop
  tools lib traceevent: Fix use of multiple options in processing field
  perf header: Fix possible memory leaks in process_group_desc()
  perf header: Fix bogus group name
  perf tools: Tag thread comm as overriden
parents bcc2f9b7 e98a6e59

arch/x86/include/asm/trace/irq_vectors.h

+11 −0
Original line number Diff line number Diff line
@@ -71,6 +71,17 @@ DEFINE_IRQ_VECTOR_EVENT(x86_platform_ipi); 
 */

DEFINE_IRQ_VECTOR_EVENT(irq_work);



/*

 * We must dis-allow sampling irq_work_exit() because perf event sampling

 * itself can cause irq_work, which would lead to an infinite loop;

 *

 *  1) irq_work_exit happens

 *  2) generates perf sample

 *  3) generates irq_work

 *  4) goto 1

 */

TRACE_EVENT_PERF_PERM(irq_work_exit, is_sampling_event(p_event) ? -EPERM : 0);



/*

 * call_function - called when entering/exiting a call function interrupt

 * vector handler

include/linux/ftrace_event.h

+16 −0
Original line number Diff line number Diff line
@@ -248,6 +248,9 @@ struct ftrace_event_call { 
#ifdef CONFIG_PERF_EVENTS

	int				perf_refcount;

	struct hlist_head __percpu	*perf_events;



	int	(*perf_perm)(struct ftrace_event_call *,

			     struct perf_event *);

#endif

};
@@ -317,6 +320,19 @@ struct ftrace_event_file { 
	}								\

	early_initcall(trace_init_flags_##name);



#define __TRACE_EVENT_PERF_PERM(name, expr...)				\

	static int perf_perm_##name(struct ftrace_event_call *tp_event, \

				    struct perf_event *p_event)		\

	{								\

		return ({ expr; });					\

	}								\

	static int __init trace_init_perf_perm_##name(void)		\

	{								\

		event_##name.perf_perm = &perf_perm_##name;		\

		return 0;						\

	}								\

	early_initcall(trace_init_perf_perm_##name);



#define PERF_MAX_TRACE_SIZE	2048



#define MAX_FILTER_STR_VAL	256	/* Should handle KSYM_SYMBOL_LEN */

include/linux/tracepoint.h

+4 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ static inline void tracepoint_synchronize_unregister(void) 


#define TRACE_EVENT_FLAGS(event, flag)



#define TRACE_EVENT_PERF_PERM(event, expr...)



#endif /* DECLARE_TRACE */



#ifndef TRACE_EVENT
@@ -399,4 +401,6 @@ static inline void tracepoint_synchronize_unregister(void) 


#define TRACE_EVENT_FLAGS(event, flag)



#define TRACE_EVENT_PERF_PERM(event, expr...)



#endif /* ifdef TRACE_EVENT (see note above) */

include/trace/ftrace.h

+7 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ 
#define TRACE_EVENT_FLAGS(name, value)					\

	__TRACE_EVENT_FLAGS(name, value)



#undef TRACE_EVENT_PERF_PERM

#define TRACE_EVENT_PERF_PERM(name, expr...)				\

	__TRACE_EVENT_PERF_PERM(name, expr)



#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
@@ -140,6 +144,9 @@ 
#undef TRACE_EVENT_FLAGS

#define TRACE_EVENT_FLAGS(event, flag)



#undef TRACE_EVENT_PERF_PERM

#define TRACE_EVENT_PERF_PERM(event, expr...)



#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)



/*

kernel/events/core.c

+0 −8
Original line number Diff line number Diff line
@@ -5680,11 +5680,6 @@ static void swevent_hlist_put(struct perf_event *event) 
{

	int cpu;



	if (event->cpu != -1) {

		swevent_hlist_put_cpu(event, event->cpu);

		return;

	}



	for_each_possible_cpu(cpu)

		swevent_hlist_put_cpu(event, cpu);

}
@@ -5718,9 +5713,6 @@ static int swevent_hlist_get(struct perf_event *event) 
	int err;

	int cpu, failed_cpu;



	if (event->cpu != -1)

		return swevent_hlist_get_cpu(event, event->cpu);



	get_online_cpus();

	for_each_possible_cpu(cpu) {

		err = swevent_hlist_get_cpu(event, cpu);