From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D33D37D101 for ; Mon, 11 May 2026 09:04:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778490275; cv=none; b=aS5I/IJTdAxq8Xmes6fKwTYF2Ow+nn6Y1PlDLPHl+kBdo6vIUME/ax0XuokDj14uGe5w7lz7OsmRJtKgjrI68zE57dtXJlrckKgQObOJdPaGdByNU5gELSXWhnk+Ups8msqGJ1Asc3UdHFJNrc/VZ/mu7/50aEAOcAvlF1iqEpw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778490275; c=relaxed/simple; bh=tLMVAI8k8Vqd8nAD7gq4ERpr7r8SPw2I/CQ337Am1rA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=l5Opv5vKwQpRXXOkE9bCxpnHq9GRioildKggv4DNFCIPk+guSpbYJ+bBYDLiOJTU7wyuqAnK25Vsr6y8c8COwKFw5w/A/Samxh1n54/sBcrrMD7rzd1riI/ChMymW68dqPpqIHLLdi2zedYF2Sm1z65a2HnsseRKRJpBojxxdWE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=JyBai0l8; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=SBciGVsP; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JyBai0l8"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="SBciGVsP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778490273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/f7bc8XiOUNOfql0TOUlaX7QjBdLhxcvl3clNO9GGlQ=; b=JyBai0l8w+zToh9lZFMdgmfr84a7T83epzYz58//TbtTUbI6mSOYG+t2XziLjsni4m4ET3 6PBTzepwB9ClSUOG5pFrrjk+lF4CrYQKbm++lWK6VdQ20pzIjJhilNWXCIJUJvNw7HKdDG zGl2o6lk3sAxSjnrP7PjyrYVWIcwGLY= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-330-5JifjJGsNpO2MBW2SfpZqA-1; Mon, 11 May 2026 05:04:32 -0400 X-MC-Unique: 5JifjJGsNpO2MBW2SfpZqA-1 X-Mimecast-MFC-AGG-ID: 5JifjJGsNpO2MBW2SfpZqA_1778490271 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48906aa28cbso37471495e9.0 for ; Mon, 11 May 2026 02:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778490271; x=1779095071; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=/f7bc8XiOUNOfql0TOUlaX7QjBdLhxcvl3clNO9GGlQ=; b=SBciGVsPPBk55hTjU8Xln49EjWicCVxd1ghoVeorVcyYT9ynXZjiHFlxBfFwrF4//+ iAZiuzQFjLXflkAlCcafkZxJy9RBnzj6nJmljJdAFzsmGjpftoDoAJypxVKWyJ5ULCOy sp51/WpqkOlr+casBrD/1m8cFn9f6ExIlhyMYl1cN5kCRsDr2QdQwmxefvS4JsI8YPro tO0TmezOzu+wzAySus+coUZJl4YNPRc0ohXtwByBEFjrXlTj/a+/KUtjUirqwpKapMdL /SO96YClD3sGCThu5t2yv2hhlPXXWF1koYbp8uIqUiEcS05/cZ5LZhCx4jSRsY3b0R+K lJmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778490271; x=1779095071; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/f7bc8XiOUNOfql0TOUlaX7QjBdLhxcvl3clNO9GGlQ=; b=TaDbvsq+Ppw0unhPKxGGO36LJJS8li7gvnuOpLqMCuvCMnNTyf0GgPV7kU9sgiV0n4 n4oaOHGUN9K7yRYkL9H9wOPwFHO3Cn8Kzr5/v4cqVvxKW4PrUv/QjpoxaJGUUzygU+Dm 5eqy7pp+iQetBY6IzNIoPwarwoyWHnFBjgOaS+ZVMblIqBsC4fQlsQXWW/7he73Ra8CV W3GghoTlo8+vrvPY6Lf/4C1H157N7TrK+0T2+2BCRrLSavsi7bMH/O1B7ITVe/7mawzz AkJ6nJWHJ+g1h/wAsDxgB1iby3PSMaMnPAHq6orTaNlAZwuY9hOY32hz+FQRDI778TFe Oa5g== X-Gm-Message-State: AOJu0YxAc9QmPae3gjnZslXAlRzOB5mE/KnTrP1K5dnyX3GX8lRZc85t 3D3sApYNJV9cM1xoSAmpM+f/NHBeVKUM/k27PNhadBcRSn0PAX0hYydOTAedCgwYTfptk66/vgq GxPtZvQs4VIJJ4R51tOrSgvu3zmJWaT87rhKk79irWBhkubCS+wQjEhDO48uj1xV+x8ICXg47pO 8B3ling1cQKv5JulUMNuhhm4+/al8tCsEj2ujPTSBwJRw= X-Gm-Gg: Acq92OEWaOtxO38DSDTcnPS6VLeFQqtkaopyMUectfcg0qg8gDYnuON/SdbaOgvEIRe Xr+4kMAbSKYkUlOEOrZ5+NJjgJYvU/G1qVV1hhxMY5IKcwlB0c/LIU4B8/sXZGc2SNKJqaD7GLl uGlz8p3JPizc06h9BTZbO7hwgBtgen59rL3Do3BubQZf27OVqrmjvMZ1tY3jC4lZygxne+p1IFx zbiQ/DQUbPHuVZmLRSl8NTC7FEcqHeHqQHuwc/KL+aiL42fbjm7kaARS1/buT8NmuCcO9oKeo3Q SFA8LJ0mn2CzxAXaBQtin7RB50RAbV15c9fkCoo33Ye7f3k4YMxiRmxxzPHtBRRBgiGam/+MeQa ambaGYtefqdUtbbHM8ciDU0RYInvv0n4z/Beh90jl X-Received: by 2002:a05:600c:3e86:b0:48a:5339:a46 with SMTP id 5b1f17b1804b1-48e5dffabcamr278836735e9.9.1778490270606; Mon, 11 May 2026 02:04:30 -0700 (PDT) X-Received: by 2002:a05:600c:3e86:b0:48a:5339:a46 with SMTP id 5b1f17b1804b1-48e5dffabcamr278835635e9.9.1778490269887; Mon, 11 May 2026 02:04:29 -0700 (PDT) Received: from redhat.com (IGLD-80-230-48-7.inter.net.il. [80.230.48.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6f9fbf12sm186458005e9.0.2026.05.11.02.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 02:04:29 -0700 (PDT) Date: Mon, 11 May 2026 05:04:25 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: "David Hildenbrand (Arm)" , Jason Wang , Xuan Zhuo , Eugenio =?utf-8?B?UMOpcmV6?= , Muchun Song , Oscar Salvador , Andrew Morton , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Hugh Dickins , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo , Axel Rasmussen , Yuanchu Xie , Wei Xu , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , virtualization@lists.linux.dev, linux-mm@kvack.org, Andrea Arcangeli Subject: [PATCH resend v6 29/30] virtio_balloon: implement VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE Message-ID: <50c8ac1a006cf4167529b0951498c76b8928874f.1778489843.git.mst@redhat.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent When the device offers DEVICE_INIT_ON_INFLATE (bit 7), the device initializes inflated pages and returns a per-page bitmap indicating which pages were successfully initialized. The driver appends a device-writable bitmap buffer to each inflate descriptor chain via virtqueue_add_sgs. After the host acknowledges, the driver checks bitmap bits (bounded by used_len) and marks pages with SetPageZeroed. tell_host() returns used_len from virtqueue_get_buf(). Bitmap reads are bounded: fill_balloon() and virtballoon_migratepage() only trust bits within the used_len range. On deflate, release_pages_balloon checks PageZeroed per page and uses put_page_zeroed for pages the host initialized, propagating the zeroed hint to the buddy allocator. If inflate_vq has fewer than 2 descriptors, probe fails with -ENOSPC. If PAGE_POISON is negotiated with non-zero poison_val, the feature is cleared in validate(). See the virtio spec change: https://lore.kernel.org/all/9c69b992c3dd83dfef3db92cd86b2fd8a0730d48.1777731396.git.mst@redhat.com Signed-off-by: Michael S. Tsirkin Assisted-by: Claude:claude-opus-4-6 Assisted-by: cursor-agent:GPT-5.4-xhigh --- drivers/virtio/virtio_balloon.c | 102 ++++++++++++++++++++++++---- include/uapi/linux/virtio_balloon.h | 1 + 2 files changed, 90 insertions(+), 13 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index d1cdb904d60b..284108dbcff1 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -121,6 +121,9 @@ struct virtio_balloon { struct virtqueue *reporting_vq; struct page_reporting_dev_info pr_dev_info; + /* Bitmap returned by host for DEVICE_INIT_ON_INFLATE */ + DECLARE_BITMAP(inflate_bitmap, VIRTIO_BALLOON_ARRAY_PFNS_MAX); + /* State for keeping the wakeup_source active while adjusting the balloon */ spinlock_t wakeup_lock; bool processing_wakeup_event; @@ -181,20 +184,30 @@ static void balloon_ack(struct virtqueue *vq) wake_up(&vb->acked); } -static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq) +static unsigned int tell_host(struct virtio_balloon *vb, struct virtqueue *vq) { - struct scatterlist sg; + struct scatterlist sg_out, sg_in; + struct scatterlist *sgs[] = { &sg_out, &sg_in }; unsigned int len; - sg_init_one(&sg, vb->pfns, sizeof(vb->pfns[0]) * vb->num_pfns); + sg_init_one(&sg_out, vb->pfns, sizeof(vb->pfns[0]) * vb->num_pfns); - /* We should always be able to add one buffer to an empty queue. */ - virtqueue_add_outbuf(vq, &sg, 1, vb, GFP_KERNEL); + if (vq == vb->inflate_vq && + virtio_has_feature(vb->vdev, + VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE)) { + unsigned int bitmap_bytes; + + bitmap_bytes = DIV_ROUND_UP(vb->num_pfns, 8); + bitmap_zero(vb->inflate_bitmap, vb->num_pfns); + sg_init_one(&sg_in, vb->inflate_bitmap, bitmap_bytes); + virtqueue_add_sgs(vq, sgs, 1, 1, vb, GFP_KERNEL); + } else { + virtqueue_add_outbuf(vq, &sg_out, 1, vb, GFP_KERNEL); + } virtqueue_kick(vq); - /* When host has read buffer, this completes via balloon_ack */ wait_event(vb->acked, virtqueue_get_buf(vq, &len)); - + return len; } static int virtballoon_free_page_report(struct page_reporting_dev_info *pr_dev_info, @@ -297,8 +310,37 @@ static unsigned int fill_balloon(struct virtio_balloon *vb, size_t num) num_allocated_pages = vb->num_pfns; /* Did we get any? */ - if (vb->num_pfns != 0) - tell_host(vb, vb->inflate_vq); + if (vb->num_pfns != 0) { + unsigned int used_len = tell_host(vb, vb->inflate_vq); + + if (virtio_has_feature(vb->vdev, + VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE)) { + unsigned int i; + unsigned int valid_bits = used_len * 8; + + for (i = 0; i < vb->num_pfns; + i += VIRTIO_BALLOON_PAGES_PER_PAGE) { + unsigned int pfn, j; + bool zeroed = true; + + if (i + VIRTIO_BALLOON_PAGES_PER_PAGE > valid_bits) + break; + for (j = 0; j < VIRTIO_BALLOON_PAGES_PER_PAGE; j++) { + if (!test_bit(i + j, vb->inflate_bitmap)) { + zeroed = false; + break; + } + } + if (zeroed) { + pfn = virtio32_to_cpu(vb->vdev, + vb->pfns[i]); + __SetPageZeroed(pfn_to_page(pfn >> + (PAGE_SHIFT - + VIRTIO_BALLOON_PFN_SHIFT))); + } + } + } + } mutex_unlock(&vb->balloon_lock); return num_allocated_pages; @@ -311,7 +353,12 @@ static void release_pages_balloon(struct virtio_balloon *vb, list_for_each_entry_safe(page, next, pages, lru) { list_del(&page->lru); - put_page(page); /* balloon reference */ + if (PageZeroed(page)) { + __ClearPageZeroed(page); + put_page_zeroed(page); + } else { + put_page(page); + } } } @@ -858,7 +905,25 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info, /* balloon's page migration 1st step -- inflate "newpage" */ vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE; set_page_pfns(vb, vb->pfns, newpage); - tell_host(vb, vb->inflate_vq); + { + unsigned int used_len = tell_host(vb, vb->inflate_vq); + + if (virtio_has_feature(vb->vdev, + VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE) && + used_len >= DIV_ROUND_UP(VIRTIO_BALLOON_PAGES_PER_PAGE, 8)) { + unsigned int j; + bool zeroed = true; + + for (j = 0; j < VIRTIO_BALLOON_PAGES_PER_PAGE; j++) { + if (!test_bit(j, vb->inflate_bitmap)) { + zeroed = false; + break; + } + } + if (zeroed) + __SetPageZeroed(newpage); + } + } /* balloon's page migration 2nd step -- deflate "page" */ vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE; @@ -963,6 +1028,12 @@ static int virtballoon_probe(struct virtio_device *vdev) if (err) goto out_free_vb; + if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE) && + virtqueue_get_vring_size(vb->inflate_vq) < 2) { + err = -ENOSPC; + goto out_del_vqs; + } + if (!virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) vb->vb_dev_info.adjust_managed_page_count = true; #ifdef CONFIG_BALLOON_MIGRATION @@ -1188,11 +1259,15 @@ static int virtballoon_validate(struct virtio_device *vdev) /* Device fills with poison_val, not zeros; disable zeroed hint */ if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON) && - !want_init_on_free()) + !want_init_on_free()) { __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED); + __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE); + } - if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) + if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) { __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED); + __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE); + } __virtio_clear_bit(vdev, VIRTIO_F_ACCESS_PLATFORM); return 0; } @@ -1205,6 +1280,7 @@ static unsigned int features[] = { VIRTIO_BALLOON_F_PAGE_POISON, VIRTIO_BALLOON_F_REPORTING, VIRTIO_BALLOON_F_DEVICE_INIT_REPORTED, + VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE, }; static struct virtio_driver virtio_balloon_driver = { diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index 13074631f300..cbaf18e0b17c 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h @@ -38,6 +38,7 @@ #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 /* Device initializes reported pages */ +#define VIRTIO_BALLOON_F_DEVICE_INIT_ON_INFLATE 7 /* Device initializes pages on inflate */ /* Size of a PFN in the balloon interface. */ #define VIRTIO_BALLOON_PFN_SHIFT 12 -- MST