Commit a84880ef authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-perf-rb-libbpf' 



Jakub Kicinski says:

====================
This series started out as a follow up to the bpftool perf event dumping
patches.

As suggested by Daniel patch 1 makes use of PERF_SAMPLE_TIME to simplify
code and improve accuracy of timestamps.

Remaining patches are trying to move perf event loop into libbpf as
suggested by Alexei.  One user for this new function is bpftool which
links with libbpf nicely, the other, unfortunately, is in samples/bpf.
Remaining patches make samples/bpf link against full libbpf.a (not just
a handful of objects).  Once we have full power of libbpf at our disposal
we can convert some of XDP samples to use libbpf loader instead of
bpf_load.c.  My understanding is that this is the desired direction,
at least for networking code.
====================

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents cb9c28ef be5bca44

samples/bpf/Makefile

+26 −11
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ hostprogs-y += xdpsock 
hostprogs-y += xdp_fwd



# Libbpf dependencies

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

LIBBPF := ../../tools/lib/bpf/libbpf.a

CGROUP_HELPERS := ../../tools/testing/selftests/bpf/cgroup_helpers.o

TRACE_HELPERS := ../../tools/testing/selftests/bpf/trace_helpers.o
@@ -74,14 +74,14 @@ offwaketime-objs := bpf_load.o $(LIBBPF) offwaketime_user.o $(TRACE_HELPERS) 
spintest-objs := bpf_load.o $(LIBBPF) spintest_user.o $(TRACE_HELPERS)

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)

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

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

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

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

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

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

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

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

# reuse xdp1 source intentionally

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

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

xdp_router_ipv4-objs := bpf_load.o $(LIBBPF) xdp_router_ipv4_user.o

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

				       test_current_task_under_cgroup_user.o
@@ -91,15 +91,15 @@ 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

test_map_in_map-objs := bpf_load.o $(LIBBPF) test_map_in_map_user.o

per_socket_stats_example-objs := $(LIBBPF) cookie_uid_helper_example.o

per_socket_stats_example-objs := cookie_uid_helper_example.o $(LIBBPF)

xdp_redirect-objs := bpf_load.o $(LIBBPF) xdp_redirect_user.o

xdp_redirect_map-objs := bpf_load.o $(LIBBPF) xdp_redirect_map_user.o

xdp_redirect_cpu-objs := bpf_load.o $(LIBBPF) xdp_redirect_cpu_user.o

xdp_monitor-objs := bpf_load.o $(LIBBPF) xdp_monitor_user.o

xdp_rxq_info-objs := bpf_load.o $(LIBBPF) xdp_rxq_info_user.o

xdp_rxq_info-objs := xdp_rxq_info_user.o $(LIBBPF)

syscall_tp-objs := bpf_load.o $(LIBBPF) syscall_tp_user.o

cpustat-objs := bpf_load.o $(LIBBPF) cpustat_user.o

xdp_adjust_tail-objs := bpf_load.o $(LIBBPF) xdp_adjust_tail_user.o

xdp_adjust_tail-objs := xdp_adjust_tail_user.o $(LIBBPF)

xdpsock-objs := bpf_load.o $(LIBBPF) xdpsock_user.o

xdp_fwd-objs := bpf_load.o $(LIBBPF) xdp_fwd_user.o
@@ -165,6 +165,16 @@ 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

HOSTCFLAGS_trace_helpers.o += -I$(srctree)/tools/lib/bpf/



HOSTCFLAGS_trace_output_user.o += -I$(srctree)/tools/lib/bpf/

HOSTCFLAGS_offwaketime_user.o += -I$(srctree)/tools/lib/bpf/

HOSTCFLAGS_spintest_user.o += -I$(srctree)/tools/lib/bpf/

HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/

HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/



HOSTLOADLIBES_test_lru_dist += -lelf

HOSTLOADLIBES_sock_example += -lelf

HOSTLOADLIBES_fds_example += -lelf

HOSTLOADLIBES_sockex1 += -lelf

HOSTLOADLIBES_sockex2 += -lelf
@@ -176,6 +186,10 @@ HOSTLOADLIBES_tracex4 += -lelf -lrt 
HOSTLOADLIBES_tracex5 += -lelf

HOSTLOADLIBES_tracex6 += -lelf

HOSTLOADLIBES_tracex7 += -lelf

HOSTLOADLIBES_test_cgrp2_array_pin += -lelf

HOSTLOADLIBES_test_cgrp2_attach += -lelf

HOSTLOADLIBES_test_cgrp2_attach2 += -lelf

HOSTLOADLIBES_test_cgrp2_sock += -lelf

HOSTLOADLIBES_test_cgrp2_sock2 += -lelf

HOSTLOADLIBES_load_sock_ops += -lelf

HOSTLOADLIBES_test_probe_write_user += -lelf
@@ -195,6 +209,7 @@ HOSTLOADLIBES_tc_l2_redirect += -l elf 
HOSTLOADLIBES_lwt_len_hist += -l elf

HOSTLOADLIBES_xdp_tx_iptunnel += -lelf

HOSTLOADLIBES_test_map_in_map += -lelf

HOSTLOADLIBES_per_socket_stats_example += -lelf

HOSTLOADLIBES_xdp_redirect += -lelf

HOSTLOADLIBES_xdp_redirect_map += -lelf

HOSTLOADLIBES_xdp_redirect_cpu += -lelf
@@ -226,7 +241,7 @@ clean: 
	@rm -f *~



$(LIBBPF): FORCE

	$(MAKE) -C $(dir $@) $(notdir $@)

	$(MAKE) -C $(dir $@)



$(obj)/syscall_nrs.s:	$(src)/syscall_nrs.c

	$(call if_changed_dep,cc_s_c)

samples/bpf/bpf_load.c

+5 −5
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 


	/* Keeping compatible with ELF maps section changes

	 * ------------------------------------------------

	 * The program size of struct bpf_map_def is known by loader

	 * The program size of struct bpf_load_map_def is known by loader

	 * code, but struct stored in ELF file can be different.

	 *

	 * Unfortunately sym[i].st_size is zero.  To calculate the
@@ -429,7 +429,7 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 
	 * symbols.

	 */

	map_sz_elf = data_maps->d_size / nr_maps;

	map_sz_copy = sizeof(struct bpf_map_def);

	map_sz_copy = sizeof(struct bpf_load_map_def);

	if (map_sz_elf < map_sz_copy) {

		/*

		 * Backward compat, loading older ELF file with
@@ -448,8 +448,8 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 


	/* Memcpy relevant part of ELF maps data to loader maps */

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

		struct bpf_load_map_def *def;

		unsigned char *addr, *end;

		struct bpf_map_def *def;

		const char *map_name;

		size_t offset;
@@ -464,9 +464,9 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx, 


		/* Symbol value is offset into ELF maps section data area */

		offset = sym[i].st_value;

		def = (struct bpf_map_def *)(data_maps->d_buf + offset);

		def = (struct bpf_load_map_def *)(data_maps->d_buf + offset);

		maps[i].elf_offset = offset;

		memset(&maps[i].def, 0, sizeof(struct bpf_map_def));

		memset(&maps[i].def, 0, sizeof(struct bpf_load_map_def));

		memcpy(&maps[i].def, def, map_sz_copy);



		/* Verify no newer features were requested */

samples/bpf/bpf_load.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define MAX_MAPS 32

#define MAX_PROGS 32



struct bpf_map_def {

struct bpf_load_map_def {

	unsigned int type;

	unsigned int key_size;

	unsigned int value_size;
@@ -21,7 +21,7 @@ struct bpf_map_data { 
	int fd;

	char *name;

	size_t elf_offset;

	struct bpf_map_def def;

	struct bpf_load_map_def def;

};



typedef void (*fixup_map_cb)(struct bpf_map_data *map, int idx);

samples/bpf/trace_output_user.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int print_bpf_output(void *data, int size) 
	if (e->cookie != 0x12345678) {

		printf("BUG pid %llx cookie %llx sized %d\n",

		       e->pid, e->cookie, size);

		return PERF_EVENT_ERROR;

		return LIBBPF_PERF_EVENT_ERROR;

	}



	cnt++;
@@ -56,10 +56,10 @@ static int print_bpf_output(void *data, int size) 
	if (cnt == MAX_CNT) {

		printf("recv %lld events per sec\n",

		       MAX_CNT * 1000000000ll / (time_get_ns() - start_time));

		return PERF_EVENT_DONE;

		return LIBBPF_PERF_EVENT_DONE;

	}



	return PERF_EVENT_CONT;

	return LIBBPF_PERF_EVENT_CONT;

}



static void test_bpf_perf_event(void)

samples/bpf/xdp1_user.c

+21 −10
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#include <libgen.h>

#include <sys/resource.h>



#include "bpf_load.h"

#include "bpf_util.h"

#include "libbpf.h"

#include "bpf/bpf.h"

#include "bpf/libbpf.h"



static int ifindex;

static __u32 xdp_flags;
@@ -31,7 +31,7 @@ static void int_exit(int sig) 


/* simple per-protocol drop counter

 */

static void poll_stats(int interval)

static void poll_stats(int map_fd, int interval)

{

	unsigned int nr_cpus = bpf_num_possible_cpus();

	const unsigned int nr_keys = 256;
@@ -47,7 +47,7 @@ static void poll_stats(int interval) 
		for (key = 0; key < nr_keys; key++) {

			__u64 sum = 0;



			assert(bpf_map_lookup_elem(map_fd[0], &key, values) == 0);

			assert(bpf_map_lookup_elem(map_fd, &key, values) == 0);

			for (i = 0; i < nr_cpus; i++)

				sum += (values[i] - prev[key][i]);

			if (sum)
@@ -71,9 +71,14 @@ static void usage(const char *prog) 
int main(int argc, char **argv)

{

	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	struct bpf_prog_load_attr prog_load_attr = {

		.prog_type	= BPF_PROG_TYPE_XDP,

	};

	const char *optstr = "SN";

	int prog_fd, map_fd, opt;

	struct bpf_object *obj;

	struct bpf_map *map;

	char filename[256];

	int opt;



	while ((opt = getopt(argc, argv, optstr)) != -1) {

		switch (opt) {
@@ -102,13 +107,19 @@ int main(int argc, char **argv) 
	ifindex = strtoul(argv[optind], NULL, 0);



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	prog_load_attr.file = filename;



	if (load_bpf_file(filename)) {

		printf("%s", bpf_log_buf);

	if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))

		return 1;



	map = bpf_map__next(NULL, obj);

	if (!map) {

		printf("finding a map in obj file failed\n");

		return 1;

	}

	map_fd = bpf_map__fd(map);



	if (!prog_fd[0]) {

	if (!prog_fd) {

		printf("load_bpf_file: %s\n", strerror(errno));

		return 1;

	}
@@ -116,12 +127,12 @@ int main(int argc, char **argv) 
	signal(SIGINT, int_exit);

	signal(SIGTERM, int_exit);



	if (bpf_set_link_xdp_fd(ifindex, prog_fd[0], xdp_flags) < 0) {

	if (bpf_set_link_xdp_fd(ifindex, prog_fd, xdp_flags) < 0) {

		printf("link set xdp fd failed\n");

		return 1;

	}



	poll_stats(2);

	poll_stats(map_fd, 2);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE