Commit f575494d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-5.0-20190121' of... 

Merge tag 'perf-core-for-mingo-5.0-20190121' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

BPF:

  Song Liu:

  - Introduce PERF_RECORD_KSYMBOL to allow tooling to notice the addition
    of new kernel symbols and be able to resolve samples in such symbols.

  - Introduce PERF_RECORD_BPF_EVENT to notify tooling about the loading
    and unloading of BPF programs, making them visible and allowing for
    the request of further information to allow for things like annotation.

  - Change the userspace perf tools to handle those new events and to
    synthesize them for pre-existing loaded BPF programs.

Kernel:

  Arnaldo Carvalho de Melo:

  - Make perf_event_output() propagate the output() return, allowing
    users to check for -ENOSPC in the ring buffer.

perf report:

  Thomas Richter:

  - Display arch specific diagnostic counter sets, starting with s390
    diagnostic counter sets.

perf session:

  Jiri Olsa:

  - Introduce a reader object to prep for multithreaded processing
    of recorded events.

Misc:

  Rasmus Villemoes:

  - Replace automatic const char[] variables by statics, to avoid
    initializing them at runtime, instead having them in .rodata,
    reducing code size.

  YueHaibing:

  - Remove duplicated workqueue.h include from perf_event.h

  Brajeswar Ghosh:

  - Remove some more duplicated headers.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ad07c8ce 32e9136e

include/linux/filter.h

+7 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ bpf_address_lookup(unsigned long addr, unsigned long *size, 


void bpf_prog_kallsyms_add(struct bpf_prog *fp);

void bpf_prog_kallsyms_del(struct bpf_prog *fp);

void bpf_get_prog_name(const struct bpf_prog *prog, char *sym);



#else /* CONFIG_BPF_JIT */
@@ -1006,6 +1007,12 @@ static inline void bpf_prog_kallsyms_add(struct bpf_prog *fp) 
static inline void bpf_prog_kallsyms_del(struct bpf_prog *fp)

{

}



static inline void bpf_get_prog_name(const struct bpf_prog *prog, char *sym)

{

	sym[0] = '\0';

}



#endif /* CONFIG_BPF_JIT */



void bpf_prog_kallsyms_del_subprogs(struct bpf_prog *fp);

include/linux/perf_event.h

+17 −4
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct perf_guest_info_callbacks { 
#include <linux/atomic.h>

#include <linux/sysfs.h>

#include <linux/perf_regs.h>

#include <linux/workqueue.h>

#include <linux/cgroup.h>

#include <asm/local.h>
@@ -979,7 +978,7 @@ extern void perf_event_output_forward(struct perf_event *event, 
extern void perf_event_output_backward(struct perf_event *event,

				       struct perf_sample_data *data,

				       struct pt_regs *regs);

extern void perf_event_output(struct perf_event *event,

extern int perf_event_output(struct perf_event *event,

			     struct perf_sample_data *data,

			     struct pt_regs *regs);
@@ -1123,6 +1122,13 @@ static inline void perf_event_task_sched_out(struct task_struct *prev, 
}



extern void perf_event_mmap(struct vm_area_struct *vma);



extern void perf_event_ksymbol(u16 ksym_type, u64 addr, u32 len,

			       bool unregister, const char *sym);

extern void perf_event_bpf_event(struct bpf_prog *prog,

				 enum perf_bpf_event_type type,

				 u16 flags);



extern struct perf_guest_info_callbacks *perf_guest_cbs;

extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);

extern int perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks);
@@ -1343,6 +1349,13 @@ static inline int perf_unregister_guest_info_callbacks 
(struct perf_guest_info_callbacks *callbacks)				{ return 0; }



static inline void perf_event_mmap(struct vm_area_struct *vma)		{ }



typedef int (perf_ksymbol_get_name_f)(char *name, int name_len, void *data);

static inline void perf_event_ksymbol(u16 ksym_type, u64 addr, u32 len,

				      bool unregister, const char *sym)	{ }

static inline void perf_event_bpf_event(struct bpf_prog *prog,

					enum perf_bpf_event_type type,

					u16 flags)			{ }

static inline void perf_event_exec(void)				{ }

static inline void perf_event_comm(struct task_struct *tsk, bool exec)	{ }

static inline void perf_event_namespaces(struct task_struct *tsk)	{ }

include/uapi/linux/perf_event.h

+52 −1
Original line number Diff line number Diff line
@@ -372,7 +372,9 @@ struct perf_event_attr { 
				context_switch :  1, /* context switch data */

				write_backward :  1, /* Write ring buffer from end to beginning */

				namespaces     :  1, /* include namespaces data */

				__reserved_1   : 35;

				ksymbol        :  1, /* include ksymbol events */

				bpf_event      :  1, /* include bpf events */

				__reserved_1   : 33;



	union {

		__u32		wakeup_events;	  /* wakeup every n events */
@@ -963,9 +965,58 @@ enum perf_event_type { 
	 */

	PERF_RECORD_NAMESPACES			= 16,



	/*

	 * Record ksymbol register/unregister events:

	 *

	 * struct {

	 *	struct perf_event_header	header;

	 *	u64				addr;

	 *	u32				len;

	 *	u16				ksym_type;

	 *	u16				flags;

	 *	char				name[];

	 *	struct sample_id		sample_id;

	 * };

	 */

	PERF_RECORD_KSYMBOL			= 17,



	/*

	 * Record bpf events:

	 *  enum perf_bpf_event_type {

	 *	PERF_BPF_EVENT_UNKNOWN		= 0,

	 *	PERF_BPF_EVENT_PROG_LOAD	= 1,

	 *	PERF_BPF_EVENT_PROG_UNLOAD	= 2,

	 *  };

	 *

	 * struct {

	 *	struct perf_event_header	header;

	 *	u16				type;

	 *	u16				flags;

	 *	u32				id;

	 *	u8				tag[BPF_TAG_SIZE];

	 *	struct sample_id		sample_id;

	 * };

	 */

	PERF_RECORD_BPF_EVENT			= 18,



	PERF_RECORD_MAX,			/* non-ABI */

};



enum perf_record_ksymbol_type {

	PERF_RECORD_KSYMBOL_TYPE_UNKNOWN	= 0,

	PERF_RECORD_KSYMBOL_TYPE_BPF		= 1,

	PERF_RECORD_KSYMBOL_TYPE_MAX		/* non-ABI */

};



#define PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER	(1 << 0)



enum perf_bpf_event_type {

	PERF_BPF_EVENT_UNKNOWN		= 0,

	PERF_BPF_EVENT_PROG_LOAD	= 1,

	PERF_BPF_EVENT_PROG_UNLOAD	= 2,

	PERF_BPF_EVENT_MAX,		/* non-ABI */

};



#define PERF_MAX_STACK_DEPTH		127

#define PERF_MAX_CONTEXTS_PER_STACK	  8

kernel/bpf/core.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ bpf_get_prog_addr_region(const struct bpf_prog *prog, 
	*symbol_end   = addr + hdr->pages * PAGE_SIZE;

}



static void bpf_get_prog_name(const struct bpf_prog *prog, char *sym)

void bpf_get_prog_name(const struct bpf_prog *prog, char *sym)

{

	const char *end = sym + KSYM_NAME_LEN;

	const struct btf_type *type;

kernel/bpf/syscall.c

+2 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,7 @@ static void __bpf_prog_put_rcu(struct rcu_head *rcu) 
static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock)

{

	if (atomic_dec_and_test(&prog->aux->refcnt)) {

		perf_event_bpf_event(prog, PERF_BPF_EVENT_PROG_UNLOAD, 0);

		/* bpf_prog_free_id() must be called first */

		bpf_prog_free_id(prog, do_idr_lock);

		bpf_prog_kallsyms_del_all(prog);
@@ -1554,6 +1555,7 @@ static int bpf_prog_load(union bpf_attr *attr, union bpf_attr __user *uattr) 
	}



	bpf_prog_kallsyms_add(prog);

	perf_event_bpf_event(prog, PERF_BPF_EVENT_PROG_LOAD, 0);

	return err;



free_used_maps:

CRA Git | Maintained and supported by SUSTech CRA and CCSE