Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
MIME-Version: 1.0
References: <1698854083-136016-1-git-send-email-steven.sistare@oracle.com> <CAJaqyWfpgQcYbvRgYkvVAq5SiFVVJdWF9PLfOnvd7ipGcjYghA@mail.gmail.com>
In-Reply-To: <CAJaqyWfpgQcYbvRgYkvVAq5SiFVVJdWF9PLfOnvd7ipGcjYghA@mail.gmail.com>
From:   Jason Wang <jasowang@redhat.com>
Date:   Thu, 2 Nov 2023 16:15:18 +0800
Message-ID: <CACGkMEsNcuQNt+9od6D+O_RbxKcpG8U14zBSibRYz91SXiwZ7A@mail.gmail.com>
Subject: Re: [PATCH V2] vdpa/mlx5: preserve CVQ vringh index
To:     Eugenio Perez Martin <eperezma@redhat.com>
Cc:     Steve Sistare <steven.sistare@oracle.com>,
        virtualization@lists.linux-foundation.org,
        linux-kernel@vger.kernel.org,
        "Michael S. Tsirkin" <mst@redhat.com>, Eli Cohen <elic@nvidia.com>,
        Si-Wei Liu <si-wei.liu@oracle.com>,
        Dragos Tatulea <dtatulea@nvidia.com>,
        Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Nov 2, 2023 at 3:10=E2=80=AFPM Eugenio Perez Martin <eperezma@redha=
t.com> wrote:
>
> On Wed, Nov 1, 2023 at 4:55=E2=80=AFPM Steve Sistare <steven.sistare@orac=
le.com> wrote:
> >
> > mlx5_vdpa does not preserve userland's view of vring base for the contr=
ol
> > queue in the following sequence:
> >
> > ioctl VHOST_SET_VRING_BASE
> > ioctl VHOST_VDPA_SET_STATUS VIRTIO_CONFIG_S_DRIVER_OK
> >   mlx5_vdpa_set_status()
> >     setup_cvq_vring()
> >       vringh_init_iotlb()
> >         vringh_init_kern()
> >           vrh->last_avail_idx =3D 0;
> > ioctl VHOST_GET_VRING_BASE
> >
> > To fix, restore the value of cvq->vring.last_avail_idx after calling
> > vringh_init_iotlb.
> >
>
> Fixes tag missing?

+1

>
> Apart from that,
>
> Acked-by: Eugenio P=C3=A9rez <eperezma@redhat.com>

With the fix tag added.

Acked-by: Jason Wang <jasowang@redhat.com>

Thanks

>
> > Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
> > ---
> >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/=
mlx5_vnet.c
> > index 946488b8989f..ca972af3c89a 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -2795,13 +2795,18 @@ static int setup_cvq_vring(struct mlx5_vdpa_dev=
 *mvdev)
> >         struct mlx5_control_vq *cvq =3D &mvdev->cvq;
> >         int err =3D 0;
> >
> > -       if (mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ))
> > +       if (mvdev->actual_features & BIT_ULL(VIRTIO_NET_F_CTRL_VQ)) {
> > +               u16 idx =3D cvq->vring.last_avail_idx;
> > +
> >                 err =3D vringh_init_iotlb(&cvq->vring, mvdev->actual_fe=
atures,
> >                                         MLX5_CVQ_MAX_ENT, false,
> >                                         (struct vring_desc *)(uintptr_t=
)cvq->desc_addr,
> >                                         (struct vring_avail *)(uintptr_=
t)cvq->driver_addr,
> >                                         (struct vring_used *)(uintptr_t=
)cvq->device_addr);
> >
> > +               if (!err)
> > +                       cvq->vring.last_avail_idx =3D cvq->vring.last_u=
sed_idx =3D idx;
> > +       }
> >         return err;
> >  }
> >
> > --
> > 2.39.3
> >
>