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: <20230324100222.13434-1-nunog@fr24.com> <ZB2VNg7yVxAjJEMV@boxer>
In-Reply-To: <ZB2VNg7yVxAjJEMV@boxer>
From:   Magnus Karlsson <magnus.karlsson@gmail.com>
Date:   Fri, 24 Mar 2023 14:30:17 +0100
Message-ID: <CAJ8uoz3f1=MPiranw7iU0DWNuBka4g7hNn5POgoFVHbOkun8OQ@mail.gmail.com>
Subject: Re: [PATCH bpf-next V4] xsk: allow remap of fill and/or completion rings
To:     Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Cc:     =?UTF-8?Q?Nuno_Gon=C3=A7alves?= <nunog@fr24.com>,
        =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@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 Fri, 24 Mar 2023 at 13:22, Maciej Fijalkowski
<maciej.fijalkowski@intel.com> wrote:
>
> On Fri, Mar 24, 2023 at 10:02:22AM +0000, Nuno Gon=C3=A7alves 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.
> >
> > Signed-off-by: Nuno Gon=C3=A7alves <nunog@fr24.com>
> > ---
> > V3 -> V4: Remove undesired format changes
> > V2 -> V3: Call READ_ONCE for each variable and not for the ternary oper=
ator
> > V1 -> V2: Format and comment changes
>
> thanks, it now looks good to me, i applied this locally and it builds, so=
:
> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
>
> but i am giving a last call to Magnus since he was acking this before.

I have already acked it, but I can do it twice.
Acked-by: Magnus Karlsson <magnus.karlsson@intel.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..cc1e7f15fa731 100644
> > --- a/net/xdp/xsk.c
> > +++ b/net/xdp/xsk.c
> > @@ -1301,9 +1301,10 @@ static int xsk_mmap(struct file *file, struct so=
cket *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 so=
cket *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 state =3D=3D XSK_READY ? READ_ONCE(xs->fq_t=
mp) :
> > +                                              READ_ONCE(xs->pool->fq);
> >               else if (offset =3D=3D XDP_UMEM_PGOFF_COMPLETION_RING)
> > -                     q =3D READ_ONCE(xs->cq_tmp);
> > +                     q =3D state =3D=3D XSK_READY ? READ_ONCE(xs->cq_t=
mp) :
> > +                                              READ_ONCE(xs->pool->cq);
> >       }
> >
> >       if (!q)
> > --
> > 2.40.0
> >