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

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

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

New features:

 - Support AArch64 in the 'annotate' code, native/local and
   cross-arch/remote (Kim Phillips)

 - Allow considering just events in a given time interval, via the
   '--time start.s.ms,end.s.ms' command line, added to 'perf kmem',
   'perf report', 'perf sched timehist' and 'perf script' (David Ahern)

 - Add option to stop printing a callchain at one of a given group of
   symbol names (David Ahern)

 - Handle CPU migration events in 'perf sched timehist' (David Ahern)

 - Track memory freed in 'perf kmem stat' (David Ahern)

Infrastructure:

 - Add initial support (and perf test entry) for tooling hooks, starting with
   'record_start' and 'record_end', that will have as its initial user the
   eBPF infrastructure, where perf_ prefixed functions will be JITed and
   run when such hooks are called (Wang Nan)

 - Remove redundant "test" and similar strings from 'perf test' descriptions
   (Arnaldo Carvalho de Melo)

 - Implement assorted libbpf improvements (Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3782746a 0fcb1da4

tools/lib/bpf/bpf.c

+56 −0
Original line number Diff line number Diff line
@@ -110,3 +110,59 @@ int bpf_map_update_elem(int fd, void *key, void *value, 


	return sys_bpf(BPF_MAP_UPDATE_ELEM, &attr, sizeof(attr));

}



int bpf_map_lookup_elem(int fd, void *key, void *value)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);

	attr.value = ptr_to_u64(value);



	return sys_bpf(BPF_MAP_LOOKUP_ELEM, &attr, sizeof(attr));

}



int bpf_map_delete_elem(int fd, void *key)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);



	return sys_bpf(BPF_MAP_DELETE_ELEM, &attr, sizeof(attr));

}



int bpf_map_get_next_key(int fd, void *key, void *next_key)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.map_fd = fd;

	attr.key = ptr_to_u64(key);

	attr.next_key = ptr_to_u64(next_key);



	return sys_bpf(BPF_MAP_GET_NEXT_KEY, &attr, sizeof(attr));

}



int bpf_obj_pin(int fd, const char *pathname)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.pathname = ptr_to_u64((void *)pathname);

	attr.bpf_fd = fd;



	return sys_bpf(BPF_OBJ_PIN, &attr, sizeof(attr));

}



int bpf_obj_get(const char *pathname)

{

	union bpf_attr attr;



	bzero(&attr, sizeof(attr));

	attr.pathname = ptr_to_u64((void *)pathname);



	return sys_bpf(BPF_OBJ_GET, &attr, sizeof(attr));

}

tools/lib/bpf/bpf.h

+7 −0
Original line number Diff line number Diff line
@@ -35,4 +35,11 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, 


int bpf_map_update_elem(int fd, void *key, void *value,

			u64 flags);



int bpf_map_lookup_elem(int fd, void *key, void *value);

int bpf_map_delete_elem(int fd, void *key);

int bpf_map_get_next_key(int fd, void *key, void *next_key);

int bpf_obj_pin(int fd, const char *pathname);

int bpf_obj_get(const char *pathname);



#endif

tools/lib/bpf/libbpf.c

+35 −0
Original line number Diff line number Diff line
@@ -229,6 +229,10 @@ struct bpf_object { 
	 * all objects.

	 */

	struct list_head list;



	void *priv;

	bpf_object_clear_priv_t clear_priv;



	char path[];

};

#define obj_elf_valid(o)	((o)->efile.elf)
@@ -1229,6 +1233,9 @@ void bpf_object__close(struct bpf_object *obj) 
	if (!obj)

		return;



	if (obj->clear_priv)

		obj->clear_priv(obj, obj->priv);



	bpf_object__elf_finish(obj);

	bpf_object__unload(obj);
@@ -1282,6 +1289,22 @@ unsigned int bpf_object__kversion(struct bpf_object *obj) 
	return obj ? obj->kern_version : 0;

}



int bpf_object__set_priv(struct bpf_object *obj, void *priv,

			 bpf_object_clear_priv_t clear_priv)

{

	if (obj->priv && obj->clear_priv)

		obj->clear_priv(obj, obj->priv);



	obj->priv = priv;

	obj->clear_priv = clear_priv;

	return 0;

}



void *bpf_object__priv(struct bpf_object *obj)

{

	return obj ? obj->priv : ERR_PTR(-EINVAL);

}



struct bpf_program *

bpf_program__next(struct bpf_program *prev, struct bpf_object *obj)

{
@@ -1501,3 +1524,15 @@ bpf_object__find_map_by_name(struct bpf_object *obj, const char *name) 
	}

	return NULL;

}



struct bpf_map *

bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset)

{

	int i;



	for (i = 0; i < obj->nr_maps; i++) {

		if (obj->maps[i].offset == offset)

			return &obj->maps[i];

	}

	return ERR_PTR(-ENOENT);

}

tools/lib/bpf/libbpf.h

+13 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <stdio.h>

#include <stdbool.h>

#include <linux/err.h>

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



enum libbpf_errno {

	__LIBBPF_ERRNO__START = 4000,
@@ -79,6 +80,11 @@ struct bpf_object *bpf_object__next(struct bpf_object *prev); 
	     (pos) != NULL;				\

	     (pos) = (tmp), (tmp) = bpf_object__next(tmp))



typedef void (*bpf_object_clear_priv_t)(struct bpf_object *, void *);

int bpf_object__set_priv(struct bpf_object *obj, void *priv,

			 bpf_object_clear_priv_t clear_priv);

void *bpf_object__priv(struct bpf_object *prog);



/* Accessors of bpf_program. */

struct bpf_program;

struct bpf_program *bpf_program__next(struct bpf_program *prog,
@@ -195,6 +201,13 @@ struct bpf_map; 
struct bpf_map *

bpf_object__find_map_by_name(struct bpf_object *obj, const char *name);



/*

 * Get bpf_map through the offset of corresponding struct bpf_map_def

 * in the bpf object file.

 */

struct bpf_map *

bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset);



struct bpf_map *

bpf_map__next(struct bpf_map *map, struct bpf_object *obj);

#define bpf_map__for_each(pos, obj)		\

tools/perf/Documentation/perf-kmem.txt

+7 −0
Original line number Diff line number Diff line
@@ -61,6 +61,13 @@ OPTIONS 
	default, but this option shows live (currently allocated) pages

	instead.  (This option works with --page option only)



--time::

	Only analyze samples within given time window: <start>,<stop>. Times

	have the format seconds.microseconds. If start is not given (i.e., time

	string is ',x.y') then analysis starts at the beginning of the file. If

	stop time is not given (i.e, time string is 'x.y,') then analysis goes

	to end of file.



SEE ALSO

--------

linkperf:perf-record[1]

CRA Git | Maintained and supported by SUSTech CRA and CCSE