linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: peterx@redhat.com
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: Matthew Wilcox <willy@infradead.org>,
	Christophe Leroy <christophe.leroy@csgroup.eu>,
	Lorenzo Stoakes <lstoakes@gmail.com>,
	David Hildenbrand <david@redhat.com>,
	Vlastimil Babka <vbabka@suse.cz>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Mike Rapoport <rppt@kernel.org>,
	Christoph Hellwig <hch@infradead.org>,
	John Hubbard <jhubbard@nvidia.com>,
	Andrew Jones <andrew.jones@linux.dev>,
	linux-arm-kernel@lists.infradead.org,
	Michael Ellerman <mpe@ellerman.id.au>,
	"Kirill A . Shutemov" <kirill@shutemov.name>,
	linuxppc-dev@lists.ozlabs.org, Rik van Riel <riel@surriel.com>,
	linux-riscv@lists.infradead.org, Yang Shi <shy828301@gmail.com>,
	James Houghton <jthoughton@google.com>,
	"Aneesh Kumar K . V" <aneesh.kumar@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jason Gunthorpe <jgg@nvidia.com>,
	Andrea Arcangeli <aarcange@redhat.com>,
	peterx@redhat.com, Axel Rasmussen <axelrasmussen@google.com>
Subject: [PATCH 09/13] mm/gup: Cache *pudp in follow_pud_mask()
Date: Tue, 19 Dec 2023 15:55:34 +0800	[thread overview]
Message-ID: <20231219075538.414708-10-peterx@redhat.com> (raw)
In-Reply-To: <20231219075538.414708-1-peterx@redhat.com>

From: Peter Xu <peterx@redhat.com>

Introduce "pud_t pud" in the function, so the code won't dereference *pudp
multiple time.  Not only because that looks less straightforward, but also
because if the dereference really happened, it's not clear whether there
can be race to see different *pudp values if it's being modified at the
same time.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 mm/gup.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index 6c0d82fa8cc7..97e87b7a15c3 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -753,26 +753,27 @@ static struct page *follow_pud_mask(struct vm_area_struct *vma,
 				    unsigned int flags,
 				    struct follow_page_context *ctx)
 {
-	pud_t *pud;
+	pud_t *pudp, pud;
 	spinlock_t *ptl;
 	struct page *page;
 	struct mm_struct *mm = vma->vm_mm;
 
-	pud = pud_offset(p4dp, address);
-	if (pud_none(*pud))
+	pudp = pud_offset(p4dp, address);
+	pud = *pudp;
+	if (pud_none(pud))
 		return no_page_table(vma, flags, address);
-	if (pud_devmap(*pud)) {
-		ptl = pud_lock(mm, pud);
-		page = follow_devmap_pud(vma, address, pud, flags, &ctx->pgmap);
+	if (pud_devmap(pud)) {
+		ptl = pud_lock(mm, pudp);
+		page = follow_devmap_pud(vma, address, pudp, flags, &ctx->pgmap);
 		spin_unlock(ptl);
 		if (page)
 			return page;
 		return no_page_table(vma, flags, address);
 	}
-	if (unlikely(pud_bad(*pud)))
+	if (unlikely(pud_bad(pud)))
 		return no_page_table(vma, flags, address);
 
-	return follow_pmd_mask(vma, address, pud, flags, ctx);
+	return follow_pmd_mask(vma, address, pudp, flags, ctx);
 }
 
 static struct page *follow_p4d_mask(struct vm_area_struct *vma,
-- 
2.41.0



  parent reply	other threads:[~2023-12-19  7:57 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-19  7:55 [PATCH 00/13] mm/gup: Unify hugetlb, part 2 peterx
2023-12-19  7:55 ` [PATCH 01/13] mm/Kconfig: CONFIG_PGTABLE_HAS_HUGE_LEAVES peterx
2023-12-19  7:55 ` [PATCH 02/13] mm/hugetlb: Declare hugetlbfs_pagecache_present() non-static peterx
2023-12-19  7:55 ` [PATCH 03/13] mm: Provide generic pmd_thp_or_huge() peterx
2023-12-25  6:29   ` Muchun Song
2024-01-02  5:37     ` Peter Xu
2024-01-02  6:30       ` Muchun Song
2023-12-19  7:55 ` [PATCH 04/13] mm: Make HPAGE_PXD_* macros even if !THP peterx
2023-12-19  7:55 ` [PATCH 05/13] mm: Introduce vma_pgtable_walk_{begin|end}() peterx
2023-12-25  6:34   ` Muchun Song
     [not found]     ` <ZZOhlB-KK4hF3PgY@x1n>
2024-01-02  6:29       ` Muchun Song
2023-12-19  7:55 ` [PATCH 06/13] mm/gup: Drop folio_fast_pin_allowed() in hugepd processing peterx
2023-12-19  7:55 ` [PATCH 07/13] mm/gup: Refactor record_subpages() to find 1st small page peterx
2023-12-19  7:55 ` [PATCH 08/13] mm/gup: Handle hugetlb for no_page_table() peterx
2023-12-19  7:55 ` peterx [this message]
2023-12-19 16:28   ` [PATCH 09/13] mm/gup: Cache *pudp in follow_pud_mask() James Houghton
2023-12-20  1:43     ` Peter Xu
2023-12-19  7:55 ` [PATCH 10/13] mm/gup: Handle huge pud for follow_pud_mask() peterx
2023-12-19  7:55 ` [PATCH 11/13] mm/gup: Handle huge pmd for follow_pmd_mask() peterx
2023-12-19  7:55 ` [PATCH 12/13] mm/gup: Handle hugepd for follow_page() peterx
2023-12-19  7:55 ` [PATCH 13/13] mm/gup: Handle hugetlb in the generic follow_page_mask code peterx
2023-12-22  1:35 ` [PATCH 00/13] mm/gup: Unify hugetlb, part 2 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=20231219075538.414708-10-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=andrew.jones@linux.dev \
    --cc=aneesh.kumar@kernel.org \
    --cc=axelrasmussen@google.com \
    --cc=christophe.leroy@csgroup.eu \
    --cc=david@redhat.com \
    --cc=hch@infradead.org \
    --cc=jgg@nvidia.com \
    --cc=jhubbard@nvidia.com \
    --cc=jthoughton@google.com \
    --cc=kirill@shutemov.name \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=lstoakes@gmail.com \
    --cc=mike.kravetz@oracle.com \
    --cc=mpe@ellerman.id.au \
    --cc=riel@surriel.com \
    --cc=rppt@kernel.org \
    --cc=shy828301@gmail.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.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