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

Commit 9d1f1594 authored by Roman Gushchin's avatar Roman Gushchin Committed by David S. Miller
Browse files

bpf: move cgroup_helpers from samples/bpf/ to tools/testing/selftesting/bpf/ 



The purpose of this move is to use these files in bpf tests.

Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebc614f6

samples/bpf/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ hostprogs-y += syscall_tp 


# Libbpf dependencies

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

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



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

sock_example-objs := sock_example.o $(LIBBPF)
@@ -69,13 +70,13 @@ 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_attach2-objs := $(LIBBPF) test_cgrp2_attach2.o $(CGROUP_HELPERS)

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) xdp1_user.o

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

tools/testing/selftests/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ TEST_PROGS := test_kmod.sh test_xdp_redirect.sh test_xdp_meta.sh 


include ../lib.mk



BPFOBJ := $(OUTPUT)/libbpf.a

BPFOBJ := $(OUTPUT)/libbpf.a $(OUTPUT)/cgroup_helpers.c



$(TEST_GEN_PROGS): $(BPFOBJ)