Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
MIME-Version: 1.0
References: <20220222204236.2192513-1-stijn@linux-ipv6.be> <CAPhsuW6WgjL_atKCivbk5iMNBFHuSGcjAC0tdZYag2fOesUBKA@mail.gmail.com>
In-Reply-To: <CAPhsuW6WgjL_atKCivbk5iMNBFHuSGcjAC0tdZYag2fOesUBKA@mail.gmail.com>
From:   Andrii Nakryiko <andrii.nakryiko@gmail.com>
Date:   Wed, 23 Feb 2022 15:15:29 -0800
Message-ID: <CAEf4BzYuk2Rur-pae7gbuXSb=ayJ0fUREStdWyorWgd_q1D9zQ@mail.gmail.com>
Subject: Re: [PATCH] libbpf: fix BPF_MAP_TYPE_PERF_EVENT_ARRAY auto-pinning
To:     Song Liu <song@kernel.org>
Cc:     Stijn Tintel <stijn@linux-ipv6.be>,
        =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= <toke@redhat.com>,
        Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        KP Singh <kpsingh@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Yonghong Song <yhs@fb.com>, Song Liu <songliubraving@fb.com>,
        Martin KaFai Lau <kafai@fb.com>,
        Andrii Nakryiko <andrii@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Feb 22, 2022 at 6:37 PM Song Liu <song@kernel.org> wrote:
>
> On Tue, Feb 22, 2022 at 12:51 PM Stijn Tintel <stijn@linux-ipv6.be> wrote:
> >
> > When a BPF map of type BPF_MAP_TYPE_PERF_EVENT_ARRAY doesn't have the
> > max_entries parameter set, this parameter will be set to the number of
> > possible CPUs. Due to this, the map_is_reuse_compat function will return
> > false, causing the following error when trying to reuse the map:
> >
> > libbpf: couldn't reuse pinned map at '/sys/fs/bpf/m_logging': parameter mismatch
> >
> > Fix this by checking against the number of possible CPUs if the
> > max_entries parameter is not set in the map definition.
> >
> > Fixes: 57a00f41644f ("libbpf: Add auto-pinning of maps when loading BPF objects")
> > Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
>
> Acked-by: Song Liu <songliubraving@fb.com>
>
> I think the following fix would be more future proof, but the patch
> as-is is better for
> stable backport? How about we add a follow up patch on top of current
> patch to fix
> def->max_entries once for all?

Keeping special logic for PERF_EVENT_ARRAY in one place is
preferrable. With this, the changes in map_is_reuse_compat() shouldn't
be necessary at all. Stijn, can you please send v2 with Song's
proposed changes?

>
> Thanks,
> Song
>
> diff --git i/tools/lib/bpf/libbpf.c w/tools/lib/bpf/libbpf.c
> index ad43b6ce825e..a1bc1c80bc69 100644
> --- i/tools/lib/bpf/libbpf.c
> +++ w/tools/lib/bpf/libbpf.c
> @@ -4881,10 +4881,9 @@ static int bpf_object__create_map(struct
> bpf_object *obj, struct bpf_map *map, b
>                         return nr_cpus;
>                 }
>                 pr_debug("map '%s': setting size to %d\n", map->name, nr_cpus);
> -               max_entries = nr_cpus;
> -       } else {
> -               max_entries = def->max_entries;
> +               def->max_entries = nr_cpus;
>         }
> +       max_entries = def->max_entries;
>
>         if (bpf_map__is_struct_ops(map))
>                 create_attr.btf_vmlinux_value_type_id =
> map->btf_vmlinux_value_type_id;