Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
MIME-Version: 1.0
References: <20230915-bpf_collision-v2-1-027670d38bdf@google.com>
 <20230915171814.GA1721473@dev-arch.thelio-3990X> <CAADnVQJVL7yo5ZrBZ99xO-MWHHg8L-SuSJrCTf-eUd-k5UO75g@mail.gmail.com>
 <CAKwvOdkbqHFTvRNWG==0FjOPHgnA-zqE2Gn_nB4ys6qvKR2+HA@mail.gmail.com>
In-Reply-To: <CAKwvOdkbqHFTvRNWG==0FjOPHgnA-zqE2Gn_nB4ys6qvKR2+HA@mail.gmail.com>
From:   Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date:   Fri, 15 Sep 2023 10:27:01 -0700
Message-ID: <CAADnVQLfdMuxWVGKSF+COp8Q7DnKxYL0w5crN19vPkSd0Gh7mg@mail.gmail.com>
Subject: Re: [PATCH v2] bpf: Fix BTF_ID symbol generation collision
To:     Nick Desaulniers <ndesaulniers@google.com>
Cc:     Nathan Chancellor <nathan@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@chromium.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, stable <stable@vger.kernel.org>,
        Satya Durga Srinivasu Prabhala <quic_satyap@quicinc.com>,
        Marcus Seyfarth <m.seyfarth@gmail.com>,
        Jiri Olsa <jolsa@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Sep 15, 2023 at 10:24=E2=80=AFAM Nick Desaulniers
<ndesaulniers@google.com> wrote:
>
> On Fri, Sep 15, 2023 at 10:22=E2=80=AFAM Alexei Starovoitov
> <alexei.starovoitov@gmail.com> wrote:
> >
> > On Fri, Sep 15, 2023 at 10:18=E2=80=AFAM Nathan Chancellor <nathan@kern=
el.org> wrote:
> > >
> > > On Fri, Sep 15, 2023 at 09:42:20AM -0700, Nick Desaulniers wrote:
> > > > Marcus and Satya reported an issue where BTF_ID macro generates sam=
e
> > > > symbol in separate objects and that breaks final vmlinux link.
> > > >
> > > >   ld.lld: error: ld-temp.o <inline asm>:14577:1: symbol
> > > >   '__BTF_ID__struct__cgroup__624' is already defined
> > > >
> > > > This can be triggered under specific configs when __COUNTER__ happe=
ns to
> > > > be the same for the same symbol in two different translation units,
> > > > which is already quite unlikely to happen.
> > > >
> > > > Add __LINE__ number suffix to make BTF_ID symbol more unique, which=
 is
> > > > not a complete fix, but it would help for now and meanwhile we can =
work
> > > > on better solution as suggested by Andrii.
> > > >
> > > > Cc: stable@vger.kernel.org
> > > > Reported-by: Satya Durga Srinivasu Prabhala <quic_satyap@quicinc.co=
m>
> > > > Reported-by: Marcus Seyfarth <m.seyfarth@gmail.com>
> > > > Closes: https://github.com/ClangBuiltLinux/linux/issues/1913
> > > > Tested-by: Marcus Seyfarth <m.seyfarth@gmail.com>
> > > > Debugged-by: Nathan Chancellor <nathan@kernel.org>
> > > > Co-developed-by: Jiri Olsa <jolsa@kernel.org>
> > > > Link: https://lore.kernel.org/bpf/CAEf4Bzb5KQ2_LmhN769ifMeSJaWfebcc=
UasQOfQKaOd0nQ51tw@mail.gmail.com/
> > > > Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
> > > > ---
> > > >  tools/include/linux/btf_ids.h | 2 +-
> > >
> > > Shouldn't this diff be in include/linux/btf_ids.h as well? Otherwise,=
 I
> > > don't think it will be used by the kernel build.
>
> D'oh!
>
> >
> > argh.
> > Let's do this patch as-is and another patch to update everything
> > in tools/../btf_ids.h, since it got out of sync quite a bit.
>
> I think I can do both in a v3? I don't see the issue (in mainline, are
> they out of sync in -next?)

Yes. Pls send v3 with two patches.
We'll apply and flush bpf trees, so both will have all fixes in a day or so=
.