On 15 Nov 18:23, Wang Yufen wrote:
The program file used in the udpgro_frglist testcase is "../bpf/nat6to4.o",
but the actual nat6to4.o file is in "bpf/" not "../bpf".
The following error occurs:
Error opening object ../bpf/nat6to4.o: No such file or directory
Cannot initialize ELF context!
Unable to load program
In addition, all the kernel bpf source files are centred under the
subdir "progs" after commit bd4aed0ee73c ("selftests: bpf: centre
kernel bpf objects under new subdir "progs""). So mv nat6to4.c to
^^ move :)
"../bpf/progs" and use "../bpf/nat6to4.bpf.o". And also move the
test program to selftests/bpf.
Can you separate the fix from the mv ?
Fixes: edae34a3ed92 ("selftests net: add UDP GRO fraglist + bpf self-tests")
Signed-off-by: Wang Yufen <wangyufen@xxxxxxxxxx>
---
tools/testing/selftests/bpf/Makefile | 7 +-
tools/testing/selftests/bpf/in_netns.sh | 23 +
.../testing/selftests/bpf/progs/nat6to4_egress4.c | 184 ++++++
.../testing/selftests/bpf/progs/nat6to4_ingress6.c | 149 +++++
tools/testing/selftests/bpf/test_udpgro_frglist.sh | 110 ++++
tools/testing/selftests/bpf/udpgso_bench_rx.c | 409 ++++++++++++
tools/testing/selftests/bpf/udpgso_bench_tx.c | 712 +++++++++++++++++++++
tools/testing/selftests/net/Makefile | 2 -
tools/testing/selftests/net/bpf/Makefile | 14 -
tools/testing/selftests/net/bpf/nat6to4.c | 285 ---------
tools/testing/selftests/net/udpgro_frglist.sh | 103 ---
11 files changed, 1592 insertions(+), 406 deletions(-)
create mode 100755 tools/testing/selftests/bpf/in_netns.sh
create mode 100644 tools/testing/selftests/bpf/progs/nat6to4_egress4.c
create mode 100644 tools/testing/selftests/bpf/progs/nat6to4_ingress6.c
create mode 100755 tools/testing/selftests/bpf/test_udpgro_frglist.sh
create mode 100644 tools/testing/selftests/bpf/udpgso_bench_rx.c
create mode 100644 tools/testing/selftests/bpf/udpgso_bench_tx.c
delete mode 100644 tools/testing/selftests/net/bpf/Makefile
delete mode 100644 tools/testing/selftests/net/bpf/nat6to4.c
delete mode 100755 tools/testing/selftests/net/udpgro_frglist.sh
created more files than deleted? also moving files should appear as
rename. Did you do the mv with git mv ? I am surprised how git didn't pick this up
as "rename".
For next version please use tag [PATCH bpf-next]
