Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
MIME-Version: 1.0
References: <cover.1701462010.git.dxu@dxuuu.xyz> <68419933c552bd30e92d432e287ce91deb3ed52e.1701462010.git.dxu@dxuuu.xyz>
In-Reply-To: <68419933c552bd30e92d432e287ce91deb3ed52e.1701462010.git.dxu@dxuuu.xyz>
From:   Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date:   Fri, 1 Dec 2023 15:50:06 -0800
Message-ID: <CAEf4Bzasuzsb_5ShPoZaDwPn5yvArD5Rj9j5W7GoRSK+=xkrfQ@mail.gmail.com>
Subject: Re: [PATCH ipsec-next v3 4/9] bpf: selftests: test_loader: Support
 __btf_path() annotation
To:     Daniel Xu <dxu@dxuuu.xyz>
Cc:     ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org,
        andrii@kernel.org, steffen.klassert@secunet.com,
        antony.antony@secunet.com, alexei.starovoitov@gmail.com,
        yonghong.song@linux.dev, eddyz87@gmail.com, mykolal@fb.com,
        martin.lau@linux.dev, song@kernel.org, john.fastabend@gmail.com,
        kpsingh@kernel.org, sdf@google.com, haoluo@google.com,
        jolsa@kernel.org, bpf@vger.kernel.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
        devel@linux-ipsec.org, netdev@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Dec 1, 2023 at 12:24=E2=80=AFPM Daniel Xu <dxu@dxuuu.xyz> wrote:
>
> This commit adds support for per-prog btf_custom_path. This is necessary
> for testing CO-RE relocations on non-vmlinux types using test_loader
> infrastructure.
>
> Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
> ---
>  tools/testing/selftests/bpf/progs/bpf_misc.h | 1 +
>  tools/testing/selftests/bpf/test_loader.c    | 7 +++++++
>  2 files changed, 8 insertions(+)
>

Acked-by: Andrii Nakryiko <andrii@kernel.org>


> diff --git a/tools/testing/selftests/bpf/progs/bpf_misc.h b/tools/testing=
/selftests/bpf/progs/bpf_misc.h
> index 799fff4995d8..2fd59970c43a 100644
> --- a/tools/testing/selftests/bpf/progs/bpf_misc.h
> +++ b/tools/testing/selftests/bpf/progs/bpf_misc.h
> @@ -71,6 +71,7 @@
>  #define __retval_unpriv(val)   __attribute__((btf_decl_tag("comment:test=
_retval_unpriv=3D"#val)))
>  #define __auxiliary            __attribute__((btf_decl_tag("comment:test=
_auxiliary")))
>  #define __auxiliary_unpriv     __attribute__((btf_decl_tag("comment:test=
_auxiliary_unpriv")))
> +#define __btf_path(path)       __attribute__((btf_decl_tag("comment:test=
_btf_path=3D" path)))
>
>  /* Convenience macro for use with 'asm volatile' blocks */
>  #define __naked __attribute__((naked))
> diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/se=
lftests/bpf/test_loader.c
> index a350ecdfba4a..74ceb7877ae2 100644
> --- a/tools/testing/selftests/bpf/test_loader.c
> +++ b/tools/testing/selftests/bpf/test_loader.c
> @@ -27,6 +27,7 @@
>  #define TEST_TAG_RETVAL_PFX_UNPRIV "comment:test_retval_unpriv=3D"
>  #define TEST_TAG_AUXILIARY "comment:test_auxiliary"
>  #define TEST_TAG_AUXILIARY_UNPRIV "comment:test_auxiliary_unpriv"
> +#define TEST_BTF_PATH "comment:test_btf_path=3D"
>
>  /* Warning: duplicated in bpf_misc.h */
>  #define POINTER_VALUE  0xcafe4all
> @@ -58,6 +59,7 @@ struct test_spec {
>         const char *prog_name;
>         struct test_subspec priv;
>         struct test_subspec unpriv;
> +       const char *btf_custom_path;
>         int log_level;
>         int prog_flags;
>         int mode_mask;
> @@ -288,6 +290,8 @@ static int parse_test_spec(struct test_loader *tester=
,
>                                         goto cleanup;
>                                 update_flags(&spec->prog_flags, flags, cl=
ear);
>                         }
> +               } else if (str_has_pfx(s, TEST_BTF_PATH)) {
> +                       spec->btf_custom_path =3D s + sizeof(TEST_BTF_PAT=
H) - 1;
>                 }
>         }
>
> @@ -578,6 +582,9 @@ void run_subtest(struct test_loader *tester,
>                 }
>         }
>
> +       /* Implicitly reset to NULL if next test case doesn't specify */
> +       open_opts->btf_custom_path =3D spec->btf_custom_path;
> +
>         tobj =3D bpf_object__open_mem(obj_bytes, obj_byte_cnt, open_opts)=
;
>         if (!ASSERT_OK_PTR(tobj, "obj_open_mem")) /* shouldn't happen */
>                 goto subtest_cleanup;
> --
> 2.42.1
>