Commit 1354ac6a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

Merge tag 'perf-core-for-mingo' 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:

User visible changes:

  - IPC and cycle accounting in 'perf annotate'. (Andi Kleen)

  - Display cycles in branch sort mode in 'perf report'. (Andi Kleen)

  - Add total time column to 'perf trace' syscall stats summary. (Milian Woff)

Infrastructure changes:

  - PMU helpers to use in Intel PT. (Adrian Hunter)

  - Fix perf-with-kcore script not to split args with spaces. (Adrian Hunter)

  - Add empty Build files for some more architectures. (Ben Hutchings)

  - Move 'perf stat' config variables to a struct to allow using some
    of its functions in more places. (Jiri Olsa)

  - Add DWARF register names for 'xtensa' arch. (Max Filippov)

  - Implement BPF programs attached to uprobes. (Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b6b6c18f 141b2d31

include/linux/trace_events.h

+6 −1
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ enum { 
	TRACE_EVENT_FL_USE_CALL_FILTER_BIT,

	TRACE_EVENT_FL_TRACEPOINT_BIT,

	TRACE_EVENT_FL_KPROBE_BIT,

	TRACE_EVENT_FL_UPROBE_BIT,

};



/*
@@ -257,6 +258,7 @@ enum { 
 *  USE_CALL_FILTER - For trace internal events, don't use file filter

 *  TRACEPOINT    - Event is a tracepoint

 *  KPROBE        - Event is a kprobe

 *  UPROBE        - Event is a uprobe

 */

enum {

	TRACE_EVENT_FL_FILTERED		= (1 << TRACE_EVENT_FL_FILTERED_BIT),
@@ -267,8 +269,11 @@ enum { 
	TRACE_EVENT_FL_USE_CALL_FILTER	= (1 << TRACE_EVENT_FL_USE_CALL_FILTER_BIT),

	TRACE_EVENT_FL_TRACEPOINT	= (1 << TRACE_EVENT_FL_TRACEPOINT_BIT),

	TRACE_EVENT_FL_KPROBE		= (1 << TRACE_EVENT_FL_KPROBE_BIT),

	TRACE_EVENT_FL_UPROBE		= (1 << TRACE_EVENT_FL_UPROBE_BIT),

};



#define TRACE_EVENT_FL_UKPROBE (TRACE_EVENT_FL_KPROBE | TRACE_EVENT_FL_UPROBE)



struct trace_event_call {

	struct list_head	list;

	struct trace_event_class *class;
@@ -542,7 +547,7 @@ event_trigger_unlock_commit_regs(struct trace_event_file *file, 
		event_triggers_post_call(file, tt);

}



#ifdef CONFIG_BPF_SYSCALL

#ifdef CONFIG_BPF_EVENTS

unsigned int trace_call_bpf(struct bpf_prog *prog, void *ctx);

#else

static inline unsigned int trace_call_bpf(struct bpf_prog *prog, void *ctx)

kernel/events/core.c

+2 −2
Original line number Diff line number Diff line
@@ -6846,8 +6846,8 @@ static int perf_event_set_bpf_prog(struct perf_event *event, u32 prog_fd) 
	if (event->tp_event->prog)

		return -EEXIST;



	if (!(event->tp_event->flags & TRACE_EVENT_FL_KPROBE))

		/* bpf programs can only be attached to kprobes */

	if (!(event->tp_event->flags & TRACE_EVENT_FL_UKPROBE))

		/* bpf programs can only be attached to u/kprobes */

		return -EINVAL;



	prog = bpf_prog_get(prog_fd);

kernel/trace/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ config UPROBE_EVENT 


config BPF_EVENTS

	depends on BPF_SYSCALL

	depends on KPROBE_EVENT

	depends on KPROBE_EVENT || UPROBE_EVENT

	bool

	default y

	help

kernel/trace/trace_uprobe.c

+5 −0
Original line number Diff line number Diff line
@@ -1095,11 +1095,15 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, 
{

	struct trace_event_call *call = &tu->tp.call;

	struct uprobe_trace_entry_head *entry;

	struct bpf_prog *prog = call->prog;

	struct hlist_head *head;

	void *data;

	int size, esize;

	int rctx;



	if (prog && !trace_call_bpf(prog, regs))

		return;



	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));



	size = esize + tu->tp.size + dsize;
@@ -1289,6 +1293,7 @@ static int register_uprobe_event(struct trace_uprobe *tu) 
		return -ENODEV;

	}



	call->flags = TRACE_EVENT_FL_UPROBE;

	call->class->reg = trace_uprobe_register;

	call->data = tu;

	ret = trace_add_event_call(call);

tools/perf/Documentation/perf-report.txt

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ OPTIONS 
	- mispredict: "N" for predicted branch, "Y" for mispredicted branch

	- in_tx: branch in TSX transaction

	- abort: TSX transaction abort.

	- cycles: Cycles in basic block



	And default sort keys are changed to comm, dso_from, symbol_from, dso_to

	and symbol_to, see '--branch-stack'.

CRA Git | Maintained and supported by SUSTech CRA and CCSE