Commit 28dbf861 authored by Yonghong Song's avatar Yonghong Song Committed by Alexei Starovoitov
Browse files

samples/bpf: move common-purpose trace functions to selftests 



There is no functionality change in this patch. The common-purpose
trace functions, including perf_event polling and ksym lookup,
are moved from trace_output_user.c and bpf_load.c to
selftests/bpf/trace_helpers.c so that these function can
be reused later in selftests.

Acked-by: default avatarAlexei Starovoitov <ast@fb.com>
Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent de2ff05f

samples/bpf/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ hostprogs-y += xdp_adjust_tail 
# Libbpf dependencies

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

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

TRACE_HELPERS := ../../tools/testing/selftests/bpf/trace_helpers.o



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

sock_example-objs := sock_example.o $(LIBBPF)
@@ -65,10 +66,10 @@ tracex6-objs := bpf_load.o $(LIBBPF) tracex6_user.o 
tracex7-objs := bpf_load.o $(LIBBPF) tracex7_user.o

load_sock_ops-objs := bpf_load.o $(LIBBPF) load_sock_ops.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

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

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

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
@@ -82,8 +83,8 @@ xdp2-objs := bpf_load.o $(LIBBPF) xdp1_user.o 
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

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

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

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

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

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

samples/bpf/bpf_load.c

+0 −63
Original line number Diff line number Diff line
@@ -648,66 +648,3 @@ void read_trace_pipe(void) 
		}

	}

}
 


#define MAX_SYMS 300000

static struct ksym syms[MAX_SYMS];

static int sym_cnt;



static int ksym_cmp(const void *p1, const void *p2)

{

	return ((struct ksym *)p1)->addr - ((struct ksym *)p2)->addr;

}



int load_kallsyms(void)

{

	FILE *f = fopen("/proc/kallsyms", "r");

	char func[256], buf[256];

	char symbol;

	void *addr;

	int i = 0;



	if (!f)

		return -ENOENT;



	while (!feof(f)) {

		if (!fgets(buf, sizeof(buf), f))

			break;

		if (sscanf(buf, "%p %c %s", &addr, &symbol, func) != 3)

			break;

		if (!addr)

			continue;

		syms[i].addr = (long) addr;

		syms[i].name = strdup(func);

		i++;

	}

	sym_cnt = i;

	qsort(syms, sym_cnt, sizeof(struct ksym), ksym_cmp);

	return 0;

}



struct ksym *ksym_search(long key)

{

	int start = 0, end = sym_cnt;

	int result;



	while (start < end) {

		size_t mid = start + (end - start) / 2;



		result = key - syms[mid].addr;

		if (result < 0)

			end = mid;

		else if (result > 0)

			start = mid + 1;

		else

			return &syms[mid];

	}



	if (start >= 1 && syms[start - 1].addr < key &&

	    key < syms[start].addr)

		/* valid ksym */

		return &syms[start - 1];



	/* out of range. return _stext */

	return &syms[0];

}

samples/bpf/bpf_load.h

+0 −7
Original line number Diff line number Diff line
@@ -54,12 +54,5 @@ int load_bpf_file(char *path); 
int load_bpf_file_fixup_map(const char *path, fixup_map_cb fixup_map);



void read_trace_pipe(void);

struct ksym {

	long addr;

	char *name;

};



int load_kallsyms(void);

struct ksym *ksym_search(long key);

int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags);

#endif

samples/bpf/offwaketime_user.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <sys/resource.h>

#include "libbpf.h"

#include "bpf_load.h"

#include "trace_helpers.h"



#define PRINT_RAW_ADDR 0

samples/bpf/sampleip_user.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "libbpf.h"

#include "bpf_load.h"

#include "perf-sys.h"

#include "trace_helpers.h"



#define DEFAULT_FREQ	99

#define DEFAULT_SECS	5

CRA Git | Maintained and supported by SUSTech CRA and CCSE