mm-gup-drop-nth_page-usage-in-unpin_user_page_range_dirty_lock.patch removed from -mm tree
The quilt patch titled
Subject: mm/gup: drop nth_page() usage in unpin_user_page_range_dirty_lock()
has been removed from the -mm tree. Its filename was
mm-gup-drop-nth_page-usage-in-unpin_user_page_range_dirty_lock.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/gup: drop nth_page() usage in unpin_user_page_range_dirty_lock()
Date: Mon, 1 Sep 2025 17:03:55 +0200
There is the concern that unpin_user_page_range_dirty_lock() might do some weird merging of PFN ranges -- either now or in the future -- such that PFN range is contiguous but the page range might not be.
Let's sanity-check for that and drop the nth_page() usage.
---
mm/gup.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
mm/gup.c renamed from mm/gup.c~mm-gup-drop-nth_page-usage-in-unpin_user_page_range_dirty_lock +7 -1
@@ -237,7 +237,7 @@ void folio_add_pin(struct folio *folio)static inline struct folio *gup_folio_range_next (struct page *start,unsigned long npages,unsigned long i,unsigned int *ntails) { -struct page *next =nth_page (start, i); +struct page *next = start + i;struct folio *folio =page_folio (next);unsigned int nr =1 ;
@@ -342,6 +342,10 @@ EXPORT_SYMBOL(unpin_user_pages_dirty_loc* "gup-pinned page range" refers to a range of pages that has had one of the * pin_user_pages() variants called on that page. * +* The page range must be truly physically contiguous: the page range +* corresponds to a contiguous PFN range and all pages can be iterated +* naturally. +* * For the page ranges defined by [page .. page+npages], make that range (or * its head pages, if a compound page) dirty, if @make_dirty is true, and if the * page range was previously listed as clean.
@@ -359,6 +363,8 @@ void unpin_user_page_range_dirty_lock(ststruct folio *folio;unsigned int nr; +VM_WARN_ON_ONCE (!page_range_contiguous (page, npages)); +for (i =0 ; i < npages; i += nr) { folio =gup_folio_range_next (page, npages, i, &nr);if (make_dirty && !folio_test_dirty (folio)) {
_
Patches currently in -mm which might be from [email protected] are