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 682AA42B750 for ; Tue, 9 Jun 2026 15:53:31 +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=1781020412; cv=none; b=OJqlOL1zvTAiuDEtmoHgQvjtAdydzt16ndX6CPKqVut1QO62PJtMKW1yp5DSEsG8XZkEs/pTRGAWIP9WbS837STZKyMdeaPo1DUsAhuROjbPBTfTJqBDoDLl4N3EGooqUG4sdUjuaMu8YGeNm1qtrc9E92ltRClSi8EwCXmqUj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781020412; c=relaxed/simple; bh=g1EKEYRYLribbyiGUWZVYck5VAG9jAxTKOR/GeNwZko=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=azwpyQ49Dm2YMjTHDGPWenb/t4g+JeSCeSnZbk5D2KJprjGLdrIHKyVjGNE13OIulUsDtwoJxsWaZNei4jJuXEg6kBWnC+3wV58JmtGzypPdkrbMeRNCixaVJo69Kj79S1N2nSYxr3SDp+1T9zRj7027DZ2wSJ1tkQofEgudnfg= 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=MQdJYCZr; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=L7aj4O19; 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="MQdJYCZr"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="L7aj4O19" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1781020410; 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; bh=znUgJLwcI/t7tvESv/1fH8INfEp80ot2BgxIAU0A+Is=; b=MQdJYCZrRBbXrnSxKVCp9uJVxY7q0oKRZOxBMGsuK61FbPKI7WZzRcbxpA/4DyxQegY56G uCum3aN4DOGnQPglCVk24GhWLMivOiE3EGgtb4bhusWUE/BjtnU+KOildyi4aAr1PcZAXX X+Lj9RVkaVitOm0WVATB+uwpJPKt3aI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-16-0_imnho0PXebHWspbLYTpA-1; Tue, 09 Jun 2026 11:53:29 -0400 X-MC-Unique: 0_imnho0PXebHWspbLYTpA-1 X-Mimecast-MFC-AGG-ID: 0_imnho0PXebHWspbLYTpA_1781020407 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-490d3f03883so12331955e9.1 for ; Tue, 09 Jun 2026 08:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1781020407; x=1781625207; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=znUgJLwcI/t7tvESv/1fH8INfEp80ot2BgxIAU0A+Is=; b=L7aj4O19FPH2HDy5e9fg6znNa5pOgHq9y25lPU7GHzXrD8TaKirn2MWW9xmH83V06u YoYktESK6Yo13BE1lZmp+haBzSe0w8DlMb5shQK8J0GioCY8I0eXeUH465yP+nG2iXq5 +Np22IGdTzevP+imRlVzgcPHVr9fKvWDMw+a+ZTsmmpzN6y5ZQF9aRHIGfv1o927zLkQ 2Y+fkbsvMEzp4yU2PwIDsqJwBGzVxhlSefqIJ9bxkxUK8q7eSTugusmbkP5pR1KQaTgr ta5Ki+71LJgFIajzssNtZej6BU21lCSkMd3vnrhbG/mEIj5DM2fmve1J9jQiDJ0+iU+D lqJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781020407; x=1781625207; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=znUgJLwcI/t7tvESv/1fH8INfEp80ot2BgxIAU0A+Is=; b=UF1IaNAdnwTX132HOxz15y6DNUzeK7T1bDTgcFxwAB/D1iIMLu5r1wuoomkI43QmE/ dIyyVjzYuijwt1WuK5MeSSWsl//V5FPPQpOzRF0blNlFoArMt7xMQIXOeaJU36yN0EJX Lt8IetwFuakhGLPdWDVeYbENpNPsB/ke6WaVaOS3eor7xrBpt4weR0y3LuyTXRltvA4/ zuuV5eATL8bSf9xP94NxIAx05HS9Il2aA0K2YYh4CvMRXGyY3sdVigQ+gC1SDb38Ld9W V22BRQCyUJOyNusbrgyJ2NiUSgahMvRYKu45JXfADcJ9Sl1vOyslh4RnG/clGVgg/4N9 A81w== X-Gm-Message-State: AOJu0YwEvhbm+pypetRjZ5jblZzQDxp5B2vZVL+zcenKkfWbal2CLprB m4/RVW12SuD6ET0CAwICocjz49b/9WmN74GA6Rb1D32rWCn0a75yi2/qGEvfuX2BJyvWbdO2X4+ D8nDaUwMimwzn9EGdEuMd5uoHNdRWOVR7FQDriY2jdRk+eJ/u4q4VTMeT9Lj795hCdFkGzzxKvd y5KvoN7rI9kMFJ0fPIsqs/yhOTLhBqB16g33OZ5J4w9MA= X-Gm-Gg: Acq92OFbcFUk+yesc7T6UWa0DRLidDd7zTijalureCQCSnY7fyTOdEg9E6zbRI38BWH EoEyCT9+24m776v3ia0oYsc6cKJJoOPZZ1ou0Ns9wCysKFK9bvaMgZEL3bMxbT/F96MVPXuAj7F 55wIlW+7arn1reDk1ZCgMRMf+aFwqbw6eXDpVXL8Mp7buY5ysZboGSpK8ex16aFiHm3tMKh7IqT yZSEEYB5Wg1SSwbEvmReNZ6V9IGeYRRqJmvkBNve0g99JRxHNS0Ts81wXWpEONbBlqHSI4PL/hW 2GgB8YyXzULEK5XFpMxv6SCmgdabVGKERH1S1B1rkgI7aqc8EUCP9qtmwoA4eE34oKASvif6gp1 Rj7TeUuqmWljn7UoGhzTSzweKnpQh2sPB1cQXLRCaHei3s3ZQeq9eWg== X-Received: by 2002:a05:600c:524a:b0:490:b11f:2560 with SMTP id 5b1f17b1804b1-490c256f131mr368573345e9.9.1781020406477; Tue, 09 Jun 2026 08:53:26 -0700 (PDT) X-Received: by 2002:a05:600c:524a:b0:490:b11f:2560 with SMTP id 5b1f17b1804b1-490c256f131mr368571885e9.9.1781020405506; Tue, 09 Jun 2026 08:53:25 -0700 (PDT) Received: from redhat.com (IGLD-80-230-85-71.inter.net.il. [80.230.85.71]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f2f67c6sm60824138f8f.16.2026.06.09.08.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 08:53:24 -0700 (PDT) Date: Tue, 9 Jun 2026 11:53:20 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Miaohe Lin , "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 , Naoya Horiguchi , Alexander Duyck Subject: [PATCH splitout] mm: page_reporting: allow driver to set batch capacity Message-ID: 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 X-Mailer: git-send-email 2.51.2.2891.g4157995a80.dirty X-Mutt-Fcc: =sent At the moment, if a virtio balloon device has a page reporting vq but its size is < PAGE_REPORTING_CAPACITY (32), the balloon driver fails probe. But, there's no way for host to know this value, so it can easily create a smaller vq and suddenly adding the reporting capability to the device makes all of the driver fail. Not pretty. Add a capacity field to page_reporting_dev_info so drivers can control the maximum number of pages per report batch. In virtio-balloon, set the capacity to the reporting virtqueue size, letting page_reporting adapt to whatever the device provides. Fixes: b0c504f15471 ("virtio-balloon: add support for providing free page reports to host") Signed-off-by: Michael S. Tsirkin Assisted-by: Claude:claude-opus-4-6 --- drivers/virtio/virtio_balloon.c | 5 +---- include/linux/page_reporting.h | 3 +++ mm/page_reporting.c | 25 ++++++++++++++----------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index f6c2dff33f8a..6a1a610c2cb1 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -1017,10 +1017,6 @@ static int virtballoon_probe(struct virtio_device *vdev) unsigned int capacity; capacity = virtqueue_get_vring_size(vb->reporting_vq); - if (capacity < PAGE_REPORTING_CAPACITY) { - err = -ENOSPC; - goto out_unregister_oom; - } vb->pr_dev_info.order = PAGE_REPORTING_ORDER_UNSPECIFIED; @@ -1041,6 +1037,7 @@ static int virtballoon_probe(struct virtio_device *vdev) vb->pr_dev_info.order = 5; #endif + vb->pr_dev_info.capacity = capacity; err = page_reporting_register(&vb->pr_dev_info); if (err) goto out_unregister_oom; diff --git a/include/linux/page_reporting.h b/include/linux/page_reporting.h index 9d4ca5c218a0..5ab5be02fa15 100644 --- a/include/linux/page_reporting.h +++ b/include/linux/page_reporting.h @@ -22,6 +22,9 @@ struct page_reporting_dev_info { /* Minimal order of page reporting */ unsigned int order; + + /* Max pages per report batch (default PAGE_REPORTING_CAPACITY) */ + unsigned int capacity; }; /* Tear-down and bring-up for page reporting devices */ diff --git a/mm/page_reporting.c b/mm/page_reporting.c index 7418f2e500bb..5b6b17f67131 100644 --- a/mm/page_reporting.c +++ b/mm/page_reporting.c @@ -174,10 +174,10 @@ page_reporting_cycle(struct page_reporting_dev_info *prdev, struct zone *zone, * list processed. This should result in us reporting all pages on * an idle system in about 30 seconds. * - * The division here should be cheap since PAGE_REPORTING_CAPACITY - * should always be a power of 2. + * The division here uses integer division; capacity need + * not be a power of 2. */ - budget = DIV_ROUND_UP(area->nr_free, PAGE_REPORTING_CAPACITY * 16); + budget = DIV_ROUND_UP(area->nr_free, prdev->capacity * 16); /* loop through free list adding unreported pages to sg list */ list_for_each_entry_safe(page, next, list, lru) { @@ -222,10 +222,10 @@ page_reporting_cycle(struct page_reporting_dev_info *prdev, struct zone *zone, spin_unlock_irq(&zone->lock); /* begin processing pages in local list */ - err = prdev->report(prdev, sgl, PAGE_REPORTING_CAPACITY); + err = prdev->report(prdev, sgl, prdev->capacity); /* reset offset since the full list was reported */ - *offset = PAGE_REPORTING_CAPACITY; + *offset = prdev->capacity; /* update budget to reflect call to report function */ budget--; @@ -234,7 +234,7 @@ page_reporting_cycle(struct page_reporting_dev_info *prdev, struct zone *zone, spin_lock_irq(&zone->lock); /* flush reported pages from the sg list */ - page_reporting_drain(prdev, sgl, PAGE_REPORTING_CAPACITY, !err); + page_reporting_drain(prdev, sgl, prdev->capacity, !err); /* * Reset next to first entry, the old next isn't valid @@ -260,13 +260,13 @@ static int page_reporting_process_zone(struct page_reporting_dev_info *prdev, struct scatterlist *sgl, struct zone *zone) { - unsigned int order, mt, leftover, offset = PAGE_REPORTING_CAPACITY; + unsigned int order, mt, leftover, offset = prdev->capacity; unsigned long watermark; int err = 0; /* Generate minimum watermark to be able to guarantee progress */ watermark = low_wmark_pages(zone) + - (PAGE_REPORTING_CAPACITY << page_reporting_order); + (prdev->capacity << page_reporting_order); /* * Cancel request if insufficient free memory or if we failed @@ -290,7 +290,7 @@ page_reporting_process_zone(struct page_reporting_dev_info *prdev, } /* report the leftover pages before going idle */ - leftover = PAGE_REPORTING_CAPACITY - offset; + leftover = prdev->capacity - offset; if (leftover) { sgl = &sgl[offset]; err = prdev->report(prdev, sgl, leftover); @@ -322,11 +322,11 @@ static void page_reporting_process(struct work_struct *work) atomic_set(&prdev->state, state); /* allocate scatterlist to store pages being reported on */ - sgl = kmalloc_objs(*sgl, PAGE_REPORTING_CAPACITY); + sgl = kmalloc_objs(*sgl, prdev->capacity); if (!sgl) goto err_out; - sg_init_table(sgl, PAGE_REPORTING_CAPACITY); + sg_init_table(sgl, prdev->capacity); for_each_zone(zone) { err = page_reporting_process_zone(prdev, sgl, zone); @@ -377,6 +377,9 @@ int page_reporting_register(struct page_reporting_dev_info *prdev) page_reporting_order = pageblock_order; } + if (!prdev->capacity || prdev->capacity > PAGE_REPORTING_CAPACITY) + prdev->capacity = PAGE_REPORTING_CAPACITY; + /* initialize state and work structures */ atomic_set(&prdev->state, PAGE_REPORTING_IDLE); INIT_DELAYED_WORK(&prdev->work, &page_reporting_process); -- MST