diff mbox series

[1/3] vhost-vsock-pci: force virtio version 1

Message ID 20200819105156.54163-2-sgarzare@redhat.com (mailing list archive)
State New, archived
Headers show
Series vhost-vsock: force virtio version 1 | expand

Commit Message

Stefano Garzarella Aug. 19, 2020, 10:51 a.m. UTC
Commit 9b3a35ec82 ("virtio: verify that legacy support is not
accidentally on") added a safety checks that requires to set
'disable-legacy=on' on vhost-vsock-pci device:

    $ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=5
        qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=5:
        device is modern-only, use disable-legacy=on

virtio-vsock was introduced after the release of VIRTIO 1.0
specifications, so it should be 'modern-only'.
In addition Cornelia verified that forcing a legacy mode on
vhost-vsock-pci device using x86-64 host and s390x guest, so with
different endianness, produces strange behaviours.

This patch forces virtio version 1 and remove 'transitional_name'
properties removing the need to specify 'disable-legacy=on' on
vhost-vsock-pci device.

Cc: qemu-stable@nongnu.org
Reported-by: Qian Cai <caiqian@redhat.com>
Reported-by: Qinghua Cheng <qcheng@redhat.com>
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1868449
Suggested-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
 hw/virtio/vhost-vsock-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Cornelia Huck Aug. 19, 2020, 11:55 a.m. UTC | #1
On Wed, 19 Aug 2020 12:51:54 +0200
Stefano Garzarella <sgarzare@redhat.com> wrote:

> Commit 9b3a35ec82 ("virtio: verify that legacy support is not
> accidentally on") added a safety checks that requires to set

Nit: s/checks/check/ (also in patch 2)

> 'disable-legacy=on' on vhost-vsock-pci device:
> 
>     $ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=5
>         qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=5:
>         device is modern-only, use disable-legacy=on
> 
> virtio-vsock was introduced after the release of VIRTIO 1.0
> specifications, so it should be 'modern-only'.
> In addition Cornelia verified that forcing a legacy mode on
> vhost-vsock-pci device using x86-64 host and s390x guest, so with
> different endianness, produces strange behaviours.
> 
> This patch forces virtio version 1 and remove 'transitional_name'
> properties removing the need to specify 'disable-legacy=on' on

"removes the 'transitional_name' property" ?

(Unless you want to merge with patch 2, which might make sense.)

> vhost-vsock-pci device.
> 
> Cc: qemu-stable@nongnu.org
> Reported-by: Qian Cai <caiqian@redhat.com>
> Reported-by: Qinghua Cheng <qcheng@redhat.com>
> Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1868449
> Suggested-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
> ---
>  hw/virtio/vhost-vsock-pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Stefano Garzarella Aug. 19, 2020, 12:09 p.m. UTC | #2
On Wed, Aug 19, 2020 at 01:55:42PM +0200, Cornelia Huck wrote:
> On Wed, 19 Aug 2020 12:51:54 +0200
> Stefano Garzarella <sgarzare@redhat.com> wrote:
> 
> > Commit 9b3a35ec82 ("virtio: verify that legacy support is not
> > accidentally on") added a safety checks that requires to set
> 
> Nit: s/checks/check/ (also in patch 2)

I'll fix.

> 
> > 'disable-legacy=on' on vhost-vsock-pci device:
> > 
> >     $ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=5
> >         qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=5:
> >         device is modern-only, use disable-legacy=on
> > 
> > virtio-vsock was introduced after the release of VIRTIO 1.0
> > specifications, so it should be 'modern-only'.
> > In addition Cornelia verified that forcing a legacy mode on
> > vhost-vsock-pci device using x86-64 host and s390x guest, so with
> > different endianness, produces strange behaviours.
> > 
> > This patch forces virtio version 1 and remove 'transitional_name'
> > properties removing the need to specify 'disable-legacy=on' on
> 
> "removes the 'transitional_name' property" ?

It is better, I'll fix.

> 
> (Unless you want to merge with patch 2, which might make sense.)

I left seprated because vhost-user-vsock-pci was introduced in QEMU 5.1,
so I wanted to make it easier to backport on others stable branches.
(I'm not sure if we continue to support 4.2).

Does it make sense to keep them separated?

> 
> > vhost-vsock-pci device.
> > 
> > Cc: qemu-stable@nongnu.org
> > Reported-by: Qian Cai <caiqian@redhat.com>
> > Reported-by: Qinghua Cheng <qcheng@redhat.com>
> > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1868449
> > Suggested-by: Cornelia Huck <cohuck@redhat.com>
> > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
> > ---
> >  hw/virtio/vhost-vsock-pci.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> 

Thanks,
Stefano
Cornelia Huck Aug. 19, 2020, 12:28 p.m. UTC | #3
On Wed, 19 Aug 2020 14:09:10 +0200
Stefano Garzarella <sgarzare@redhat.com> wrote:

> On Wed, Aug 19, 2020 at 01:55:42PM +0200, Cornelia Huck wrote:
> > On Wed, 19 Aug 2020 12:51:54 +0200
> > Stefano Garzarella <sgarzare@redhat.com> wrote:
> >   
> > > Commit 9b3a35ec82 ("virtio: verify that legacy support is not
> > > accidentally on") added a safety checks that requires to set  
> > 
> > Nit: s/checks/check/ (also in patch 2)  
> 
> I'll fix.
> 
> >   
> > > 'disable-legacy=on' on vhost-vsock-pci device:
> > > 
> > >     $ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=5
> > >         qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=5:
> > >         device is modern-only, use disable-legacy=on
> > > 
> > > virtio-vsock was introduced after the release of VIRTIO 1.0
> > > specifications, so it should be 'modern-only'.
> > > In addition Cornelia verified that forcing a legacy mode on
> > > vhost-vsock-pci device using x86-64 host and s390x guest, so with
> > > different endianness, produces strange behaviours.
> > > 
> > > This patch forces virtio version 1 and remove 'transitional_name'
> > > properties removing the need to specify 'disable-legacy=on' on  
> > 
> > "removes the 'transitional_name' property" ?  
> 
> It is better, I'll fix.
> 
> > 
> > (Unless you want to merge with patch 2, which might make sense.)  
> 
> I left seprated because vhost-user-vsock-pci was introduced in QEMU 5.1,
> so I wanted to make it easier to backport on others stable branches.
> (I'm not sure if we continue to support 4.2).
> 
> Does it make sense to keep them separated?

Yes, indeed, it makes sense for stable backporting purposes.
diff mbox series

Patch

diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c
index a815278e69..d1fcad0472 100644
--- a/hw/virtio/vhost-vsock-pci.c
+++ b/hw/virtio/vhost-vsock-pci.c
@@ -44,6 +44,7 @@  static void vhost_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VHostVSockPCI *dev = VHOST_VSOCK_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&dev->vdev);
 
+    virtio_pci_force_virtio_1(vpci_dev);
     qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
@@ -72,7 +73,6 @@  static void vhost_vsock_pci_instance_init(Object *obj)
 static const VirtioPCIDeviceTypeInfo vhost_vsock_pci_info = {
     .base_name             = TYPE_VHOST_VSOCK_PCI,
     .generic_name          = "vhost-vsock-pci",
-    .transitional_name     = "vhost-vsock-pci-transitional",
     .non_transitional_name = "vhost-vsock-pci-non-transitional",
     .instance_size = sizeof(VHostVSockPCI),
     .instance_init = vhost_vsock_pci_instance_init,