Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
MIME-Version: 1.0
References: <20220424092613.863290-1-imagedong@tencent.com> <20220426182621.kgut2bpateytcxaj@MacBook-Pro.local>
In-Reply-To: <20220426182621.kgut2bpateytcxaj@MacBook-Pro.local>
From:   Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date:   Tue, 26 Apr 2022 11:30:40 -0700
Message-ID: <CAADnVQL0rLLUMUcfdu=-dc2BCe8AQg5oz+gt+6j95y9V1DFEYA@mail.gmail.com>
Subject: Re: [PATCH] bpf: init map_btf_id during compiling
To:     Menglong Dong <menglong8.dong@gmail.com>
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>,
        "David S. Miller" <davem@davemloft.net>,
        Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
        David Ahern <dsahern@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, benbjiang@tencent.com,
        Hao Peng <flyingpeng@tencent.com>,
        Menglong Dong <imagedong@tencent.com>,
        Eric Dumazet <edumazet@google.com>,
        Martin KaFai Lau <kafai@fb.com>,
        Talal Ahmad <talalahmad@google.com>,
        Kees Cook <keescook@chromium.org>,
        Mengen Sun <mengensun@tencent.com>, dongli.zhang@oracle.com,
        LKML <linux-kernel@vger.kernel.org>,
        Network Development <netdev@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Apr 26, 2022 at 11:26 AM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Sun, Apr 24, 2022 at 05:26:13PM +0800, menglong8.dong@gmail.com wrote:
> > diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
> > index 0918a39279f6..588a001cc767 100644
> > --- a/kernel/bpf/btf.c
> > +++ b/kernel/bpf/btf.c
> > @@ -4727,30 +4727,6 @@ static const struct bpf_map_ops * const btf_vmlinux_map_ops[] = {
> >  #undef BPF_MAP_TYPE
> >  };
> >
> > -static int btf_vmlinux_map_ids_init(const struct btf *btf,
> > -                                 struct bpf_verifier_log *log)
> > -{
> > -     const struct bpf_map_ops *ops;
> > -     int i, btf_id;
> > -
> > -     for (i = 0; i < ARRAY_SIZE(btf_vmlinux_map_ops); ++i) {
> > -             ops = btf_vmlinux_map_ops[i];
> > -             if (!ops || (!ops->map_btf_name && !ops->map_btf_id))
> > -                     continue;
> > -             if (!ops->map_btf_name || !ops->map_btf_id) {
> > -                     bpf_log(log, "map type %d is misconfigured\n", i);
> > -                     return -EINVAL;
> > -             }
> > -             btf_id = btf_find_by_name_kind(btf, ops->map_btf_name,
> > -                                            BTF_KIND_STRUCT);
> > -             if (btf_id < 0)
> > -                     return btf_id;
> > -             *ops->map_btf_id = btf_id;
> > -     }
> > -
> > -     return 0;
> > -}
> > -
> >  static int btf_translate_to_vmlinux(struct bpf_verifier_log *log,
> >                                    struct btf *btf,
> >                                    const struct btf_type *t,
> > @@ -4812,11 +4788,6 @@ struct btf *btf_parse_vmlinux(void)
> >       /* btf_parse_vmlinux() runs under bpf_verifier_lock */
> >       bpf_ctx_convert.t = btf_type_by_id(btf, bpf_ctx_convert_btf_id[0]);
> >
> > -     /* find bpf map structs for map_ptr access checking */
> > -     err = btf_vmlinux_map_ids_init(btf, log);
> > -     if (err < 0)
> > -             goto errout;
> > -
>
> Looks nice. Please address build warn and resubmit.

Just noticed v2. Ignore the above.