]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PCI/P2PDMA: Reset page reference count when page mapping fails
authorAlistair Popple <apopple@nvidia.com>
Mon, 12 Jan 2026 00:54:40 +0000 (11:54 +1100)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 14 Jan 2026 17:07:06 +0000 (11:07 -0600)
When mapping a p2pdma page the page reference count is initialised to 1
prior to calling vm_insert_page(). This is to avoid vm_insert_page()
warning if the page refcount is zero. Prior to setting the page count there
is a check to ensure the page is currently free (ie. has a zero reference
count).

However vm_insert_page() can fail. In this case the pages are freed back to
the genalloc pool, but that does not reset the page refcount.  So a future
allocation of the same page will see the elevated page refcount from the
previous set_page_count() call triggering the VM_WARN_ON_ONCE_PAGE checking
that the page is free.

Fix this by resetting the page refcount to zero using set_page_count().
Note that put_page() is not used because that would result in freeing the
page twice due to implicitly calling p2pdma_folio_free().

Fixes: b7e282378773 ("mm/mm_init: move p2pdma page refcount initialisation to p2pdma")
Signed-off-by: Alistair Popple <apopple@nvidia.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Balbir Singh <balbirs@nvidia.com>
Link: https://patch.msgid.link/20260112005440.998543-1-apopple@nvidia.com
drivers/pci/p2pdma.c

index dd64ec830fdd4f7cd7cd7b3b98619d23a817b4cc..79a414fd6623bd3f9ef5de038dd4123421386e07 100644 (file)
@@ -152,6 +152,13 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj,
                ret = vm_insert_page(vma, vaddr, page);
                if (ret) {
                        gen_pool_free(p2pdma->pool, (uintptr_t)kaddr, len);
+
+                       /*
+                        * Reset the page count. We don't use put_page()
+                        * because we don't want to trigger the
+                        * p2pdma_folio_free() path.
+                        */
+                       set_page_count(page, 0);
                        percpu_ref_put(ref);
                        return ret;
                }