Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220301132623.GA19995@vscode.7~>
In-Reply-To: <20220301132623.GA19995@vscode.7~>
From:   Magnus Karlsson <magnus.karlsson@gmail.com>
Date:   Wed, 2 Mar 2022 08:29:30 +0100
Message-ID: <CAJ8uoz2y2r1wS3_sSgZ8jC2fkiyNCW_q4oQdc_JYe2bKO4NoJA@mail.gmail.com>
Subject: Re: [PATCH bpf] libbpf: unmap rings when umem deleted
To:     lic121 <lic121@chinatelecom.cn>
Cc:     bpf <bpf@vger.kernel.org>,
        =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Jonathan Lemon <jonathan.lemon@gmail.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@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@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        Network Development <netdev@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Mar 1, 2022 at 6:57 PM lic121 <lic121@chinatelecom.cn> wrote:
>
> xsk_umem__create() does mmap for fill/comp rings, but xsk_umem__delete()
> doesn't do the unmap. This works fine for regular cases, because
> xsk_socket__delete() does unmap for the rings. But for the case that
> xsk_socket__create_shared() fails, umem rings are not unmapped.
>
> fill_save/comp_save are checked to determine if rings have already be
> unmapped by xsk. If fill_save and comp_save are NULL, it means that the
> rings have already been used by xsk. Then they are supposed to be
> unmapped by xsk_socket__delete(). Otherwise, xsk_umem__delete() does the
> unmap.

Thanks for the fix. Please note that the AF_XDP support in libbpf has
been deprecated and moved to libxdp
(https://github.com/xdp-project/xdp-tools). The code will be
completely removed in the libbpf 1.0 release. Could I take your patch
and apply it to libxdp instead and fix the bug there? I have not
checked, but it is likely present there as well. And that is the code
base we will be using going forward.

> Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices")
> Signed-off-by: lic121 <lic121@chinatelecom.cn>
> ---
>  tools/lib/bpf/xsk.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c
> index edafe56..32a2f57 100644
> --- a/tools/lib/bpf/xsk.c
> +++ b/tools/lib/bpf/xsk.c
> @@ -1193,12 +1193,23 @@ int xsk_socket__create(struct xsk_socket **xsk_ptr, const char *ifname,
>
>  int xsk_umem__delete(struct xsk_umem *umem)
>  {
> +       struct xdp_mmap_offsets off;
> +       int err;
> +
>         if (!umem)
>                 return 0;
>
>         if (umem->refcount)
>                 return -EBUSY;
>
> +       err = xsk_get_mmap_offsets(umem->fd, &off);
> +       if (!err && umem->fill_save && umem->comp_save) {
> +               munmap(umem->fill_save->ring - off.fr.desc,
> +                      off.fr.desc + umem->config.fill_size * sizeof(__u64));
> +               munmap(umem->comp_save->ring - off.cr.desc,
> +                      off.cr.desc + umem->config.comp_size * sizeof(__u64));
> +       }
> +
>         close(umem->fd);
>         free(umem);
>
> --
> 1.8.3.1
>