virtio: Call set_features during reset
v2 cover virtio: Call set_features during reset
virtio-net expects set_features() will be called when the feature set used by the guest changes to update the number of virtqueues but it is not called during reset, which will clear all features, leaving the queues added for VIRTIO_NET_F_MQ or VIRTIO_NET_F_RSS. Not only these extra queues are visible to the guest, they will cause segmentation fault during migration.
Call set_features() during reset to remove those queues for virtio-net as we call set_status(). It will also prevent similar bugs for virtio-net and other devices in the future.
---
Changes in v2:
- Described possible consequences without this fix.
- Extracted the change to move virtio_reset() into another patch.
- Link to v1: https://lore.kernel.org/qemu-devel/[email protected]
---
Akihiko Odaki (2):
virtio: Call set_features during reset
virtio: Move virtio_reset()
hw/virtio/virtio.c | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-)
---
base-commit: 825b96dbcee23d134b691fc75618b59c5f53da32
change-id: 20250406-reset-5ed5248ee3c1
Best regards,
Signature · 1 line
Akihiko Odaki <[email protected]>
PATCH v2 1/2 virtio: Call set_features during reset
virtio-net expects set_features() will be called when the feature set used by the guest changes to update the number of virtqueues but it is not called during reset, which will clear all features, leaving the queues added for VIRTIO_NET_F_MQ or VIRTIO_NET_F_RSS. Not only these extra queues are visible to the guest, they will cause segmentation fault during migration.
Call set_features() during reset to remove those queues for virtio-net as we call set_status(). It will also prevent similar bugs for virtio-net and other devices in the future.
--- hw/virtio/virtio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/virtio/virtio.c +3 -1
@@ -2316,6 +2316,8 @@ void virtio_queue_enable(VirtIODevice *vdev, uint32_t queue_index) } } +static int virtio_set_features_nocheck (VirtIODevice *vdev,uint64_t val); +void virtio_reset (void *opaque) {VirtIODevice *vdev = opaque;
@@ -2346,7 +2348,7 @@ void virtio_reset(void *opaque) vdev->start_on_kick = false; vdev->started = false; vdev->broken = false; - vdev->guest_features =0 ; +virtio_set_features_nocheck (vdev,0 ); vdev->queue_sel =0 ; vdev->status =0 ; vdev->disabled = false;
Signature · 1 line
2.49.0
PATCH v2 2/2 virtio: Move virtio_reset()
In reply to Akihiko OdakiMove virtio_reset() to a later part of the file to remove the forward declaration of virtio_set_features_nocheck() and to prepare the situation that we need more operations to perform during reset.
--- hw/virtio/virtio.c | 88 ++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 45 deletions(-)
hw/virtio/virtio.c +43 -45
@@ -2316,51 +2316,6 @@ void virtio_queue_enable(VirtIODevice *vdev, uint32_t queue_index) } } -static int virtio_set_features_nocheck (VirtIODevice *vdev,uint64_t val); - -void virtio_reset (void *opaque) -{ -VirtIODevice *vdev = opaque; -VirtioDeviceClass *k =VIRTIO_DEVICE_GET_CLASS (vdev); -int i; - -virtio_set_status (vdev,0 ); -if (current_cpu) { -/* Guest initiated reset */ - vdev->device_endian =virtio_current_cpu_endian (); - }else { -/* System reset */ - vdev->device_endian =virtio_default_endian (); - } - -if (k->get_vhost) { -struct vhost_dev *hdev = k->get_vhost (vdev); -/* Only reset when vhost back-end is connected */ -if (hdev && hdev->vhost_ops) { -vhost_reset_device (hdev); - } - } - -if (k->reset) { - k->reset (vdev); - } - - vdev->start_on_kick = false; - vdev->started = false; - vdev->broken = false; -virtio_set_features_nocheck (vdev,0 ); - vdev->queue_sel =0 ; - vdev->status =0 ; - vdev->disabled = false; -qatomic_set (&vdev->isr,0 ); - vdev->config_vector =VIRTIO_NO_VECTOR ; -virtio_notify_vector (vdev, vdev->config_vector); - -for (i =0 ; i <VIRTIO_QUEUE_MAX ; i++) { -__virtio_queue_reset (vdev, i); - } -} -void virtio_queue_set_addr (VirtIODevice *vdev,int n,hwaddr addr) {if (!vdev->vq[n].vring.num) {
@@ -3171,6 +3126,49 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)return ret; } +void virtio_reset (void *opaque) +{ +VirtIODevice *vdev = opaque; +VirtioDeviceClass *k =VIRTIO_DEVICE_GET_CLASS (vdev); +int i; + +virtio_set_status (vdev,0 ); +if (current_cpu) { +/* Guest initiated reset */ + vdev->device_endian =virtio_current_cpu_endian (); + }else { +/* System reset */ + vdev->device_endian =virtio_default_endian (); + } + +if (k->get_vhost) { +struct vhost_dev *hdev = k->get_vhost (vdev); +/* Only reset when vhost back-end is connected */ +if (hdev && hdev->vhost_ops) { +vhost_reset_device (hdev); + } + } + +if (k->reset) { + k->reset (vdev); + } + + vdev->start_on_kick = false; + vdev->started = false; + vdev->broken = false; +virtio_set_features_nocheck (vdev,0 ); + vdev->queue_sel =0 ; + vdev->status =0 ; + vdev->disabled = false; +qatomic_set (&vdev->isr,0 ); + vdev->config_vector =VIRTIO_NO_VECTOR ; +virtio_notify_vector (vdev, vdev->config_vector); + +for (i =0 ; i <VIRTIO_QUEUE_MAX ; i++) { +__virtio_queue_reset (vdev, i); + } +} +static void virtio_device_check_notification_compatibility (VirtIODevice *vdev,Error **errp) {
Signature · 1 line
2.49.0