netdev - Re: [PATCH bpf-next 1/3] selftests/bpf: Fix broken riscv build

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAJ+HfNgL5a4o-EF3-F21dxsauG0cyNSyuNOp+HsrbXkjWCBG_w@mail.gmail.com>
Date:   Wed, 18 Nov 2020 07:26:49 +0100
From:   Björn Töpel <bjorn.topel@...il.com>
To:     Andrii Nakryiko <andrii.nakryiko@...il.com>
Cc:     Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Networking <netdev@...r.kernel.org>, bpf <bpf@...r.kernel.org>,
        Xi Wang <xi.wang@...il.com>,
        Luke Nelson <luke.r.nels@...il.com>,
        linux-riscv <linux-riscv@...ts.infradead.org>
Subject: Re: [PATCH bpf-next 1/3] selftests/bpf: Fix broken riscv build

On Wed, 18 Nov 2020 at 02:43, Andrii Nakryiko <andrii.nakryiko@...il.com> wrote:
>
> On Tue, Nov 17, 2020 at 12:28 AM Björn Töpel <bjorn.topel@...il.com> wrote:
> >
> > The selftests/bpf Makefile includes system include directories from
> > the host, when building BPF programs. On RISC-V glibc requires that
> > __riscv_xlen is defined. This is not the case for "clang -target bpf",
> > which messes up __WORDSIZE (errno.h -> ... -> wordsize.h) and breaks
> > the build.
> >
> > By explicitly defining __risc_xlen correctly for riscv, we can
> > workaround this.
> >
> > Fixes: 167381f3eac0 ("selftests/bpf: Makefile fix "missing" headers on build with -idirafter")
> > Signed-off-by: Björn Töpel <bjorn.topel@...il.com>
> > ---
> >  tools/testing/selftests/bpf/Makefile | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> > index c1708ffa6b1c..9d48769ad268 100644
> > --- a/tools/testing/selftests/bpf/Makefile
> > +++ b/tools/testing/selftests/bpf/Makefile
> > @@ -219,7 +219,8 @@ $(RESOLVE_BTFIDS): $(BPFOBJ) | $(BUILD_DIR)/resolve_btfids  \
> >  # build would have failed anyways.
> >  define get_sys_includes
> >  $(shell $(1) -v -E - </dev/null 2>&1 \
> > -       | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
> > +       | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \
> > +       $(shell $(1) -dM -E - </dev/null | grep '#define __riscv_xlen ' |sed 's/#define /-D/' | sed 's/ /=/')
>
> just nits: second $(shell ) invocation should be at the same
> indentation level as the first one
>
> also '|sed' -> '| sed' ?
>
> Otherwise I have no idea what this does and no way to try it on
> RISC-V, but it doesn't break my setup, so I'm fine with it. ;)
>

:-) I'll fix it up in v2.