Skip to contentSkip to conversation

mm-gup-fix-handling-of-errors-from-arch_make_folio_accessible-in-follow_page_pte.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Sep 21, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/gup: fix handling of errors from arch_make_folio_accessible() in follow_page_pte()
has been removed from the -mm tree. Its filename was
mm-gup-fix-handling-of-errors-from-arch_make_folio_accessible-in-follow_page_pte.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: fix handling of errors from arch_make_folio_accessible() in follow_page_pte()
Date: Mon, 8 Sep 2025 11:45:17 +0200

In case we call arch_make_folio_accessible() and it fails, we would incorrectly return a value that is "!= 0" to the caller, indicating that we pinned all requested pages and that the caller can keep going.

follow_page_pte() is not supposed to return error values, but instead "0" on failure and "1" on success -- we'll clean that up separately.

In case we return "!= 0", the caller will just keep going pinning more pages. If we happen to pin a page afterwards, we're in trouble, because we essentially skipped some pages in the requested range.

Staring at the arch_make_folio_accessible() implementation on s390x, I assume it should actually never really fail unless something unexpected happens (BUG?). So let's not CC stable and just fix common code to do the right thing.

Clean up the code a bit now that there is no reason to store the return value of arch_make_folio_accessible().

Fixes f28d43636d6f ("mm/gup/writeback: add callbacks for inaccessible pages")
Cc Jason Gunthorpe <[email protected]>
Cc John Hubbard <[email protected]>
Cc Peter Xu <[email protected]>
Cc Christian Borntraeger <[email protected]>

---

 mm/gup.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
mm/gup.c renamed from mm/gup.c~mm-gup-fix-handling-of-errors-from-arch_make_folio_accessible-in-follow_page_pte +3 -6
@@ -2898,12 +2898,9 @@ static int gup_fast_pte_range(pmd_t pmd,
 		 * see Documentation/core-api/pin_user_pages.rst for
 		 * details.
 		 */
-		if (flags & FOLL_PIN) {
-			ret = arch_make_folio_accessible(folio);
-			if (ret) {
-				gup_put_folio(folio, 1, flags);
-				goto pte_unmap;
-			}
+		if ((flags & FOLL_PIN) && arch_make_folio_accessible(folio)) {
+			gup_put_folio(folio, 1, flags);
+			goto pte_unmap;
 		}
 		folio_set_referenced(folio);
 		pages[*nr] = page;

_

Patches currently in -mm which might be from [email protected] are