MIME-Version: 1.0
References: <20230320203732.222345-1-nunog@fr24.com>
In-Reply-To: <20230320203732.222345-1-nunog@fr24.com>
From:   Magnus Karlsson <magnus.karlsson@gmail.com>
Date:   Tue, 21 Mar 2023 12:13:24 +0100
Message-ID: <CAJ8uoz2N4M+FB-ijzTrVm+91yhtqfKKwmPkxjefJrmSeJOocbg@mail.gmail.com>
Subject: Re: [PATCH bpf-next V2] xsk: allow remap of fill and/or completion rings
To:     =?UTF-8?Q?Nuno_Gon=C3=A7alves?= <nunog@fr24.com>
Cc:     =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Jonathan Lemon <jonathan.lemon@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Christian Brauner <brauner@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        netdev@vger.kernel.org, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, 20 Mar 2023 at 21:54, Nuno Gon=C3=A7alves <nunog@fr24.com> wrote:
>
> The remap of fill and completion rings was frowned upon as they
> control the usage of UMEM which does not support concurrent use.
> At the same time this would disallow the remap of these rings
> into another process.
>
> A possible use case is that the user wants to transfer the socket/
> UMEM ownership to another process (via SYS_pidfd_getfd) and so
> would need to also remap these rings.
>
> This will have no impact on current usages and just relaxes the
> remap limitation.

Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>

> Signed-off-by: Nuno Gon=C3=A7alves <nunog@fr24.com>
> ---
>  net/xdp/xsk.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
> index 2ac58b282b5eb..e2571ec067526 100644
> --- a/net/xdp/xsk.c
> +++ b/net/xdp/xsk.c
> @@ -1301,9 +1301,10 @@ static int xsk_mmap(struct file *file, struct sock=
et *sock,
>         loff_t offset =3D (loff_t)vma->vm_pgoff << PAGE_SHIFT;
>         unsigned long size =3D vma->vm_end - vma->vm_start;
>         struct xdp_sock *xs =3D xdp_sk(sock->sk);
> +       int state =3D READ_ONCE(xs->state);
>         struct xsk_queue *q =3D NULL;
>
> -       if (READ_ONCE(xs->state) !=3D XSK_READY)
> +       if (state !=3D XSK_READY && state !=3D XSK_BOUND)
>                 return -EBUSY;
>
>         if (offset =3D=3D XDP_PGOFF_RX_RING) {
> @@ -1314,9 +1315,11 @@ static int xsk_mmap(struct file *file, struct sock=
et *sock,
>                 /* Matches the smp_wmb() in XDP_UMEM_REG */
>                 smp_rmb();
>                 if (offset =3D=3D XDP_UMEM_PGOFF_FILL_RING)
> -                       q =3D READ_ONCE(xs->fq_tmp);
> +                       q =3D READ_ONCE(state =3D=3D XSK_READY ? xs->fq_t=
mp :
> +                                                          xs->pool->fq);
>                 else if (offset =3D=3D XDP_UMEM_PGOFF_COMPLETION_RING)
> -                       q =3D READ_ONCE(xs->cq_tmp);
> +                       q =3D READ_ONCE(state =3D=3D XSK_READY ? xs->cq_t=
mp :
> +                                                          xs->pool->cq);
>         }
>
>         if (!q)
> --
> 2.40.0
>