Add VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED (bit 6) device feature. When negotiated, the host zeros reported pages on reclaim. Signed-off-by: Michael S. Tsirkin Assisted-by: LLM --- drivers/virtio/virtio_balloon.c | 33 ++++++++++++++++++++++++++--- include/uapi/linux/virtio_balloon.h | 1 + 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 8c1b47ec17a29..4c6630c5f9599 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -19,6 +19,7 @@ #include #include #include +#include /* * Balloon device works in 4K page units. So each page is pointed to by @@ -205,7 +206,9 @@ static int virtballoon_free_page_report(struct page_reporting_dev_info *pr_dev_i struct virtio_balloon *vb = container_of(pr_dev_info, struct virtio_balloon, pr_dev_info); struct virtqueue *vq = vb->reporting_vq; - unsigned int unused, err; + struct scatterlist *entry; + unsigned int len, i; + int err; /* We should always be able to add these buffers to an empty queue. */ err = virtqueue_add_inbuf(vq, sg, nents, vb, GFP_NOWAIT); @@ -221,9 +224,24 @@ static int virtballoon_free_page_report(struct page_reporting_dev_info *pr_dev_i virtqueue_kick(vq); /* When host has read buffer, this completes via balloon_ack */ - wait_event(vb->acked, virtqueue_get_buf(vq, &unused)); + wait_event(vb->acked, virtqueue_get_buf(vq, &len)); - return 0; + if (!pr_dev_info->host_zeroes_pages) + return 0; + + /* + * Only a fully initialized batch may be marked reported when reported + * pages are treated as zeroed. A short completion does not identify + * which pages were initialized, so reject the entire batch. + * Subtract each entry to avoid overflowing a total-length accumulator. + */ + for_each_sg(sg, entry, nents, i) { + if (len < entry->length) + return -EIO; + len -= entry->length; + } + + return len ? -EIO : 0; } static void set_page_pfns(struct virtio_balloon *vb, @@ -1043,6 +1061,9 @@ static int virtballoon_probe(struct virtio_device *vdev) #if defined(CONFIG_ARM64) && defined(CONFIG_ARM64_64K_PAGES) vb->pr_dev_info.order = 5; #endif + if (virtio_has_feature(vb->vdev, + VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED)) + vb->pr_dev_info.host_zeroes_pages = true; vb->pr_dev_info.capacity = capacity; err = page_reporting_register(&vb->pr_dev_info); @@ -1189,6 +1210,11 @@ static int virtballoon_validate(struct virtio_device *vdev) else if (!virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_REPORTING); + if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT) || + page_poisoning_enabled_static()) + __virtio_clear_bit(vdev, + VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED); + /* * Disable indirect descriptors to avoid memory allocation in * virtqueue_add during page reporting. @@ -1205,6 +1231,7 @@ static unsigned int features[] = { VIRTIO_BALLOON_F_FREE_PAGE_HINT, VIRTIO_BALLOON_F_PAGE_POISON, VIRTIO_BALLOON_F_REPORTING, + VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED, }; static struct virtio_driver virtio_balloon_driver = { diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index ee35a372805d4..17de46c629c2e 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h @@ -37,6 +37,7 @@ #define VIRTIO_BALLOON_F_FREE_PAGE_HINT 3 /* VQ to report free pages */ #define VIRTIO_BALLOON_F_PAGE_POISON 4 /* Guest is using page poisoning */ #define VIRTIO_BALLOON_F_REPORTING 5 /* Page reporting virtqueue */ +#define VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED 6 /* Host zeroes reported pages */ /* Size of a PFN in the balloon interface. */ #define VIRTIO_BALLOON_PFN_SHIFT 12 -- MST