diff mbox series

[bpf-next,v2] selftests/bpf: Include runner extras for install target

Message ID 20240125160502.1512422-1-bjorn@kernel.org (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series [bpf-next,v2] selftests/bpf: Include runner extras for install target | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next
netdev/ynl success SINGLE THREAD; Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/build_tools success Errors and warnings before: 1 this patch: 0
netdev/cc_maintainers success CCed 0 of 0 maintainers
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 23 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-18 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17 and -O2 optimization
bpf/vmtest-bpf-next-VM_Test-42 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-17 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-14 fail Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-PR fail PR summary
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_maps, false, 360) / test_maps on s390x with gcc

Commit Message

Björn Töpel Jan. 25, 2024, 4:05 p.m. UTC 
From: Björn Töpel <bjorn@rivosinc.com>

When using the "install" or targets depending on install, e.g.
"gen_tar", the "runner extras" weren't included for the BPF machine
flavors.

Make sure the necessary helper scripts/tools are added to
corresponding BPF machine flavor.

Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
---
v2: Added btf_dump_test_case files
---
tools/testing/selftests/bpf/Makefile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)


base-commit: c8632acf193beac64bbdaebef013368c480bf74f

Comments

Andrii Nakryiko Jan. 26, 2024, 11:10 p.m. UTC | #1 
On Thu, Jan 25, 2024 at 8:05 AM Björn Töpel <bjorn@kernel.org> wrote:
>
> From: Björn Töpel <bjorn@rivosinc.com>
>
> When using the "install" or targets depending on install, e.g.
> "gen_tar", the "runner extras" weren't included for the BPF machine
> flavors.
>
> Make sure the necessary helper scripts/tools are added to
> corresponding BPF machine flavor.
>
> Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
> ---
> v2: Added btf_dump_test_case files
> ---
> tools/testing/selftests/bpf/Makefile | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index fd15017ed3b1..d5cff32997b3 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -744,8 +744,20 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR)     \
>  DEFAULT_INSTALL_RULE := $(INSTALL_RULE)
>  override define INSTALL_RULE
>         $(DEFAULT_INSTALL_RULE)
> -       @for DIR in $(TEST_INST_SUBDIRS); do              \
> -               mkdir -p $(INSTALL_PATH)/$$DIR;   \
> -               rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\
> +       @for DIR in $(TEST_INST_SUBDIRS); do                    \
> +               mkdir -p $(INSTALL_PATH)/$$DIR;                 \
> +               rsync -a --copy-unsafe-links                    \
> +                       $(OUTPUT)/$$DIR/bpf_testmod.ko          \
> +                       $(OUTPUT)/$$DIR/bpftool                 \
> +                       $(OUTPUT)/$$DIR/ima_setup.sh            \
> +                       $(OUTPUT)/$$DIR/liburandom_read.so      \
> +                       $(OUTPUT)/$$DIR/sign-file               \
> +                       $(OUTPUT)/$$DIR/uprobe_multi            \
> +                       $(OUTPUT)/$$DIR/urandom_read            \
> +                       $(OUTPUT)/$$DIR/verify_sig_setup.sh     \
> +                       $(OUTPUT)/$$DIR/xdp_synproxy            \
> +                       $(OUTPUT)/$$DIR/btf_dump_test_case_*.c  \
> +                       $(OUTPUT)/$$DIR/*.bpf.o                 \
> +                       $(INSTALL_PATH)/$$DIR;                  \

My concern is that this will get out of sync and will go unnoticed
next time we add another "extra" file. We have TRUNNER_EXTRA_FILES,
should we use that list to keep these extras in fewer places?

>         done
>  endef
>
> base-commit: c8632acf193beac64bbdaebef013368c480bf74f
> --
> 2.40.1
>
Björn Töpel Jan. 27, 2024, 9:03 a.m. UTC | #2 
Andrii Nakryiko <andrii.nakryiko@gmail.com> writes:

> On Thu, Jan 25, 2024 at 8:05 AM Björn Töpel <bjorn@kernel.org> wrote:
>>
>> From: Björn Töpel <bjorn@rivosinc.com>
>>
>> When using the "install" or targets depending on install, e.g.
>> "gen_tar", the "runner extras" weren't included for the BPF machine
>> flavors.
>>
>> Make sure the necessary helper scripts/tools are added to
>> corresponding BPF machine flavor.
>>
>> Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
>> ---
>> v2: Added btf_dump_test_case files
>> ---
>> tools/testing/selftests/bpf/Makefile | 18 +++++++++++++++---
>>  1 file changed, 15 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
>> index fd15017ed3b1..d5cff32997b3 100644
>> --- a/tools/testing/selftests/bpf/Makefile
>> +++ b/tools/testing/selftests/bpf/Makefile
>> @@ -744,8 +744,20 @@ EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR)     \
>>  DEFAULT_INSTALL_RULE := $(INSTALL_RULE)
>>  override define INSTALL_RULE
>>         $(DEFAULT_INSTALL_RULE)
>> -       @for DIR in $(TEST_INST_SUBDIRS); do              \
>> -               mkdir -p $(INSTALL_PATH)/$$DIR;   \
>> -               rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\
>> +       @for DIR in $(TEST_INST_SUBDIRS); do                    \
>> +               mkdir -p $(INSTALL_PATH)/$$DIR;                 \
>> +               rsync -a --copy-unsafe-links                    \
>> +                       $(OUTPUT)/$$DIR/bpf_testmod.ko          \
>> +                       $(OUTPUT)/$$DIR/bpftool                 \
>> +                       $(OUTPUT)/$$DIR/ima_setup.sh            \
>> +                       $(OUTPUT)/$$DIR/liburandom_read.so      \
>> +                       $(OUTPUT)/$$DIR/sign-file               \
>> +                       $(OUTPUT)/$$DIR/uprobe_multi            \
>> +                       $(OUTPUT)/$$DIR/urandom_read            \
>> +                       $(OUTPUT)/$$DIR/verify_sig_setup.sh     \
>> +                       $(OUTPUT)/$$DIR/xdp_synproxy            \
>> +                       $(OUTPUT)/$$DIR/btf_dump_test_case_*.c  \
>> +                       $(OUTPUT)/$$DIR/*.bpf.o                 \
>> +                       $(INSTALL_PATH)/$$DIR;                  \
>
> My concern is that this will get out of sync and will go unnoticed
> next time we add another "extra" file. We have TRUNNER_EXTRA_FILES,
> should we use that list to keep these extras in fewer places?

Yeah, you're completely right -- this was a lazy approach. I'll spin a
more robust v3.


Cheers,
Björn
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index fd15017ed3b1..d5cff32997b3 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -744,8 +744,20 @@  EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR) $(HOST_SCRATCH_DIR)	\
 DEFAULT_INSTALL_RULE := $(INSTALL_RULE)
 override define INSTALL_RULE
 	$(DEFAULT_INSTALL_RULE)
-	@for DIR in $(TEST_INST_SUBDIRS); do		  \
-		mkdir -p $(INSTALL_PATH)/$$DIR;   \
-		rsync -a $(OUTPUT)/$$DIR/*.bpf.o $(INSTALL_PATH)/$$DIR;\
+	@for DIR in $(TEST_INST_SUBDIRS); do			\
+		mkdir -p $(INSTALL_PATH)/$$DIR;			\
+		rsync -a --copy-unsafe-links			\
+			$(OUTPUT)/$$DIR/bpf_testmod.ko		\
+			$(OUTPUT)/$$DIR/bpftool			\
+			$(OUTPUT)/$$DIR/ima_setup.sh		\
+			$(OUTPUT)/$$DIR/liburandom_read.so	\
+			$(OUTPUT)/$$DIR/sign-file		\
+			$(OUTPUT)/$$DIR/uprobe_multi		\
+			$(OUTPUT)/$$DIR/urandom_read		\
+			$(OUTPUT)/$$DIR/verify_sig_setup.sh	\
+			$(OUTPUT)/$$DIR/xdp_synproxy		\
+			$(OUTPUT)/$$DIR/btf_dump_test_case_*.c	\
+			$(OUTPUT)/$$DIR/*.bpf.o			\
+			$(INSTALL_PATH)/$$DIR;			\
 	done
 endef