[PATCH v2 03/14] xen/grant-table: stop setting PG_private on pages for grant mapping

[Zi Yan <ziy@xxxxxxxxxx>]

gnttab_alloc_pages() stores xen_page_foreign in page->private. On 32-bit, a
pointer to an allocated xen_page_foreign is stored; on 64-bit,
xen_page_foreign is stored inline. Checking page->private != NULL is enough
to tell whether a xen_page_foreign needs to be freed on 32-bit and
page->private is zeroed unconditionally on 64-bit.

It prepares for a future commit that remove PG_private.

No functional change intended.

Assisted-by: Claude:claude-opus-4-8
Assisted-by: Codex:gpt-5
Signed-off-by: Zi Yan <ziy@xxxxxxxxxx>
To: Juergen Gross <jgross@xxxxxxxx>
To: Stefano Stabellini <sstabellini@xxxxxxxxxx>
Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@xxxxxxxx>
Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
 drivers/xen/balloon.c     |  5 +++++
 drivers/xen/grant-table.c | 11 +++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index e7f74ea7cd5eb..fdb18348cfdfe 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -182,6 +182,11 @@ static struct page *balloon_retrieve(bool require_lowmem)
 
        __ClearPageOffline(page);
        dec_node_page_state(page, NR_BALLOON_PAGES);
+       /*
+        * clear page->private before giving it out, since it might be used to
+        * store xen_page_foreign info.
+        */
+       set_page_private(page, 0);
 
        return page;
 }
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 69922be28b54c..993f89f048e21 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -863,10 +863,10 @@ EXPORT_SYMBOL_GPL(gnttab_free_auto_xlat_frames);
 
 int gnttab_pages_set_private(int nr_pages, struct page **pages)
 {
+#if BITS_PER_LONG < 64
        int i;
 
        for (i = 0; i < nr_pages; i++) {
-#if BITS_PER_LONG < 64
                struct xen_page_foreign *foreign;
 
                foreign = kzalloc_obj(*foreign);
@@ -874,9 +874,9 @@ int gnttab_pages_set_private(int nr_pages, struct page 
**pages)
                        return -ENOMEM;
 
                set_page_private(pages[i], (unsigned long)foreign);
-#endif
-               SetPagePrivate(pages[i]);
        }
+#endif
+       /* Data is stored in page->private on 64-bit */
 
        return 0;
 }
@@ -1031,12 +1031,11 @@ void gnttab_pages_clear_private(int nr_pages, struct 
page **pages)
        int i;
 
        for (i = 0; i < nr_pages; i++) {
-               if (PagePrivate(pages[i])) {
 #if BITS_PER_LONG < 64
+               if (page_private(pages[i]))
                        kfree((void *)page_private(pages[i]));
 #endif
-                       ClearPagePrivate(pages[i]);
-               }
+               set_page_private(pages[i], 0);
        }
 }
 EXPORT_SYMBOL_GPL(gnttab_pages_clear_private);

-- 
2.53.0