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

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

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

 into perf/core

Pull the latest perf/core updates from Arnaldo Carvalho de Melo:

New features:

 - Introduce 'perf ftrace' a perf front end to the kernel's ftrace
   function and function_graph tracer, defaulting to the "function_graph"
   tracer, more work will be done in reviving this effort, forward porting
   it from its initial patch submission (Namhyung Kim)

 - Add 'e' and 'c' hotkeys to expand/collapse call chains for a single
   hist entry in the 'perf report' and 'perf top' TUI (Jiri Olsa)

Fixes:

 - Fix wrong register name for arm64, used in 'perf probe' (He Kuang)

 - Fix map offsets in relocation in libbpf (Joe Stringer)

 - Fix looking up dwarf unwind stack info (Matija Glavinic Pecotic)

Infrastructure changes:

 - libbpf prog functions sync with what is exported via uapi (Joe Stringer)

Trivial changes:

 - Remove unnecessary checks and assignments in 'perf probe's
   try_to_find_absolute_address() (Markus Elfring)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 47cd95a6 ec347870

tools/lib/bpf/libbpf.c

+41 −28
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <fcntl.h>

#include <errno.h>

#include <asm/unistd.h>

#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/bpf.h>

#include <linux/list.h>
@@ -779,7 +780,7 @@ static int 
bpf_program__collect_reloc(struct bpf_program *prog,

			   size_t nr_maps, GElf_Shdr *shdr,

			   Elf_Data *data, Elf_Data *symbols,

			   int maps_shndx)

			   int maps_shndx, struct bpf_map *maps)

{

	int i, nrels;
@@ -829,7 +830,15 @@ bpf_program__collect_reloc(struct bpf_program *prog, 
			return -LIBBPF_ERRNO__RELOC;

		}



		map_idx = sym.st_value / sizeof(struct bpf_map_def);

		/* TODO: 'maps' is sorted. We can use bsearch to make it faster. */

		for (map_idx = 0; map_idx < nr_maps; map_idx++) {

			if (maps[map_idx].offset == sym.st_value) {

				pr_debug("relocation: find map %zd (%s) for insn %u\n",

					 map_idx, maps[map_idx].name, insn_idx);

				break;

			}

		}



		if (map_idx >= nr_maps) {

			pr_warning("bpf relocation: map_idx %d large than %d\n",

				   (int)map_idx, (int)nr_maps - 1);
@@ -953,7 +962,8 @@ static int bpf_object__collect_reloc(struct bpf_object *obj) 
		err = bpf_program__collect_reloc(prog, nr_maps,

						 shdr, data,

						 obj->efile.symbols,

						 obj->efile.maps_shndx);

						 obj->efile.maps_shndx,

						 obj->maps);

		if (err)

			return err;

	}
@@ -1419,37 +1429,33 @@ static void bpf_program__set_type(struct bpf_program *prog, 
	prog->type = type;

}



int bpf_program__set_tracepoint(struct bpf_program *prog)

{

	if (!prog)

		return -EINVAL;

	bpf_program__set_type(prog, BPF_PROG_TYPE_TRACEPOINT);

	return 0;

}



int bpf_program__set_kprobe(struct bpf_program *prog)

{

	if (!prog)

		return -EINVAL;

	bpf_program__set_type(prog, BPF_PROG_TYPE_KPROBE);

	return 0;

}



static bool bpf_program__is_type(struct bpf_program *prog,

				 enum bpf_prog_type type)

{

	return prog ? (prog->type == type) : false;

}



bool bpf_program__is_tracepoint(struct bpf_program *prog)

{

	return bpf_program__is_type(prog, BPF_PROG_TYPE_TRACEPOINT);

}



bool bpf_program__is_kprobe(struct bpf_program *prog)

{

	return bpf_program__is_type(prog, BPF_PROG_TYPE_KPROBE);

}

#define BPF_PROG_TYPE_FNS(NAME, TYPE)			\

int bpf_program__set_##NAME(struct bpf_program *prog)	\

{							\

	if (!prog)					\

		return -EINVAL;				\

	bpf_program__set_type(prog, TYPE);		\

	return 0;					\

}							\

							\

bool bpf_program__is_##NAME(struct bpf_program *prog)	\

{							\

	return bpf_program__is_type(prog, TYPE);	\

}							\



BPF_PROG_TYPE_FNS(socket_filter, BPF_PROG_TYPE_SOCKET_FILTER);

BPF_PROG_TYPE_FNS(kprobe, BPF_PROG_TYPE_KPROBE);

BPF_PROG_TYPE_FNS(sched_cls, BPF_PROG_TYPE_SCHED_CLS);

BPF_PROG_TYPE_FNS(sched_act, BPF_PROG_TYPE_SCHED_ACT);

BPF_PROG_TYPE_FNS(tracepoint, BPF_PROG_TYPE_TRACEPOINT);

BPF_PROG_TYPE_FNS(xdp, BPF_PROG_TYPE_XDP);

BPF_PROG_TYPE_FNS(perf_event, BPF_PROG_TYPE_PERF_EVENT);



int bpf_map__fd(struct bpf_map *map)

{
@@ -1537,3 +1543,10 @@ bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset) 
	}

	return ERR_PTR(-ENOENT);

}



long libbpf_get_error(const void *ptr)

{

	if (IS_ERR(ptr))

		return PTR_ERR(ptr);

	return 0;

}

tools/lib/bpf/libbpf.h

+13 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#define __BPF_LIBBPF_H



#include <stdio.h>

#include <stdint.h>

#include <stdbool.h>

#include <linux/err.h>

#include <sys/types.h>  // for size_t



enum libbpf_errno {
@@ -174,11 +174,21 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n); 
/*

 * Adjust type of bpf program. Default is kprobe.

 */

int bpf_program__set_socket_filter(struct bpf_program *prog);

int bpf_program__set_tracepoint(struct bpf_program *prog);

int bpf_program__set_kprobe(struct bpf_program *prog);

int bpf_program__set_sched_cls(struct bpf_program *prog);

int bpf_program__set_sched_act(struct bpf_program *prog);

int bpf_program__set_xdp(struct bpf_program *prog);

int bpf_program__set_perf_event(struct bpf_program *prog);



bool bpf_program__is_socket_filter(struct bpf_program *prog);

bool bpf_program__is_tracepoint(struct bpf_program *prog);

bool bpf_program__is_kprobe(struct bpf_program *prog);

bool bpf_program__is_sched_cls(struct bpf_program *prog);

bool bpf_program__is_sched_act(struct bpf_program *prog);

bool bpf_program__is_xdp(struct bpf_program *prog);

bool bpf_program__is_perf_event(struct bpf_program *prog);



/*

 * We don't need __attribute__((packed)) now since it is
@@ -224,4 +234,6 @@ int bpf_map__set_priv(struct bpf_map *map, void *priv, 
		      bpf_map_clear_priv_t clear_priv);

void *bpf_map__priv(struct bpf_map *map);



long libbpf_get_error(const void *ptr);



#endif

tools/perf/Build

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ perf-y += builtin-annotate.o 
perf-y += builtin-config.o

perf-y += builtin-diff.o

perf-y += builtin-evlist.o

perf-y += builtin-ftrace.o

perf-y += builtin-help.o

perf-y += builtin-sched.o

perf-y += builtin-buildid-list.o

tools/perf/Documentation/perf-c2c.txt

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ output fields set for caheline offsets output: 
             Code address, Code symbol, Shared Object, Source line

  dso   - coalesced by shared object



By default the coalescing is setup with 'pid,tid,iaddr'.

By default the coalescing is setup with 'pid,iaddr'.



STDIO OUTPUT

------------

tools/perf/Documentation/perf-ftrace.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
perf-ftrace(1)

=============



NAME

----

perf-ftrace - simple wrapper for kernel's ftrace functionality





SYNOPSIS

--------

[verse]

'perf ftrace' <command>



DESCRIPTION

-----------

The 'perf ftrace' command is a simple wrapper of kernel's ftrace

functionality.  It only supports single thread tracing currently and

just reads trace_pipe in text and then write it to stdout.



The following options apply to perf ftrace.



OPTIONS

-------



-t::

--tracer=::

	Tracer to use: function_graph or function.



-v::

--verbose=::

        Verbosity level.





SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-trace[1]

CRA Git | Maintained and supported by SUSTech CRA and CCSE