Re: [PATCH 5.4 000/355] 5.4.160-rc1 review

[Andrii Nakryiko]

On Mon, Nov 15, 2021 at 10:00 AM Naresh Kamboju
<naresh.kamboju@xxxxxxxxxx> wrote:
>
> On Mon, 15 Nov 2021 at 22:39, Greg Kroah-Hartman
> <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > This is the start of the stable review cycle for the 5.4.160 release.
> > There are 355 patches in this series, all will be posted as a response
> > to this one.  If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Wed, 17 Nov 2021 16:52:23 +0000.
> > Anything received after that time might be too late.
> >
> > The whole patch series can be found in one patch at:
> >         https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.160-rc1.gz
> > or in the git tree and branch at:
> >         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
> > and the diffstat can be found below.
> >
> > thanks,
> >
> > greg k-h
>
>
> Perf build broken due to following errors.
>
> > Andrii Nakryiko <andrii@xxxxxxxxxx>
> >     libbpf: Fix BTF data layout checks and allow empty BTF
>
>
> In file included from btf.c:17:
> btf.c: In function 'btf_parse_hdr':
> btf.c:104:62: error: 'struct btf' has no member named 'raw_size'; did
> you mean 'data_size'?
>   104 |                 pr_debug("Invalid BTF total size:%u\n", btf->raw_size);
>       |                                                              ^~~~~~~~
>
> Reported-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx>
>
> Build log:
> https://builds.tuxbuild.com/20xsgAxLwf4E60xl2dTdXnNS8FZ/

Greg,

c733c19fda7b ("libbpf: Fix BTF data layout checks and allow empty
BTF") should either be dropped, or fixed like the below:

diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c
index 3380aadb7465..41daf0fa95b9 100644
--- a/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@ -101,7 +101,7 @@ static int btf_parse_hdr(struct btf *btf)
        }

        if (meta_left < hdr->str_off + hdr->str_len) {
-               pr_debug("Invalid BTF total size:%u\n", btf->raw_size);
+               pr_debug("Invalid BTF total size:%u\n", btf->data_size);
                return -EINVAL;
        }

Not sure which one you'd prefer. Both will fix perf build.

>
> --
> Linaro LKFT
> https://lkft.linaro.org