PCI/P2PDMA: Reset page reference count when page mapping fails
Subsystems (4)
PATCH 1/1 PCI/P2PDMA: Reset page reference count when page mapping fails
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 back 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().
---
This was found by inspection. I don't currently have a good setup that exercises the p2pmem_alloc_mmap() path so this has only been compile tested - additional testing would be appreciated.
--- drivers/pci/p2pdma.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pci/p2pdma.c +6 -0
@@ -152,6 +152,12 @@ 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; }
Signature · 1 line
2.51.0
Quoted 36 lines · Alistair Popple
When mapping a p2pdma page the page reference count is initialised to 1 prior to calling
vm_insert_page(). This is to avoidvm_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 previousset_page_count()call triggering theVM_WARN_ON_ONCE_PAGEchecking that the page is free.Fix this by resetting the page refcount back to zero using
set_page_count(). Note thatput_page()is not used because that would result in freeing the page twice due to implicitly callingp2pdma_folio_free().Fixes b7e282378773 ("mm/mm_init: move p2pdma page refcount initialisation to p2pdma")Signed-off-by Alistair Popple <[email protected]>---
This was found by inspection. I don't currently have a good setup that exercises the
p2pmem_alloc_mmap()path so this has only been compile tested - additional testing would be appreciated.--- drivers/pci/p2pdma.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/pci/p2pdma.c +0
-0@@ -152,6 +152,12 @@ static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj, ret =vm_insert_page (vma, vaddr, page);if (ret) {
drivers/pci/p2pdma.c static int p2pmem_alloc_mmap(struct file *filp, struct kobject *kobj, · line 163
Quoted 10 lines
drivers/pci/p2pdma.c +6
-0gen_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; }
The change looks good!
Bjorn Helgaas
AppliedQuoted 12 lines · Alistair Popple
When mapping a p2pdma page the page reference count is initialised to 1 prior to calling
vm_insert_page(). This is to avoidvm_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 previousset_page_count()call triggering theVM_WARN_ON_ONCE_PAGEchecking that the page is free.
Quoted 7 lines
Fix this by resetting the page refcount back to zero using
set_page_count(). Note thatput_page()is not used because that would result in freeing the page twice due to implicitly callingp2pdma_folio_free().Fixes b7e282378773 ("mm/mm_init: move p2pdma page refcount initialisation to p2pdma")Signed-off-by Alistair Popple <[email protected]>
Applied to pci/p2pdma for v6.20, thanks!
Quoted 29 lines
---
This was found by inspection. I don't currently have a good setup that exercises the
p2pmem_alloc_mmap()path so this has only been compile tested - additional testing would be appreciated.--- drivers/pci/p2pdma.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/pci/p2pdma.c +6
-0@@ -152,6 +152,12 @@ 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; }Signature · 1 line
2.51.0
Hi Alistair,
Quoted 12 lines · Alistair Popple
When mapping a p2pdma page the page reference count is initialised to 1 prior to calling
vm_insert_page(). This is to avoidvm_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 previousset_page_count()call triggering theVM_WARN_ON_ONCE_PAGEchecking that the page is free.
Quoted 7 lines
Fix this by resetting the page refcount back to zero using
set_page_count(). Note thatput_page()is not used because that would result in freeing the page twice due to implicitly callingp2pdma_folio_free().Fixes b7e282378773 ("mm/mm_init: move p2pdma page refcount initialisation to p2pdma")Signed-off-by Alistair Popple <[email protected]>
I had time today to pull out some old hardware and run this patch through my old p2pdma smoke tests. I don't think the tests exercise the change, but it looks correct to me on review.
Thanks for the fix!
Logan