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

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

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

 into perf/urgent

Pull perf/core improvements and fixes:

New features:

 - Introduce 'perf sched timehist --idle', to analyse processes
   going to/from idle state (Namhyung Kim)

Fixes:

 - Allow 'perf record -u user' to continue when facing races with threads
   going away after having scanned them via /proc (Jiri Olsa)

 - Fix 'perf mem' --all-user/--all-kernel options (Jiri Olsa)

 - Support jumps with multiple arguments (Ravi Bangoria)

 - Fix jumps to before the function where they are located (Ravi Bangoria)

 - Fix lock-pi help string (Davidlohr Bueso)

 - Fix build of 'perf trace' in odd systems such as a RHEL PPC one (Jiri Olsa)

 - Do not overwrite valid build id in 'perf diff' (Kan Liang)

 - Don't throw error for zero length symbols, allowing the use of the TUI
   in PowerPC, where such symbols became more common recently (Ravi Bangoria)

Infrastructure changes:

 - Switch of samples/bpf/ to use tools/lib/bpf, removing libbpf
   duplication (Joe Stringer)

 - Move headers check into bash script (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 297e765e 9899694a

samples/bpf/Makefile

+38 −32
Original line number Diff line number Diff line
@@ -35,40 +35,43 @@ hostprogs-y += tc_l2_redirect 
hostprogs-y += lwt_len_hist

hostprogs-y += xdp_tx_iptunnel



test_lru_dist-objs := test_lru_dist.o libbpf.o

sock_example-objs := sock_example.o libbpf.o

fds_example-objs := bpf_load.o libbpf.o fds_example.o

sockex1-objs := bpf_load.o libbpf.o sockex1_user.o

sockex2-objs := bpf_load.o libbpf.o sockex2_user.o

sockex3-objs := bpf_load.o libbpf.o sockex3_user.o

tracex1-objs := bpf_load.o libbpf.o tracex1_user.o

tracex2-objs := bpf_load.o libbpf.o tracex2_user.o

tracex3-objs := bpf_load.o libbpf.o tracex3_user.o

tracex4-objs := bpf_load.o libbpf.o tracex4_user.o

tracex5-objs := bpf_load.o libbpf.o tracex5_user.o

tracex6-objs := bpf_load.o libbpf.o tracex6_user.o

test_probe_write_user-objs := bpf_load.o libbpf.o test_probe_write_user_user.o

trace_output-objs := bpf_load.o libbpf.o trace_output_user.o

lathist-objs := bpf_load.o libbpf.o lathist_user.o

offwaketime-objs := bpf_load.o libbpf.o offwaketime_user.o

spintest-objs := bpf_load.o libbpf.o spintest_user.o

map_perf_test-objs := bpf_load.o libbpf.o map_perf_test_user.o

test_overhead-objs := bpf_load.o libbpf.o test_overhead_user.o

test_cgrp2_array_pin-objs := libbpf.o test_cgrp2_array_pin.o

test_cgrp2_attach-objs := libbpf.o test_cgrp2_attach.o

test_cgrp2_attach2-objs := libbpf.o test_cgrp2_attach2.o cgroup_helpers.o

test_cgrp2_sock-objs := libbpf.o test_cgrp2_sock.o

test_cgrp2_sock2-objs := bpf_load.o libbpf.o test_cgrp2_sock2.o

xdp1-objs := bpf_load.o libbpf.o xdp1_user.o

# Libbpf dependencies

LIBBPF := ../../tools/lib/bpf/bpf.o



test_lru_dist-objs := test_lru_dist.o $(LIBBPF)

sock_example-objs := sock_example.o $(LIBBPF)

fds_example-objs := bpf_load.o $(LIBBPF) fds_example.o

sockex1-objs := bpf_load.o $(LIBBPF) sockex1_user.o

sockex2-objs := bpf_load.o $(LIBBPF) sockex2_user.o

sockex3-objs := bpf_load.o $(LIBBPF) sockex3_user.o

tracex1-objs := bpf_load.o $(LIBBPF) tracex1_user.o

tracex2-objs := bpf_load.o $(LIBBPF) tracex2_user.o

tracex3-objs := bpf_load.o $(LIBBPF) tracex3_user.o

tracex4-objs := bpf_load.o $(LIBBPF) tracex4_user.o

tracex5-objs := bpf_load.o $(LIBBPF) tracex5_user.o

tracex6-objs := bpf_load.o $(LIBBPF) tracex6_user.o

test_probe_write_user-objs := bpf_load.o $(LIBBPF) test_probe_write_user_user.o

trace_output-objs := bpf_load.o $(LIBBPF) trace_output_user.o

lathist-objs := bpf_load.o $(LIBBPF) lathist_user.o

offwaketime-objs := bpf_load.o $(LIBBPF) offwaketime_user.o

spintest-objs := bpf_load.o $(LIBBPF) spintest_user.o

map_perf_test-objs := bpf_load.o $(LIBBPF) map_perf_test_user.o

test_overhead-objs := bpf_load.o $(LIBBPF) test_overhead_user.o

test_cgrp2_array_pin-objs := $(LIBBPF) test_cgrp2_array_pin.o

test_cgrp2_attach-objs := $(LIBBPF) test_cgrp2_attach.o

test_cgrp2_attach2-objs := $(LIBBPF) test_cgrp2_attach2.o cgroup_helpers.o

test_cgrp2_sock-objs := $(LIBBPF) test_cgrp2_sock.o

test_cgrp2_sock2-objs := bpf_load.o $(LIBBPF) test_cgrp2_sock2.o

xdp1-objs := bpf_load.o $(LIBBPF) xdp1_user.o

# reuse xdp1 source intentionally

xdp2-objs := bpf_load.o libbpf.o xdp1_user.o

test_current_task_under_cgroup-objs := bpf_load.o libbpf.o cgroup_helpers.o \

xdp2-objs := bpf_load.o $(LIBBPF) xdp1_user.o

test_current_task_under_cgroup-objs := bpf_load.o $(LIBBPF) cgroup_helpers.o \

				       test_current_task_under_cgroup_user.o

trace_event-objs := bpf_load.o libbpf.o trace_event_user.o

sampleip-objs := bpf_load.o libbpf.o sampleip_user.o

tc_l2_redirect-objs := bpf_load.o libbpf.o tc_l2_redirect_user.o

lwt_len_hist-objs := bpf_load.o libbpf.o lwt_len_hist_user.o

xdp_tx_iptunnel-objs := bpf_load.o libbpf.o xdp_tx_iptunnel_user.o

trace_event-objs := bpf_load.o $(LIBBPF) trace_event_user.o

sampleip-objs := bpf_load.o $(LIBBPF) sampleip_user.o

tc_l2_redirect-objs := bpf_load.o $(LIBBPF) tc_l2_redirect_user.o

lwt_len_hist-objs := bpf_load.o $(LIBBPF) lwt_len_hist_user.o

xdp_tx_iptunnel-objs := bpf_load.o $(LIBBPF) xdp_tx_iptunnel_user.o



# Tell kbuild to always build the programs

always := $(hostprogs-y)
@@ -104,7 +107,10 @@ always += lwt_len_hist_kern.o 
always += xdp_tx_iptunnel_kern.o



HOSTCFLAGS += -I$(objtree)/usr/include

HOSTCFLAGS += -I$(srctree)/tools/lib/

HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/

HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include

HOSTCFLAGS += -I$(srctree)/tools/perf



HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable

HOSTLOADLIBES_fds_example += -lelf

samples/bpf/README.rst

+2 −2
Original line number Diff line number Diff line 
eBPF sample programs

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



This directory contains a mini eBPF library, test stubs, verifier

test-suite and examples for using eBPF.

This directory contains a test stubs, verifier test-suite and examples

for using eBPF. The examples use libbpf from tools/lib/bpf.



Build dependencies

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

samples/bpf/bpf_load.c

+16 −5
Original line number Diff line number Diff line
@@ -22,25 +22,34 @@ 
#include <poll.h>

#include <ctype.h>

#include "libbpf.h"

#include "bpf_helpers.h"

#include "bpf_load.h"

#include "perf-sys.h"



#define DEBUGFS "/sys/kernel/debug/tracing/"



static char license[128];

static int kern_version;

static bool processed_sec[128];

char bpf_log_buf[BPF_LOG_BUF_SIZE];

int map_fd[MAX_MAPS];

int prog_fd[MAX_PROGS];

int event_fd[MAX_PROGS];

int prog_cnt;

int prog_array_fd = -1;



struct bpf_map_def {

	unsigned int type;

	unsigned int key_size;

	unsigned int value_size;

	unsigned int max_entries;

	unsigned int map_flags;

};



static int populate_prog_array(const char *event, int prog_fd)

{

	int ind = atoi(event), err;



	err = bpf_update_elem(prog_array_fd, &ind, &prog_fd, BPF_ANY);

	err = bpf_map_update_elem(prog_array_fd, &ind, &prog_fd, BPF_ANY);

	if (err < 0) {

		printf("failed to store prog_fd in prog_array\n");

		return -1;
@@ -58,6 +67,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) 
	bool is_perf_event = strncmp(event, "perf_event", 10) == 0;

	bool is_cgroup_skb = strncmp(event, "cgroup/skb", 10) == 0;

	bool is_cgroup_sk = strncmp(event, "cgroup/sock", 11) == 0;

	size_t insns_cnt = size / sizeof(struct bpf_insn);

	enum bpf_prog_type prog_type;

	char buf[256];

	int fd, efd, err, id;
@@ -87,9 +97,10 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) 
		return -1;

	}



	fd = bpf_prog_load(prog_type, prog, size, license, kern_version);

	fd = bpf_load_program(prog_type, prog, insns_cnt, license, kern_version,

			      bpf_log_buf, BPF_LOG_BUF_SIZE);

	if (fd < 0) {

		printf("bpf_prog_load() err=%d\n%s", errno, bpf_log_buf);

		printf("bpf_load_program() err=%d\n%s", errno, bpf_log_buf);

		return -1;

	}
@@ -169,7 +180,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) 
	id = atoi(buf);

	attr.config = id;



	efd = perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0);

	efd = sys_perf_event_open(&attr, -1/*pid*/, 0/*cpu*/, -1/*group_fd*/, 0);

	if (efd < 0) {

		printf("event %d fd %d err %s\n", id, efd, strerror(errno));

		return -1;

samples/bpf/bpf_load.h

+3 −0
Original line number Diff line number Diff line 
#ifndef __BPF_LOAD_H

#define __BPF_LOAD_H



#include "libbpf.h"



#define MAX_MAPS 32

#define MAX_PROGS 32



extern int map_fd[MAX_MAPS];

extern int prog_fd[MAX_PROGS];

extern int event_fd[MAX_PROGS];

extern char bpf_log_buf[BPF_LOG_BUF_SIZE];

extern int prog_cnt;



/* parses elf file compiled by llvm .c->.o

samples/bpf/fds_example.c

+8 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "bpf_load.h"

#include "libbpf.h"

#include "sock_example.h"



#define BPF_F_PIN	(1 << 0)

#define BPF_F_GET	(1 << 1)
@@ -49,17 +50,19 @@ static int bpf_map_create(void) 


static int bpf_prog_create(const char *object)

{

	static const struct bpf_insn insns[] = {

	static struct bpf_insn insns[] = {

		BPF_MOV64_IMM(BPF_REG_0, 1),

		BPF_EXIT_INSN(),

	};

	size_t insns_cnt = sizeof(insns) / sizeof(struct bpf_insn);



	if (object) {

		assert(!load_bpf_file((char *)object));

		return prog_fd[0];

	} else {

		return bpf_prog_load(BPF_PROG_TYPE_SOCKET_FILTER,

				     insns, sizeof(insns), "GPL", 0);

		return bpf_load_program(BPF_PROG_TYPE_SOCKET_FILTER,

					insns, insns_cnt, "GPL", 0,

					bpf_log_buf, BPF_LOG_BUF_SIZE);

	}

}
@@ -83,12 +86,12 @@ static int bpf_do_map(const char *file, uint32_t flags, uint32_t key, 
	}



	if ((flags & BPF_F_KEY_VAL) == BPF_F_KEY_VAL) {

		ret = bpf_update_elem(fd, &key, &value, 0);

		ret = bpf_map_update_elem(fd, &key, &value, 0);

		printf("bpf: fd:%d u->(%u:%u) ret:(%d,%s)\n", fd, key, value,

		       ret, strerror(errno));

		assert(ret == 0);

	} else if (flags & BPF_F_KEY) {

		ret = bpf_lookup_elem(fd, &key, &value);

		ret = bpf_map_lookup_elem(fd, &key, &value);

		printf("bpf: fd:%d l->(%u):%u ret:(%d,%s)\n", fd, key, value,

		       ret, strerror(errno));

		assert(ret == 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE