Received-SPF: pass (google.com: domain of linux-kernel+bounces-5558-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20231219075538.414708-1-peterx@redhat.com> <20231219075538.414708-10-peterx@redhat.com>
In-Reply-To: <20231219075538.414708-10-peterx@redhat.com>
From: James Houghton <jthoughton@google.com>
Date: Tue, 19 Dec 2023 11:28:54 -0500
Message-ID: <CADrL8HVu8=-DdAwXN_pO91g1A1+F7bKfBRpm6jYfYMk1QZcRFA@mail.gmail.com>
Subject: Re: [PATCH 09/13] mm/gup: Cache *pudp in follow_pud_mask()
To: peterx@redhat.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, 
	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>, "Aneesh Kumar K . V" <aneesh.kumar@kernel.org>, 
	Andrew Morton <akpm@linux-foundation.org>, Jason Gunthorpe <jgg@nvidia.com>, 
	Andrea Arcangeli <aarcange@redhat.com>, Axel Rasmussen <axelrasmussen@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Dec 19, 2023 at 2:57=E2=80=AFAM <peterx@redhat.com> wrote:
>
> From: Peter Xu <peterx@redhat.com>
>
> Introduce "pud_t pud" in the function, so the code won't dereference *pud=
p
> multiple time.  Not only because that looks less straightforward, but als=
o
> 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 =3D vma->vm_mm;
>
> -       pud =3D pud_offset(p4dp, address);
> -       if (pud_none(*pud))
> +       pudp =3D pud_offset(p4dp, address);
> +       pud =3D *pudp;

I think you might want a READ_ONCE() on this so that the compiler
doesn't actually read the pud multiple times.

> +       if (pud_none(pud))
>                 return no_page_table(vma, flags, address);
> -       if (pud_devmap(*pud)) {
> -               ptl =3D pud_lock(mm, pud);
> -               page =3D follow_devmap_pud(vma, address, pud, flags, &ctx=
->pgmap);
> +       if (pud_devmap(pud)) {
> +               ptl =3D pud_lock(mm, pudp);
> +               page =3D follow_devmap_pud(vma, address, pudp, flags, &ct=
x->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);

Not your change, but reading this, it's not clear to me that
`pud_present(*pudp)` (and non-leaf) would necessarily be true at this
point -- like, I would prefer to see `!pud_present(pud)` instead of
`pud_bad()`. Thank you for adding that in the next patch. :)

Feel free to add:

Acked-by: James Houghton <jthoughton@google.com>