[PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[Jiang Wang]

When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.

The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
generated by "bpftool btf dump file ./vmlinux format c". On the other
hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
will not be compiled, so vmlinux.h will not include definition of
BPF_F_BPRM_SECUREEXEC.

Ideally, we want to compile bpf selftest regardless of the configuration
setting, so change the include file from vmlinux.h to bpf.h.

Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>
---
 tools/testing/selftests/bpf/progs/bprm_opts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/progs/bprm_opts.c b/tools/testing/selftests/bpf/progs/bprm_opts.c
index 5bfef2887e70..418d9c6d4952 100644
--- a/tools/testing/selftests/bpf/progs/bprm_opts.c
+++ b/tools/testing/selftests/bpf/progs/bprm_opts.c
@@ -4,7 +4,7 @@
  * Copyright 2020 Google LLC.
  */
 
-#include "vmlinux.h"
+#include <linux/bpf.h>
 #include <errno.h>
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
-- 
2.11.0

Re: [PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[Song Liu]

On Wed, Dec 23, 2020 at 5:14 PM Jiang Wang <jiang.wang@bytedance.com> wrote:
>
> When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
> BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.
>
> The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
> generated by "bpftool btf dump file ./vmlinux format c". On the other
> hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
> and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
> will not be compiled, so vmlinux.h will not include definition of
> BPF_F_BPRM_SECUREEXEC.
>
> Ideally, we want to compile bpf selftest regardless of the configuration
> setting, so change the include file from vmlinux.h to bpf.h.
>
> Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>

Thanks for the fix!

Acked-by: Song Liu <songliubraving@fb.com>

[...]

Re: [PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[Song Liu]

On Wed, Dec 23, 2020 at 5:14 PM Jiang Wang <jiang.wang@bytedance.com> wrote:
>
> When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
> BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.
>
> The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
> generated by "bpftool btf dump file ./vmlinux format c". On the other
> hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
> and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
> will not be compiled, so vmlinux.h will not include definition of
> BPF_F_BPRM_SECUREEXEC.
>
> Ideally, we want to compile bpf selftest regardless of the configuration
> setting, so change the include file from vmlinux.h to bpf.h.
>
> Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>

btw: for future patches, please prefix the subject as [PATCH bpf] or
[PATCH bpf-next], so it is
clear which tree the patch applies to. In this case, this should be bpf tree.

Thanks,
Song

> ---
>  tools/testing/selftests/bpf/progs/bprm_opts.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/progs/bprm_opts.c b/tools/testing/selftests/bpf/progs/bprm_opts.c
> index 5bfef2887e70..418d9c6d4952 100644
> --- a/tools/testing/selftests/bpf/progs/bprm_opts.c
> +++ b/tools/testing/selftests/bpf/progs/bprm_opts.c
> @@ -4,7 +4,7 @@
>   * Copyright 2020 Google LLC.
>   */
>
> -#include "vmlinux.h"
> +#include <linux/bpf.h>
>  #include <errno.h>
>  #include <bpf/bpf_helpers.h>
>  #include <bpf/bpf_tracing.h>
> --
> 2.11.0
>

Re: [PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[John Fastabend]

Song Liu wrote:
> On Wed, Dec 23, 2020 at 5:14 PM Jiang Wang <jiang.wang@bytedance.com> wrote:
> >
> > When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
> > BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.
> >
> > The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
> > generated by "bpftool btf dump file ./vmlinux format c". On the other
> > hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
> > and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
> > will not be compiled, so vmlinux.h will not include definition of
> > BPF_F_BPRM_SECUREEXEC.
> >
> > Ideally, we want to compile bpf selftest regardless of the configuration
> > setting, so change the include file from vmlinux.h to bpf.h.
> >
> > Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>
> 
> Thanks for the fix!
> 
> Acked-by: Song Liu <songliubraving@fb.com>
> 
> [...]


LGTM

Acked-by: John Fastabend <john.fastabend@gmail.com>

Re: [PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[Daniel Borkmann]

On 12/29/20 6:14 AM, John Fastabend wrote:
> Song Liu wrote:
>> On Wed, Dec 23, 2020 at 5:14 PM Jiang Wang <jiang.wang@bytedance.com> wrote:
>>>
>>> When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
>>> BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.
>>>
>>> The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
>>> generated by "bpftool btf dump file ./vmlinux format c". On the other
>>> hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
>>> and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
>>> will not be compiled, so vmlinux.h will not include definition of
>>> BPF_F_BPRM_SECUREEXEC.
>>>
>>> Ideally, we want to compile bpf selftest regardless of the configuration
>>> setting, so change the include file from vmlinux.h to bpf.h.
>>>
>>> Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>
>>
>> Thanks for the fix!
>>
>> Acked-by: Song Liu <songliubraving@fb.com>
>>
>> [...]
> 
> LGTM
> 
> Acked-by: John Fastabend <john.fastabend@gmail.com>

I think it's okay'ish as a workaround, but in case that selftest needs to be
extended to the point where we need kernel internal structures from vmlinux.h
again, then we need to come up with a different solution. Overall, I'd like to
remind that BPF selftests need to be run with the full/needed config options set
to not miss out on coverage on some of the BPF subsystems. Anyway, applied, thx!

Re: [PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf.git (refs/heads/master):

On Thu, 24 Dec 2020 01:12:42 +0000 you wrote:
> When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
> BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.
> 
> The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
> generated by "bpftool btf dump file ./vmlinux format c". On the other
> hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
> and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
> will not be compiled, so vmlinux.h will not include definition of
> BPF_F_BPRM_SECUREEXEC.
> 
> [...]

Here is the summary with links:
  - selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC
    https://git.kernel.org/bpf/bpf/c/da4282c17d69

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [External] Re: [PATCH] selftests/bpf: fix a compile error for BPF_F_BPRM_SECUREEXEC

[Jiang Wang .]

Got it. Thank you guys. I will fix the title next time.


On Tue, Dec 29, 2020 at 6:28 AM Daniel Borkmann <daniel@iogearbox.net> wrote:
>
> On 12/29/20 6:14 AM, John Fastabend wrote:
> > Song Liu wrote:
> >> On Wed, Dec 23, 2020 at 5:14 PM Jiang Wang <jiang.wang@bytedance.com> wrote:
> >>>
> >>> When CONFIG_BPF_LSM is not configured, running bpf selftesting will show
> >>> BPF_F_BPRM_SECUREEXEC undefined error for bprm_opts.c.
> >>>
> >>> The problem is that bprm_opts.c includes vmliunx.h. The vmlinux.h is
> >>> generated by "bpftool btf dump file ./vmlinux format c". On the other
> >>> hand, BPF_F_BPRM_SECUREEXEC is defined in include/uapi/linux/bpf.h
> >>> and used only in bpf_lsm.c. When CONFIG_BPF_LSM is not set, bpf_lsm
> >>> will not be compiled, so vmlinux.h will not include definition of
> >>> BPF_F_BPRM_SECUREEXEC.
> >>>
> >>> Ideally, we want to compile bpf selftest regardless of the configuration
> >>> setting, so change the include file from vmlinux.h to bpf.h.
> >>>
> >>> Signed-off-by: Jiang Wang <jiang.wang@bytedance.com>
> >>
> >> Thanks for the fix!
> >>
> >> Acked-by: Song Liu <songliubraving@fb.com>
> >>
> >> [...]
> >
> > LGTM
> >
> > Acked-by: John Fastabend <john.fastabend@gmail.com>
>
> I think it's okay'ish as a workaround, but in case that selftest needs to be
> extended to the point where we need kernel internal structures from vmlinux.h
> again, then we need to come up with a different solution. Overall, I'd like to
> remind that BPF selftests need to be run with the full/needed config options set
> to not miss out on coverage on some of the BPF subsystems. Anyway, applied, thx!