virtio-balloon: free page hinting fixes
v2 cover virtio-balloon: free page hinting fixes
Some fixes for VIRTIO_BALLOON_F_FREE_PAGE_HINT. First issue was reported by Alexander Bulekov [1], the other ones were discovered by me when digging into the details.
We keep finding more issues, let's see how we'll proceed with this feature long-term. These patches can be backported to stable QEMU.
[1] https://lkml.kernel.org/r/[email protected]
v1 -> v2:
- "virtio-balloon: fix free page hinting without an iothread" -- Drop initialization to 0/false
-- Reformat one condition
- cc stable
David Hildenbrand (3):
virtio-balloon: fix free page hinting without an iothread
virtio-balloon: fix free page hinting check on unrealize
virtio-balloon: unref the iothread when unrealizing
hw/virtio/virtio-balloon.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
Signature · 1 line
2.25.4
PATCH v2 1/3 virtio-balloon: fix free page hinting without an iothread
In case we don't have an iothread, we mark the feature as abscent but still add the queue. 'free_page_bh' remains set to NULL.
qemu-system-i386 \
-M microvm \
-nographic \
-device virtio-balloon-device,free-page-hint=true \
-nographic \
-display none \
-monitor none \
-serial none \
-qtest stdioDoing a "write 0xc0000e30 0x24 0x030000000300000003000000030000000300000003000000030000000300000003000000"
We will trigger a SEGFAULT. Let's move the check and bail out.
While at it, move the static initializations to instance_init(). free_page_report_status and block_iothread are implicitly set to the right values (0/false) already, so drop the initialization.
--- hw/virtio/virtio-balloon.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
hw/virtio/virtio-balloon.c +16 -17
@@ -789,6 +789,13 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp)return ; } +if (virtio_has_feature (s->host_features,VIRTIO_BALLOON_F_FREE_PAGE_HINT ) && + !s->iothread) { +error_setg (errp,"'free-page-hint' requires 'iothread' to be set" ); +virtio_cleanup (vdev); +return ; + } + s->ivq =virtio_add_queue (vdev,128 , virtio_balloon_handle_output); s->dvq =virtio_add_queue (vdev,128 , virtio_balloon_handle_output); s->svq =virtio_add_queue (vdev,128 , virtio_balloon_receive_stats);
@@ -797,24 +804,11 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp) VIRTIO_BALLOON_F_FREE_PAGE_HINT)) { s->free_page_vq =virtio_add_queue (vdev,VIRTQUEUE_MAX_SIZE , virtio_balloon_handle_free_page_vq); - s->free_page_report_status =FREE_PAGE_REPORT_S_STOP ; - s->free_page_report_cmd_id = -VIRTIO_BALLOON_FREE_PAGE_REPORT_CMD_ID_MIN ; - s->free_page_report_notify.notify = - virtio_balloon_free_page_report_notify;precopy_add_notifier (&s->free_page_report_notify); -if (s->iothread) { -object_ref (OBJECT (s->iothread)); - s->free_page_bh =aio_bh_new (iothread_get_aio_context (s->iothread), - virtio_ballloon_get_free_page_hints, s); -qemu_mutex_init (&s->free_page_lock); -qemu_cond_init (&s->free_page_cond); - s->block_iothread = false; - }else { -/* Simply disable this feature if the iothread wasn't created. */ - s->host_features &= ~(1 <<VIRTIO_BALLOON_F_FREE_PAGE_HINT ); -virtio_error (vdev,"iothread is missing" ); - } + +object_ref (OBJECT (s->iothread)); + s->free_page_bh =aio_bh_new (iothread_get_aio_context (s->iothread), + virtio_ballloon_get_free_page_hints, s); }reset_stats (s); }
@@ -892,6 +886,11 @@ static void virtio_balloon_instance_init(Object *obj) {VirtIOBalloon *s =VIRTIO_BALLOON (obj); +qemu_mutex_init (&s->free_page_lock); +qemu_cond_init (&s->free_page_cond); + s->free_page_report_cmd_id =VIRTIO_BALLOON_FREE_PAGE_REPORT_CMD_ID_MIN ; + s->free_page_report_notify.notify = virtio_balloon_free_page_report_notify; +object_property_add (obj,"guest-stats" ,"guest statistics" , balloon_stats_get_all,NULL ,NULL , s);
Signature · 1 line
2.25.4
PATCH v2 2/3 virtio-balloon: fix free page hinting check on unrealize
In reply to David HildenbrandChecking against guest features is wrong. We allocated data structures based on host features. We can rely on "free_page_bh" as an indicator whether to un-do stuff instead.
--- hw/virtio/virtio-balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/virtio-balloon.c +1 -1
@@ -818,7 +818,7 @@ static void virtio_balloon_device_unrealize(DeviceState *dev)VirtIODevice *vdev =VIRTIO_DEVICE (dev);VirtIOBalloon *s =VIRTIO_BALLOON (dev); -if (virtio_balloon_free_page_support (s)) { +if (s->free_page_bh) {qemu_bh_delete (s->free_page_bh);virtio_balloon_free_page_stop (s);precopy_remove_notifier (&s->free_page_report_notify);
Signature · 1 line
2.25.4
PATCH v2 3/3 virtio-balloon: unref the iothread when unrealizing
In reply to David HildenbrandWe took a reference when realizing, so let's drop that reference when unrealizing.
--- hw/virtio/virtio-balloon.c | 1 + 1 file changed, 1 insertion(+)
hw/virtio/virtio-balloon.c +1 -0
@@ -820,6 +820,7 @@ static void virtio_balloon_device_unrealize(DeviceState *dev)if (s->free_page_bh) {qemu_bh_delete (s->free_page_bh); +object_unref (OBJECT (s->iothread));virtio_balloon_free_page_stop (s);precopy_remove_notifier (&s->free_page_report_notify); }
Signature · 1 line
2.25.4