mm/page_vma_mapped.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Switch from ptep_get() to ptep_get_lockless() accessor for
PTE reads when no lock is taken.
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
---
mm/page_vma_mapped.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
index a4d52fdb3056..6559e17f11c2 100644
--- a/mm/page_vma_mapped.c
+++ b/mm/page_vma_mapped.c
@@ -41,7 +41,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp,
if (!pvmw->pte)
return false;
- ptent = ptep_get(pvmw->pte);
+ ptent = ptep_get_lockless(pvmw->pte);
if (pte_none(ptent)) {
return false;
@@ -310,7 +310,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
goto restart;
}
pvmw->pte++;
- } while (pte_none(ptep_get(pvmw->pte)));
+ } while (pte_none(ptep_get_lockless(pvmw->pte)));
if (!pvmw->ptl) {
spin_lock(ptl);
--
2.51.0
On Mon, May 04, 2026 at 03:04:34PM +0200, Alexander Gordeev wrote:
>Switch from ptep_get() to ptep_get_lockless() accessor for
>PTE reads when no lock is taken.
>
>Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
>---
> mm/page_vma_mapped.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
>index a4d52fdb3056..6559e17f11c2 100644
>--- a/mm/page_vma_mapped.c
>+++ b/mm/page_vma_mapped.c
>@@ -41,7 +41,7 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, pmd_t *pmdvalp,
> if (!pvmw->pte)
> return false;
>
>- ptent = ptep_get(pvmw->pte);
>+ ptent = ptep_get_lockless(pvmw->pte);
>
> if (pte_none(ptent)) {
> return false;
>@@ -310,7 +310,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
> goto restart;
> }
> pvmw->pte++;
>- } while (pte_none(ptep_get(pvmw->pte)));
>+ } while (pte_none(ptep_get_lockless(pvmw->pte)));
As Oscar mentioned in lkml.org/lkml/2026/4/27/630, map_pte() may take the
lock. So probably it is not right?
>
> if (!pvmw->ptl) {
> spin_lock(ptl);
>--
>2.51.0
>
--
Wei Yang
Help you, Help me
On Thu, May 07, 2026 at 09:34:33AM +0000, Wei Yang wrote:
> >@@ -310,7 +310,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
> > goto restart;
> > }
> > pvmw->pte++;
> >- } while (pte_none(ptep_get(pvmw->pte)));
> >+ } while (pte_none(ptep_get_lockless(pvmw->pte)));
>
> As Oscar mentioned in lkml.org/lkml/2026/4/27/630, map_pte() may take the
> lock. So probably it is not right?
If I read the code correctly map_pte() might take the lock, but also
might not take it. If it took the lock and uses ptep_get_lockless(),
then it is fine. But if it did not take the lock and uses ptep_get(),
then it is an issue.
> >
> > if (!pvmw->ptl) {
> > spin_lock(ptl);
> >--
> >2.51.0
> >
>
> --
> Wei Yang
Thanks!
On Thu, May 07, 2026 at 12:32:09PM +0200, Alexander Gordeev wrote:
>On Thu, May 07, 2026 at 09:34:33AM +0000, Wei Yang wrote:
>> >@@ -310,7 +310,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
>> > goto restart;
>> > }
>> > pvmw->pte++;
>> >- } while (pte_none(ptep_get(pvmw->pte)));
>> >+ } while (pte_none(ptep_get_lockless(pvmw->pte)));
>>
>> As Oscar mentioned in lkml.org/lkml/2026/4/27/630, map_pte() may take the
>> lock. So probably it is not right?
>
>If I read the code correctly map_pte() might take the lock, but also
>might not take it. If it took the lock and uses ptep_get_lockless(),
>then it is fine. But if it did not take the lock and uses ptep_get(),
>then it is an issue.
>
So the rule here is:
* ptep_get_lockless() could be used for locked and not locked
* ptep_get() only used when locked
Right?
>> >
>> > if (!pvmw->ptl) {
>> > spin_lock(ptl);
>> >--
>> >2.51.0
>> >
>>
>> --
>> Wei Yang
>
>Thanks!
--
Wei Yang
Help you, Help me
On Fri, May 08, 2026 at 01:00:40AM +0000, Wei Yang wrote:
> On Thu, May 07, 2026 at 12:32:09PM +0200, Alexander Gordeev wrote:
> >On Thu, May 07, 2026 at 09:34:33AM +0000, Wei Yang wrote:
> >> >@@ -310,7 +310,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
> >> > goto restart;
> >> > }
> >> > pvmw->pte++;
> >> >- } while (pte_none(ptep_get(pvmw->pte)));
> >> >+ } while (pte_none(ptep_get_lockless(pvmw->pte)));
> >>
> >> As Oscar mentioned in lkml.org/lkml/2026/4/27/630, map_pte() may take the
> >> lock. So probably it is not right?
> >
> >If I read the code correctly map_pte() might take the lock, but also
> >might not take it. If it took the lock and uses ptep_get_lockless(),
> >then it is fine. But if it did not take the lock and uses ptep_get(),
> >then it is an issue.
> >
>
> So the rule here is:
>
> * ptep_get_lockless() could be used for locked and not locked
> * ptep_get() only used when locked
>
> Right?
Yes, this is my assumption.
> >> >
> >> > if (!pvmw->ptl) {
> >> > spin_lock(ptl);
> >> >--
> >> >2.51.0
> >> >
> >>
> >> --
> >> Wei Yang
> >
> >Thanks!
>
> --
> Wei Yang
> Help you, Help me
On 5/8/26 07:15, Alexander Gordeev wrote:
> On Fri, May 08, 2026 at 01:00:40AM +0000, Wei Yang wrote:
>> On Thu, May 07, 2026 at 12:32:09PM +0200, Alexander Gordeev wrote:
>>>
>>> If I read the code correctly map_pte() might take the lock, but also
>>> might not take it. If it took the lock and uses ptep_get_lockless(),
>>> then it is fine. But if it did not take the lock and uses ptep_get(),
>>> then it is an issue.
>>>
>>
>> So the rule here is:
>>
>> * ptep_get_lockless() could be used for locked and not locked
>> * ptep_get() only used when locked
>>
>> Right?
>
> Yes, this is my assumption.
I agree, ptep_get_lockless() simply makes sense to return something sensible if
there are concurrent modifications (which cannot happen when the PTL is held).
That's why only 32bit with 64bit PTEs and arm64 even has to special-case it.
We should clarify in the patch description that in the do-while loop, we might
or might not hold the PTL, and that calling ptep_get_lockless() with the PTL
held is OK.
I wonder if it's more efficient and clearer, to use the correct variant, though?
diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
index a4d52fdb3056..36d97661a4e5 100644
--- a/mm/page_vma_mapped.c
+++ b/mm/page_vma_mapped.c
@@ -187,6 +187,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
p4d_t *p4d;
pud_t *pud;
pmd_t pmde;
+ pte_t pteval;
/* The only possible pmd mapping has been handled on last iteration */
if (pvmw->pmd && !pvmw->pte)
@@ -310,7 +311,11 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
goto restart;
}
pvmw->pte++;
- } while (pte_none(ptep_get(pvmw->pte)));
+ if (!pvmw->ptl)
+ pteval = ptep_get_lockless(pvmw->pte);
+ else
+ pteval = ptep_get(pvmw->pte);
+ } while (pte_none(pteval));
if (!pvmw->ptl) {
spin_lock(ptl);
--
Cheers,
David
On Fri, May 08, 2026 at 10:17:16AM +0200, David Hildenbrand (Arm) wrote:
> >> So the rule here is:
> >>
> >> * ptep_get_lockless() could be used for locked and not locked
> >> * ptep_get() only used when locked
> >>
> >> Right?
> >
> > Yes, this is my assumption.
>
> I agree, ptep_get_lockless() simply makes sense to return something sensible if
> there are concurrent modifications (which cannot happen when the PTL is held).
>
> That's why only 32bit with 64bit PTEs and arm64 even has to special-case it.
>
>
> We should clarify in the patch description that in the do-while loop, we might
> or might not hold the PTL, and that calling ptep_get_lockless() with the PTL
> held is OK.
>
> I wonder if it's more efficient and clearer, to use the correct variant, though?
>
>
> diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
> index a4d52fdb3056..36d97661a4e5 100644
> --- a/mm/page_vma_mapped.c
> +++ b/mm/page_vma_mapped.c
> @@ -187,6 +187,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
> p4d_t *p4d;
> pud_t *pud;
> pmd_t pmde;
> + pte_t pteval;
>
> /* The only possible pmd mapping has been handled on last iteration */
> if (pvmw->pmd && !pvmw->pte)
> @@ -310,7 +311,11 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
> goto restart;
> }
> pvmw->pte++;
> - } while (pte_none(ptep_get(pvmw->pte)));
> + if (!pvmw->ptl)
> + pteval = ptep_get_lockless(pvmw->pte);
> + else
> + pteval = ptep_get(pvmw->pte);
> + } while (pte_none(pteval));
Looks fine to me. I will try and add it to the next version.
> if (!pvmw->ptl) {
> spin_lock(ptl);
>
>
> --
> Cheers,
>
> David
Thanks!
On Fri, May 08, 2026 at 07:15:45AM +0200, Alexander Gordeev wrote:
>On Fri, May 08, 2026 at 01:00:40AM +0000, Wei Yang wrote:
>> On Thu, May 07, 2026 at 12:32:09PM +0200, Alexander Gordeev wrote:
>> >On Thu, May 07, 2026 at 09:34:33AM +0000, Wei Yang wrote:
>> >> >@@ -310,7 +310,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
>> >> > goto restart;
>> >> > }
>> >> > pvmw->pte++;
>> >> >- } while (pte_none(ptep_get(pvmw->pte)));
>> >> >+ } while (pte_none(ptep_get_lockless(pvmw->pte)));
>> >>
>> >> As Oscar mentioned in lkml.org/lkml/2026/4/27/630, map_pte() may take the
>> >> lock. So probably it is not right?
>> >
>> >If I read the code correctly map_pte() might take the lock, but also
>> >might not take it. If it took the lock and uses ptep_get_lockless(),
>> >then it is fine. But if it did not take the lock and uses ptep_get(),
>> >then it is an issue.
>> >
>>
>> So the rule here is:
>>
>> * ptep_get_lockless() could be used for locked and not locked
>> * ptep_get() only used when locked
>>
>> Right?
>
>Yes, this is my assumption.
>
Thanks, if so, it looks good.
>> >> >
>> >> > if (!pvmw->ptl) {
>> >> > spin_lock(ptl);
>> >> >--
>> >> >2.51.0
>> >> >
>> >>
>> >> --
>> >> Wei Yang
>> >
>> >Thanks!
>>
>> --
>> Wei Yang
>> Help you, Help me
--
Wei Yang
Help you, Help me
© 2016 - 2026 Red Hat, Inc.