MIME-Version: 1.0
References: <20211214135555.125348-1-pulehui@huawei.com> <CAEf4BzaQcHV3iY5XqEbt3ptw+KejVVEZ8gSmW7u46=xHnsTaPA@mail.gmail.com>
 <a83777e4-528f-8adb-33e4-a0fea8d544a0@huawei.com>
In-Reply-To: <a83777e4-528f-8adb-33e4-a0fea8d544a0@huawei.com>
From:   Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date:   Fri, 17 Dec 2021 08:45:13 -0800
Message-ID: <CAEf4BzZf2UBgO=uaOOhPFEdJV9Jo7x3KAC3G9Wa1RVdmOD35nA@mail.gmail.com>
Subject: Re: [PATCH bpf-next] selftests/bpf: Fix building error when using
 userspace pt_regs
To:     Pu Lehui <pulehui@huawei.com>
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>, Martin Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        john fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Albert Ou <aou@eecs.berkeley.edu>,
        Shuah Khan <shuah@kernel.org>,
        "open list:KERNEL SELFTEST FRAMEWORK" 
        <linux-kselftest@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Dec 16, 2021 at 6:25 PM Pu Lehui <pulehui@huawei.com> wrote:
>
>
>
> On 2021/12/16 12:06, Andrii Nakryiko wrote:
> > On Tue, Dec 14, 2021 at 5:54 AM Pu Lehui <pulehui@huawei.com> wrote:
> >>
> >> When building bpf selftests on arm64, the following error will occur:
> >>
> >> progs/loop2.c:20:7: error: incomplete definition of type 'struct
> >> user_pt_regs'
> >>
> >> Some archs, like arm64 and riscv, use userspace pt_regs in
> >> bpf_tracing.h, which causes build failure when bpf prog use
> >> macro in bpf_tracing.h. So let's use vmlinux.h directly.
> >
> > We could probably also extend bpf_tracing.h to work with
> > kernel-defined pt_regs, just like we do for x86 (see __KERNEL__ and
> > __VMLINUX_H__ checks). It's more work, but will benefit other end
> > users, not just selftests.
> >
> It might change a lot. We can use header file directory generated by
> "make headers_install" to fix it.

We don't have dependency on "make headers_install" and I'd rather not add it.

What do you mean by "change a lot"?

>
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -294,7 +294,8 @@ MENDIAN=$(if
> $(IS_LITTLE_ENDIAN),-mlittle-endian,-mbig-endian)
>   CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))
>   BPF_CFLAGS = -g -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \
>              -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \
> -            -I$(abspath $(OUTPUT)/../usr/include)
> +            -I$(abspath $(OUTPUT)/../usr/include) \
> +            -I../../../../usr/include
> >>
> >> Signed-off-by: Pu Lehui <pulehui@huawei.com>
> >> ---
> >>   tools/testing/selftests/bpf/progs/loop1.c     |  8 ++------
> >>   tools/testing/selftests/bpf/progs/loop2.c     |  8 ++------
> >>   tools/testing/selftests/bpf/progs/loop3.c     |  8 ++------
> >>   tools/testing/selftests/bpf/progs/loop6.c     | 20 ++++++-------------
> >>   .../selftests/bpf/progs/test_overhead.c       |  8 ++------
> >>   .../selftests/bpf/progs/test_probe_user.c     |  6 +-----
> >>   6 files changed, 15 insertions(+), 43 deletions(-)
> >>
> >
> > [...]
> > .
> >