MIME-Version: 1.0
References: <20211115165313.549179499@linuxfoundation.org> <CA+G9fYvxhzL9KUxZcRzMxnbGPK5GKTCtb5kWM3JB09D+-KhVug@mail.gmail.com>
In-Reply-To: <CA+G9fYvxhzL9KUxZcRzMxnbGPK5GKTCtb5kWM3JB09D+-KhVug@mail.gmail.com>
From:   Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date:   Mon, 15 Nov 2021 21:57:55 -0800
Message-ID: <CAEf4BzZHsbAhA6RJYias+e10PsXWbOD9ekyNMAHKt5PKAGe=Rw@mail.gmail.com>
Subject: Re: [PATCH 5.4 000/355] 5.4.160-rc1 review
To:     Naresh Kamboju <naresh.kamboju@linaro.org>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        open list <linux-kernel@vger.kernel.org>,
        Shuah Khan <shuah@kernel.org>, f.fainelli@gmail.com,
        patches@kernelci.org, lkft-triage@lists.linaro.org,
        jonathanh@nvidia.com, linux- stable <stable@vger.kernel.org>,
        pavel@denx.de, Andrew Morton <akpm@linux-foundation.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        linux@roeck-us.net, Andrii Nakryiko <andrii@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Nov 15, 2021 at 10:00 AM Naresh Kamboju
<naresh.kamboju@linaro.org> wrote:
>
> On Mon, 15 Nov 2021 at 22:39, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> 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@kernel.org>
> >     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@linaro.org>
>
> 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