linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Baoquan He <bhe@redhat.com>
To: akpm@linux-foundation.org
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	yanjun.zhu@linux.dev, Baoquan He <bhe@redhat.com>
Subject: [PATCH v2 4/7] mm/gup: remove gup_fast_pgd_leaf() and clean up the relevant codes
Date: Mon, 31 Mar 2025 16:13:24 +0800	[thread overview]
Message-ID: <20250331081327.256412-5-bhe@redhat.com> (raw)
In-Reply-To: <20250331081327.256412-1-bhe@redhat.com>

In the current kernel, only pud huge page is supported in some
architectures. P4d and pgd huge pages haven't been supported yet.
And in mm/gup.c, there's no pgd huge page handling in the
follow_page_mask() code path. Hence it doesn't make sense to have
gup_fast_pgd_leaf() in gup_fast code path.

Here remove gup_fast_pgd_leaf() and clean up the relevant codes.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 mm/gup.c | 49 +++----------------------------------------------
 1 file changed, 3 insertions(+), 46 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index a15317cf6641..58cdc5605a4a 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -3168,46 +3168,6 @@ static int gup_fast_pud_leaf(pud_t orig, pud_t *pudp, unsigned long addr,
 	return 1;
 }
 
-static int gup_fast_pgd_leaf(pgd_t orig, pgd_t *pgdp, unsigned long addr,
-		unsigned long end, unsigned int flags, struct page **pages,
-		int *nr)
-{
-	int refs;
-	struct page *page;
-	struct folio *folio;
-
-	if (!pgd_access_permitted(orig, flags & FOLL_WRITE))
-		return 0;
-
-	BUILD_BUG_ON(pgd_devmap(orig));
-
-	page = pgd_page(orig);
-	refs = record_subpages(page, PGDIR_SIZE, addr, end, pages + *nr);
-
-	folio = try_grab_folio_fast(page, refs, flags);
-	if (!folio)
-		return 0;
-
-	if (unlikely(pgd_val(orig) != pgd_val(*pgdp))) {
-		gup_put_folio(folio, refs, flags);
-		return 0;
-	}
-
-	if (!pgd_write(orig) && gup_must_unshare(NULL, flags, &folio->page)) {
-		gup_put_folio(folio, refs, flags);
-		return 0;
-	}
-
-	if (!gup_fast_folio_allowed(folio, flags)) {
-		gup_put_folio(folio, refs, flags);
-		return 0;
-	}
-
-	*nr += refs;
-	folio_set_referenced(folio);
-	return 1;
-}
-
 static int gup_fast_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr,
 		unsigned long end, unsigned int flags, struct page **pages,
 		int *nr)
@@ -3302,12 +3262,9 @@ static void gup_fast_pgd_range(unsigned long addr, unsigned long end,
 		next = pgd_addr_end(addr, end);
 		if (pgd_none(pgd))
 			return;
-		if (unlikely(pgd_leaf(pgd))) {
-			if (!gup_fast_pgd_leaf(pgd, pgdp, addr, next, flags,
-					       pages, nr))
-				return;
-		} else if (!gup_fast_p4d_range(pgdp, pgd, addr, next, flags,
-					       pages, nr))
+		BUILD_BUG_ON(pgd_leaf(pgd));
+		if (!gup_fast_p4d_range(pgdp, pgd, addr, next, flags,
+					pages, nr))
 			return;
 	} while (pgdp++, addr = next, addr != end);
 }
-- 
2.41.0



  parent reply	other threads:[~2025-03-31 16:33 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-31  8:13 [PATCH v2 0/7] mm/gup: Minor fix, cleanup and improvements Baoquan He
2025-03-31  8:13 ` [PATCH v2 1/7] mm/gup: fix wrongly calculated returned value in fault_in_safe_writeable() Baoquan He
2025-04-01  8:10   ` David Hildenbrand
2025-04-01 14:00     ` Oscar Salvador
2025-04-01 14:12       ` Baoquan He
2025-04-01 14:11     ` Baoquan He
2025-03-31  8:13 ` [PATCH v2 2/7] mm/gup: check if both GUP_GET and GUP_PIN are set in __get_user_pages() earlier Baoquan He
2025-04-01  8:02   ` David Hildenbrand
2025-04-01 14:34     ` Baoquan He
2025-04-01 14:37       ` David Hildenbrand
2025-04-02  1:26         ` Baoquan He
2025-03-31  8:13 ` [PATCH v2 3/7] mm/gup: Fix the outdated code comments above get_user_pages_unlocked() Baoquan He
2025-04-01  8:14   ` David Hildenbrand
2025-04-01 14:36     ` Baoquan He
2025-04-01 13:51   ` Oscar Salvador
2025-04-01 15:29     ` Baoquan He
2025-03-31  8:13 ` Baoquan He [this message]
2025-04-01  8:19   ` [PATCH v2 4/7] mm/gup: remove gup_fast_pgd_leaf() and clean up the relevant codes David Hildenbrand
2025-04-01 14:11   ` Oscar Salvador
2025-03-31  8:13 ` [PATCH v2 5/7] x86/mm: remove pgd_leaf definition in arch Baoquan He
2025-04-01  8:21   ` David Hildenbrand
2025-04-01 14:03   ` Oscar Salvador
2025-04-02  3:39     ` Baoquan He
2025-03-31  8:13 ` [PATCH v2 6/7] x86/mm: remove p4d_leaf definition Baoquan He
2025-03-31  9:57   ` Ingo Molnar
2025-03-31 14:20     ` Baoquan He
2025-04-01  7:20       ` Ingo Molnar
2025-04-03 13:44         ` Baoquan He
2025-04-01 14:05   ` Oscar Salvador
2025-03-31  8:13 ` [PATCH v2 7/7] mm/pgtable: remove unneeded pgd_devmap() Baoquan He
2025-04-01  8:21   ` David Hildenbrand
2025-04-02  3:33     ` Baoquan He

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250331081327.256412-5-bhe@redhat.com \
    --to=bhe@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=yanjun.zhu@linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox