From: peterx@redhat.com
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org,
Andrew Morton <akpm@linux-foundation.org>,
Muchun Song <muchun.song@linux.dev>,
Jason Gunthorpe <jgg@nvidia.com>,
peterx@redhat.com, Matthew Wilcox <willy@infradead.org>,
Mike Rapoport <rppt@kernel.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
x86@kernel.org, sparclinux@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH RFC 02/13] mm/gup: Cache p4d in follow_p4d_mask()
Date: Wed, 6 Mar 2024 18:41:36 +0800 [thread overview]
Message-ID: <20240306104147.193052-3-peterx@redhat.com> (raw)
In-Reply-To: <20240306104147.193052-1-peterx@redhat.com>
From: Peter Xu <peterx@redhat.com>
Add a variable to cache p4d in follow_p4d_mask(). It's a good practise to
make sure all the following checks will have a consistent view of the entry.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
mm/gup.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c
index df83182ec72d..69a777f4fc5c 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -772,16 +772,17 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma,
unsigned int flags,
struct follow_page_context *ctx)
{
- p4d_t *p4d;
+ p4d_t *p4dp, p4d;
- p4d = p4d_offset(pgdp, address);
- if (p4d_none(*p4d))
+ p4dp = p4d_offset(pgdp, address);
+ p4d = READ_ONCE(*p4dp);
+ if (p4d_none(p4d))
return no_page_table(vma, flags);
- BUILD_BUG_ON(p4d_huge(*p4d));
- if (unlikely(p4d_bad(*p4d)))
+ BUILD_BUG_ON(p4d_huge(p4d));
+ if (unlikely(p4d_bad(p4d)))
return no_page_table(vma, flags);
- return follow_pud_mask(vma, address, p4d, flags, ctx);
+ return follow_pud_mask(vma, address, p4dp, flags, ctx);
}
/**
--
2.44.0
next prev parent reply other threads:[~2024-03-06 10:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 10:41 [PATCH RFC 00/13] mm/treewide: Remove pXd_huge() API peterx
2024-03-06 10:41 ` [PATCH RFC 01/13] mm/hmm: Process pud swap entry without pud_huge() peterx
2024-03-07 18:12 ` Jason Gunthorpe
2024-03-08 6:50 ` Peter Xu
2024-03-06 10:41 ` peterx [this message]
2024-03-06 10:41 ` [PATCH RFC 03/13] mm/gup: Check p4d presence before going on peterx
2024-03-07 20:08 ` Jason Gunthorpe
2024-03-06 10:41 ` [PATCH RFC 04/13] mm/x86: Change pXd_huge() behavior to exclude swap entries peterx
2024-03-07 20:16 ` Jason Gunthorpe
2024-03-06 10:41 ` [PATCH RFC 05/13] mm/sparc: " peterx
2024-03-06 10:41 ` [PATCH RFC 06/13] mm/arm: Use macros to define pmd/pud helpers peterx
2024-03-06 10:41 ` [PATCH RFC 07/13] mm/arm: Redefine pmd_huge() with pmd_leaf() peterx
2024-03-06 10:41 ` [PATCH RFC 08/13] mm/arm64: Merge pXd_huge() and pXd_leaf() definitions peterx
2024-03-06 10:41 ` [PATCH RFC 09/13] mm/powerpc: Redefine pXd_huge() with pXd_leaf() peterx
2024-03-06 12:56 ` Michael Ellerman
2024-03-07 3:05 ` Peter Xu
2024-03-06 10:41 ` [PATCH RFC 10/13] mm/gup: Merge pXd huge mapping checks peterx
2024-03-07 20:19 ` Jason Gunthorpe
2024-03-06 10:41 ` [PATCH RFC 11/13] mm/treewide: Replace pXd_huge() with pXd_leaf() peterx
2024-03-06 10:41 ` [PATCH RFC 12/13] mm/treewide: Remove pXd_huge() peterx
2024-03-06 10:41 ` [PATCH RFC 13/13] mm: Document pXd_leaf() API peterx
2024-03-08 15:20 ` Jason Gunthorpe
2024-03-11 9:58 ` [PATCH RFC 00/13] mm/treewide: Remove pXd_huge() API Christophe Leroy
2024-03-12 20:01 ` Peter Xu
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=20240306104147.193052-3-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=christophe.leroy@csgroup.eu \
--cc=jgg@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=muchun.song@linux.dev \
--cc=rppt@kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).