Received-SPF: pass (google.com: domain of linux-kernel+bounces-40804-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240125160502.1512422-1-bjorn@kernel.org>
In-Reply-To: <20240125160502.1512422-1-bjorn@kernel.org>
From: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date: Fri, 26 Jan 2024 15:10:31 -0800
Message-ID: <CAEf4BzaewwHQn7xBgiuckH3xbRHGc6GxvAq6rXf6Ep+KDWDEFg@mail.gmail.com>
Subject: Re: [PATCH bpf-next v2] selftests/bpf: Include runner extras for
 install target
To: =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, 
	Andrii Nakryiko <andrii@kernel.org>, Mykola Lysenko <mykolal@fb.com>, bpf@vger.kernel.org, 
	netdev@vger.kernel.org, =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@rivosinc.com>, 
	linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, Jan 25, 2024 at 8:05=E2=80=AFAM Bj=C3=B6rn T=C3=B6pel <bjorn@kernel=
org> wrote:
>
> From: Bj=C3=B6rn T=C3=B6pel <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=C3=B6rn T=C3=B6pel <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/selftes=
ts/bpf/Makefile
> index fd15017ed3b1..d5cff32997b3 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -744,8 +744,20 @@ EXTRA_CLEAN :=3D $(TEST_CUSTOM_PROGS) $(SCRATCH_DIR)=
 $(HOST_SCRATCH_DIR)     \
>  DEFAULT_INSTALL_RULE :=3D $(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
>