Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 205c8ada authored by Joe Stringer's avatar Joe Stringer Committed by Arnaldo Carvalho de Melo
Browse files

samples/bpf: Remove perf_event_open() declaration 



This declaration was made in samples/bpf/libbpf.c for convenience, but
there's already one in tools/perf/perf-sys.h. Reuse that one.

Committer notes:

Testing it:

  $ make -j4 O=../build/v4.9.0-rc8+ samples/bpf/
  make[1]: Entering directory '/home/build/v4.9.0-rc8+'
    CHK     include/config/kernel.release
    GEN     ./Makefile
    CHK     include/generated/uapi/linux/version.h
    Using /home/acme/git/linux as source for kernel
    CHK     include/generated/utsrelease.h
    CHK     include/generated/timeconst.h
    CHK     include/generated/bounds.h
    CHK     include/generated/asm-offsets.h
    CALL    /home/acme/git/linux/scripts/checksyscalls.sh
    HOSTCC  samples/bpf/test_verifier.o
    HOSTCC  samples/bpf/libbpf.o
    HOSTCC  samples/bpf/../../tools/lib/bpf/bpf.o
    HOSTCC  samples/bpf/test_maps.o
    HOSTCC  samples/bpf/sock_example.o
    HOSTCC  samples/bpf/bpf_load.o
<SNIP>
    HOSTLD  samples/bpf/trace_event
    HOSTLD  samples/bpf/sampleip
    HOSTLD  samples/bpf/tc_l2_redirect
  make[1]: Leaving directory '/home/build/v4.9.0-rc8+'
  $

Also tested the offwaketime resulting from the rebuild, seems to work as
before.

Signed-off-by: default avatarJoe Stringer <joe@ovn.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20161209024620.31660-7-joe@ovn.org


[ Use -I$(srctree)/tools/lib/ to support out of source code tree builds ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 811b4f0d

samples/bpf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ 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/bpf_load.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <ctype.h>

#include "libbpf.h"

#include "bpf_load.h"

#include "perf-sys.h"



#define DEBUGFS "/sys/kernel/debug/tracing/"
@@ -179,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/libbpf.c

+0 −7
Original line number Diff line number Diff line
@@ -34,10 +34,3 @@ int open_raw_sock(const char *name) 


	return sock;

}
 


int perf_event_open(struct perf_event_attr *attr, int pid, int cpu,

		    int group_fd, unsigned long flags)

{

	return syscall(__NR_perf_event_open, attr, pid, cpu,

		       group_fd, flags);

}

samples/bpf/libbpf.h

+0 −3
Original line number Diff line number Diff line
@@ -188,7 +188,4 @@ struct bpf_insn; 
/* create RAW socket and bind to interface 'name' */

int open_raw_sock(const char *name);



struct perf_event_attr;

int perf_event_open(struct perf_event_attr *attr, int pid, int cpu,

		    int group_fd, unsigned long flags);

#endif

samples/bpf/sampleip_user.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <sys/ioctl.h>

#include "libbpf.h"

#include "bpf_load.h"

#include "perf-sys.h"



#define DEFAULT_FREQ	99

#define DEFAULT_SECS	5
@@ -49,7 +50,7 @@ static int sampling_start(int *pmu_fd, int freq) 
	};



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

		pmu_fd[i] = perf_event_open(&pe_sample_attr, -1 /* pid */, i,

		pmu_fd[i] = sys_perf_event_open(&pe_sample_attr, -1 /* pid */, i,

					    -1 /* group_fd */, 0 /* flags */);

		if (pmu_fd[i] < 0) {

			fprintf(stderr, "ERROR: Initializing perf sampling\n");