vhost-vsock: force virtio version 1
v4 cover vhost-vsock: force virtio version 1
v4:
- Patch 1: fixed commit message and warning message [Cornelia]
- Patch 3: added comment in the code [Cornelia]
- Added Cornelia's R-b tags
v3: https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg06549.html
v2: https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg04437.html
v1: https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg04373.html
Recently changes in QEMU 5.1 requires to set 'disable-legacy=on' on vhost-vsock-pci and vhost-user-vsock-pci devices:
$ ./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=onAs discussed with Cornelia [2], this series forces virtio version 1 to vhost-vsock-pci, vhost-user-vsock-pci, and vhost-vsock-ccw devices.
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 series should be merged in stable branch since it fixes migration issues with QEMU 5.1:
- we skip legacy support check in the old machine types (< 5.1)
- we force virtio version 1 for vhost-vsock-pci and vhost-vsock-ccw devices only in the new machine types (>= 5.1). vhost-user-vsock-pci was introduced in 5.1 and doesn't support migration, so we forced virtio version 1 in any case,
Thanks,
Stefano
[1] https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg05312.html
[2] https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg02515.html
Stefano Garzarella (4):
virtio: skip legacy support check on machine types less than 5.1
vhost-vsock-pci: force virtio version 1
vhost-user-vsock-pci: force virtio version 1
vhost-vsock-ccw: force virtio version 1
include/hw/virtio/virtio.h | 2 ++ hw/core/machine.c | 1 + hw/s390x/vhost-vsock-ccw.c | 12 ++++++++++++ hw/s390x/virtio-ccw.c | 15 ++++++++++++--- hw/virtio/vhost-user-vsock-pci.c | 4 +++- hw/virtio/vhost-vsock-pci.c | 10 +++++++++- hw/virtio/virtio-pci.c | 14 ++++++++++++-- hw/virtio/virtio.c | 7 +++++++ 8 files changed, 58 insertions(+), 7 deletions(-)
Signature · 1 line
2.26.2
PATCH v4 1/4 virtio: skip legacy support check on machine types less than 5.1
Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a check that returns an error if legacy support is on, but the device does not support legacy.
Unfortunately some devices were wrongly declared legacy capable even if they were not (e.g vhost-vsock).
To avoid migration issues, we add a virtio-device property (x-disable-legacy-check) to skip the legacy error, printing a warning instead, for machine types < 5.1.
---
v4:
- fixed commit message and warning message [Cornelia]
v3:
- added virtio_legacy_check_disabled() helper
- moved warning where error was returned [Cornelia]
v2:
- fixed Cornelia's e-mail address
--- include/hw/virtio/virtio.h | 2 ++ hw/core/machine.c | 1 + hw/s390x/virtio-ccw.c | 15 ++++++++++++--- hw/virtio/virtio-pci.c | 14 ++++++++++++-- hw/virtio/virtio.c | 7 +++++++ 5 files changed, 34 insertions(+), 5 deletions(-)
include/hw/virtio/virtio.h +2 -0
@@ -103,6 +103,7 @@ struct VirtIODevicebool use_started;bool started;bool start_on_kick;/* when virtio 1.0 feature has not been negotiated */ +bool disable_legacy_check;VMChangeStateEntry *vmstate;char *bus_name;uint8_t device_endian;
@@ -396,5 +397,6 @@ static inline bool virtio_device_disabled(VirtIODevice *vdev) }bool virtio_legacy_allowed (VirtIODevice *vdev); +bool virtio_legacy_check_disabled (VirtIODevice *vdev);#endif
hw/core/machine.c +1 -0
@@ -44,6 +44,7 @@ GlobalProperty hw_compat_5_0[] = { { "vmport", "x-signal-unsupported-cmd", "off" }, { "vmport", "x-report-vmx-type", "off" }, { "vmport", "x-cmds-v2", "off" }, + { "virtio-device", "x-disable-legacy-check", "true" }, };const size_t hw_compat_5_0_len =G_N_ELEMENTS (hw_compat_5_0);
hw/s390x/virtio-ccw.c +12 -3
@@ -1122,9 +1122,18 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) }if (!virtio_ccw_rev_max (dev) && !virtio_legacy_allowed (vdev)) { -error_setg (errp,"Invalid value of property max_rev " -"(is %d expected >= 1)" ,virtio_ccw_rev_max (dev)); -return ; +/* +* To avoid migration issues, we allow legacy mode when legacy +* check is disabled in the old machine types (< 5.1). +*/ +if (virtio_legacy_check_disabled (vdev)) { +warn_report ("device requires revision >= 1, but for backward " +"compatibility max_revision=0 is allowed" ); + }else { +error_setg (errp,"Invalid value of property max_rev " +"(is %d expected >= 1)" ,virtio_ccw_rev_max (dev)); +return ; + } }if (virtio_get_num_queues (vdev) >VIRTIO_QUEUE_MAX ) {
hw/virtio/virtio-pci.c +12 -2
@@ -1597,8 +1597,18 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)if (legacy) {if (!virtio_legacy_allowed (vdev)) { -error_setg (errp,"device is modern-only, use disable-legacy=on" ); -return ; +/* +* To avoid migration issues, we allow legacy mode when legacy +* check is disabled in the old machine types (< 5.1). +*/ +if (virtio_legacy_check_disabled (vdev)) { +warn_report ("device is modern-only, but for backward " +"compatibility legacy is allowed" ); + }else { +error_setg (errp, +"device is modern-only, use disable-legacy=on" ); +return ; + } }if (virtio_host_has_feature (vdev,VIRTIO_F_IOMMU_PLATFORM )) { error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
hw/virtio/virtio.c +7 -0
@@ -3304,6 +3304,11 @@ bool virtio_legacy_allowed(VirtIODevice *vdev) } } +bool virtio_legacy_check_disabled (VirtIODevice *vdev) +{ +return vdev->disable_legacy_check; +} +hwaddr virtio_queue_get_desc_addr (VirtIODevice *vdev,int n) {return vdev->vq[n].vring.desc;
@@ -3713,6 +3718,8 @@ static Property virtio_properties[] = {DEFINE_VIRTIO_COMMON_FEATURES (VirtIODevice, host_features),DEFINE_PROP_BOOL ("use-started" , VirtIODevice, use_started, true),DEFINE_PROP_BOOL ("use-disabled-flag" , VirtIODevice, use_disabled_flag, true), +DEFINE_PROP_BOOL ("x-disable-legacy-check" , VirtIODevice, + disable_legacy_check, false), DEFINE_PROP_END_OF_LIST(), };
Signature · 1 line
2.26.2
Re: [PATCH v4 1/4] virtio: skip legacy support check on machine types less than 5.1
Quoted 33 lines · On Mon, 21 Sep 2020 10:38:04 +0200 Stefano Garzarella <[email protected]>…
Commit
9b3a35ec82("virtio: verify that legacy support is not accidentally on") added a check that returns an error if legacy support is on, but the device does not support legacy.Unfortunately some devices were wrongly declared legacy capable even if they were not (e.g vhost-vsock).
To avoid migration issues, we add a virtio-device property (x-disable-legacy-check) to skip the legacy error, printing a warning instead, for machine types < 5.1.
Fixes 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on")Suggested-by Dr. David Alan Gilbert <[email protected]>Suggested-by Cornelia Huck <[email protected]>Reviewed-by Cornelia Huck <[email protected]>Signed-off-by Stefano Garzarella <[email protected]>---
v4:
- fixed commit message and warning message [Cornelia]
v3:
- addedvirtio_legacy_check_disabled()helper
- moved warning where error was returned [Cornelia]
v2:
- fixed Cornelia's e-mail address--- include/hw/virtio/virtio.h | 2 ++ hw/core/machine.c | 1 + hw/s390x/virtio-ccw.c | 15 ++++++++++++--- hw/virtio/virtio-pci.c | 14 ++++++++++++-- hw/virtio/virtio.c | 7 +++++++ 5 files changed, 34 insertions(+), 5 deletions(-)
(...)
Quoted 8 lines
hw/s390x/virtio-ccw.c +0
-0@@ -1122,9 +1122,18 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) }if (!virtio_ccw_rev_max (dev) && !virtio_legacy_allowed (vdev)) {
hw/s390x/virtio-ccw.c static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) · line 1131
Quoted 10 lines
hw/s390x/virtio-ccw.c +7
-3-error_setg (errp,"Invalid value of property max_rev " -"(is %d expected >= 1)" ,virtio_ccw_rev_max (dev)); -return ; +/* +* To avoid migration issues, we allow legacy mode when legacy +* check is disabled in the old machine types (< 5.1). +*/ +if (virtio_legacy_check_disabled (vdev)) { +warn_report ("device requires revision >= 1, but for backward " +"compatibility max_revision=0 is allowed" );
Message looks good to me.
Quoted 8 lines
hw/s390x/virtio-ccw.c +5
-0+ }else { +error_setg (errp,"Invalid value of property max_rev " +"(is %d expected >= 1)" ,virtio_ccw_rev_max (dev)); +return ; + } }if (virtio_get_num_queues (vdev) >VIRTIO_QUEUE_MAX ) {
(...)
Re: [PATCH v4 1/4] virtio: skip legacy support check on machine types less than 5.1
Quoted 46 lines · Cornelia Huck
Quoted 33 lines · On Mon, 21 Sep 2020 10:38:04 +0200 Stefano Garzarella <[email protected]>…
Commit
9b3a35ec82("virtio: verify that legacy support is not accidentally on") added a check that returns an error if legacy support is on, but the device does not support legacy.Unfortunately some devices were wrongly declared legacy capable even if they were not (e.g vhost-vsock).
To avoid migration issues, we add a virtio-device property (x-disable-legacy-check) to skip the legacy error, printing a warning instead, for machine types < 5.1.
Fixes 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on")Suggested-by Dr. David Alan Gilbert <[email protected]>Suggested-by Cornelia Huck <[email protected]>Reviewed-by Cornelia Huck <[email protected]>Signed-off-by Stefano Garzarella <[email protected]>---
v4:
- fixed commit message and warning message [Cornelia]
v3:
- addedvirtio_legacy_check_disabled()helper
- moved warning where error was returned [Cornelia]
v2:
- fixed Cornelia's e-mail address--- include/hw/virtio/virtio.h | 2 ++ hw/core/machine.c | 1 + hw/s390x/virtio-ccw.c | 15 ++++++++++++--- hw/virtio/virtio-pci.c | 14 ++++++++++++-- hw/virtio/virtio.c | 7 +++++++ 5 files changed, 34 insertions(+), 5 deletions(-)(...)
Quoted 7 lines
hw/s390x/virtio-ccw.c +0
-0@@ -1122,9 +1122,18 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) }
Quoted 11 lines
hw/s390x/virtio-ccw.c static void virtio_ccw_device_plugged(DeviceState *d, Error **errp) · line 1131
Quoted 11 lines
hw/s390x/virtio-ccw.c +7
-3if (!virtio_ccw_rev_max (dev) && !virtio_legacy_allowed (vdev)) { -error_setg (errp,"Invalid value of property max_rev " -"(is %d expected >= 1)" ,virtio_ccw_rev_max (dev)); -return ; +/* +* To avoid migration issues, we allow legacy mode when legacy +* check is disabled in the old machine types (< 5.1). +*/ +if (virtio_legacy_check_disabled (vdev)) { +warn_report ("device requires revision >= 1, but for backward " +"compatibility max_revision=0 is allowed" );
I forgot to mention that I changed 'max_rev' to 'max_revision' since it is the parameter that the user can touch.
Quoted 2 lines
Message looks good to me.
Thanks!
Stefano
Quoted 12 lines
Quoted 9 lines
hw/s390x/virtio-ccw.c +5
-0+ }else { +error_setg (errp,"Invalid value of property max_rev " +"(is %d expected >= 1)" ,virtio_ccw_rev_max (dev)); +return ; + } }if (virtio_get_num_queues (vdev) >VIRTIO_QUEUE_MAX ) {(...)
PATCH v4 2/4 vhost-vsock-pci: force virtio version 1
In reply to Stefano GarzarellaCommit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check 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=onvirtio-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 removes the 'transitional_name' property removing the need to specify 'disable-legacy=on' on vhost-vsock-pci device.
To avoid migration issues, we force virtio version 1 only when legacy check is enabled in the new machine types (>= 5.1).
---
v3:
- forced virtio version 1 only with new machine types
v2:
- fixed commit message [Cornelia]
--- hw/virtio/vhost-vsock-pci.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
hw/virtio/vhost-vsock-pci.c +9 -1
@@ -44,6 +44,15 @@ static void vhost_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) {VHostVSockPCI *dev =VHOST_VSOCK_PCI (vpci_dev);DeviceState *vdev =DEVICE (&dev->vdev); +VirtIODevice *virtio_dev =VIRTIO_DEVICE (vdev); + +/* +* To avoid migration issues, we force virtio version 1 only when +* legacy check is enabled in the new machine types (>= 5.1). +*/ +if (!virtio_legacy_check_disabled (virtio_dev)) { +virtio_pci_force_virtio_1 (vpci_dev); + }qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }
@@ -73,7 +82,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,
Signature · 1 line
2.26.2
Re: [PATCH v4 2/4] vhost-vsock-pci: force virtio version 1
Quoted 14 lines · On Mon, 21 Sep 2020 10:38:05 +0200 Stefano Garzarella <[email protected]>…
Commit
9b3a35ec82("virtio: verify that legacy support is not accidentally on") added a safety check 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=onvirtio-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.
Quoted 6 lines
This patch forces virtio version 1 and removes the '
transitional_name' property removing the need to specify 'disable-legacy=on' on vhost-vsock-pci device.To avoid migration issues, we force virtio version 1 only when legacy check is enabled in the new machine types (>= 5.1).
Maybe add
"As the transitional device name is not commonly used, we do not provide compatibility handling for it." ?
Quoted 7 lines
Reported-by Qian Cai <[email protected]>Reported-by Qinghua Cheng <[email protected]>Suggested-by Cornelia Huck <[email protected]>Signed-off-by Stefano Garzarella <[email protected]>
Quoted 9 lines
---
v3:
- forced virtio version 1 only with new machine types
v2:
- fixed commit message [Cornelia]--- hw/virtio/vhost-vsock-pci.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Re: [PATCH v4 2/4] vhost-vsock-pci: force virtio version 1
Quoted 21 lines · Cornelia Huck
Quoted 18 lines · On Mon, 21 Sep 2020 10:38:05 +0200 Stefano Garzarella <[email protected]>…
Commit
9b3a35ec82("virtio: verify that legacy support is not accidentally on") added a safety check 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=onvirtio-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 removes the '
transitional_name' property removing the need to specify 'disable-legacy=on' on vhost-vsock-pci device.
Quoted 7 lines
Quoted 2 lines
To avoid migration issues, we force virtio version 1 only when legacy check is enabled in the new machine types (>= 5.1).
Maybe add
"As the transitional device name is not commonly used, we do not provide compatibility handling for it." ?
Yes, I'll add in v5.
Quoted 18 lines
Quoted 8 lines
Reported-by Qian Cai <[email protected]>Reported-by Qinghua Cheng <[email protected]>Suggested-by Cornelia Huck <[email protected]>Signed-off-by Stefano Garzarella <[email protected]>Quoted 9 lines
---
v3:
- forced virtio version 1 only with new machine types
v2:
- fixed commit message [Cornelia]--- hw/virtio/vhost-vsock-pci.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Quoted 1 line
Reviewed-by Cornelia Huck <[email protected]>
Thanks,
Stefano
PATCH v4 3/4 vhost-user-vsock-pci: force virtio version 1
In reply to Stefano GarzarellaCommit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=on' on vhost-user-vsock-pci device:
$ ./qemu-system-x86_64 ... \
-chardev socket,id=char0,reconnect=0,path=/tmp/vhost4.socket \
-device vhost-user-vsock-pci,chardev=char0
qemu-system-x86_64: -device vhost-user-vsock-pci,chardev=char0:
device is modern-only, use disable-legacy=onvirtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'.
This patch forces virtio version 1 and removes the 'transitional_name' property, as done for vhost-vsock-pci, removing the need to specify 'disable-legacy=on' on vhost-user-vsock-pci device.
---
v4:
- added comment in the code [Cornelia]
v2:
- fixed commit message [Cornelia]
--- hw/virtio/vhost-user-vsock-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/virtio/vhost-user-vsock-pci.c +3 -1
@@ -41,6 +41,9 @@ static void vhost_user_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)VHostUserVSockPCI *dev =VHOST_USER_VSOCK_PCI (vpci_dev);DeviceState *vdev =DEVICE (&dev->vdev); +/* unlike vhost-vsock, we do not need to care about pre-5.1 compat */ +virtio_pci_force_virtio_1 (vpci_dev); +qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }
@@ -69,7 +72,6 @@ static void vhost_user_vsock_pci_instance_init(Object *obj)static const VirtioPCIDeviceTypeInfo vhost_user_vsock_pci_info = { .base_name =TYPE_VHOST_USER_VSOCK_PCI , .generic_name ="vhost-user-vsock-pci" , - .transitional_name ="vhost-user-vsock-pci-transitional" , .non_transitional_name ="vhost-user-vsock-pci-non-transitional" , .instance_size =sizeof (VHostUserVSockPCI), .instance_init = vhost_user_vsock_pci_instance_init,
Signature · 1 line
2.26.2
PATCH v4 4/4 vhost-vsock-ccw: force virtio version 1
In reply to Stefano Garzarellavirtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'.
This patch forces virtio version 1 as done for vhost-vsock-pci.
To avoid migration issues, we force virtio version 1 only when legacy check is enabled in the new machine types (>= 5.1).
---
v3:
- forced virtio version 1 only with new machine types
--- hw/s390x/vhost-vsock-ccw.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
hw/s390x/vhost-vsock-ccw.c +12 -0
@@ -40,9 +40,21 @@ static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)static void vhost_vsock_ccw_instance_init (Object *obj) {VHostVSockCCWState *dev =VHOST_VSOCK_CCW (obj); +VirtioCcwDevice *ccw_dev =VIRTIO_CCW_DEVICE (obj); +VirtIODevice *virtio_dev;virtio_instance_init_common (obj, &dev->vdev,sizeof (dev->vdev),TYPE_VHOST_VSOCK ); + + virtio_dev =VIRTIO_DEVICE (&dev->vdev); + +/* +* To avoid migration issues, we force virtio version 1 only when +* legacy check is enabled in the new machine types (>= 5.1). +*/ +if (!virtio_legacy_check_disabled (virtio_dev)) { + ccw_dev->force_revision_1 = true; + } }static const TypeInfo vhost_vsock_ccw_info = {
Signature · 1 line
2.26.2