Skip to contentSkip to conversation

mm/memory: Fix missing pte marker for !page on pte zaps

PATCH Applied [email protected] 2 participants 5 messages Mar 13, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/memory: Fix missing pte marker for !page on pte zaps

From: Peter Xu <[email protected]>

Commit 0cf18e839f64 of large folio zap work broke uffd-wp. Now mm's uffd unit test "wp-unpopulated" will trigger this WARN_ON_ONCE().

The WARN_ON_ONCE() asserts that an VMA cannot be registered with userfaultfd-wp if it contains a !normal page, but it's actually possible. One example is an anonymous vma, register with uffd-wp, read anything will install a zero page. Then when zap on it, this should trigger.

What's more, removing that WARN_ON_ONCE may not be enough either, because we should also not rely on "whether it's a normal page" to decide whether pte marker is needed. For example, one can register wr-protect over some DAX regions to track writes when UFFD_FEATURE_WP_ASYNC enabled, in which case it can have page==NULL for a devmap but we may want to keep the marker around.

Cc Muhammad Usama Anjum <[email protected]>
Cc David Hildenbrand <[email protected]>
Fixes 0cf18e839f64 ("mm/memory: handle !page case in zap_present_pte() separately")
---
 mm/memory.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
mm/memory.c +3 -1
index f2bc6dd15eb8..904f70b99498 100644
@@ -1536,7 +1536,9 @@ static inline int zap_present_ptes(struct mmu_gather *tlb,
 		ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm);
 		arch_check_zapped_pte(vma, ptent);
 		tlb_remove_tlb_entry(tlb, pte, addr);
-		VM_WARN_ON_ONCE(userfaultfd_wp(vma));
+		if (userfaultfd_pte_wp(vma, ptent))
+			zap_install_uffd_wp_if_needed(vma, addr, pte, 1,
+						      details, ptent);
 		ksm_might_unmap_zero_page(mm, ptent);
 		return 1;
 	}
Signature · 1 line
2.44.0
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · On 13.03.24 22:31, [email protected] wrote:

From: Peter Xu <[email protected]>

Commit 0cf18e839f64 of large folio zap work broke uffd-wp. Now mm's uffd unit test "wp-unpopulated" will trigger this WARN_ON_ONCE().

Good that I added the WARN_ON_ONCE() :)

Quoted 5 lines

The WARN_ON_ONCE() asserts that an VMA cannot be registered with userfaultfd-wp if it contains a !normal page, but it's actually possible. One example is an anonymous vma, register with uffd-wp, read anything will install a zero page. Then when zap on it, this should trigger.

Are you sure? zap_install_uffd_wp_if_needed() contains right at the start:

	/* Zap on anonymous always means dropping everything */
	if (vma_is_anonymous(vma))
		return;

So if that's the case the unit test triggers, I'm confused.

Quoted 7 lines

What's more, removing that WARN_ON_ONCE may not be enough either, because we should also not rely on "whether it's a normal page" to decide whether pte marker is needed. For example, one can register wr-protect over some DAX regions to track writes when UFFD_FEATURE_WP_ASYNC enabled, in which case it can have page==NULL for a devmap but we may want to keep the marker around.

I thought uffd-wp was limited to specific backends only. But looks like that changed with UFFD_FEATURE_WP_ASYNC, I guess?

Change itself looks, good. Not sure about the anon_vma example above.

Thanks!

Quoted 24 lines
Cc Muhammad Usama Anjum <[email protected]>
Cc David Hildenbrand <[email protected]>
Fixes 0cf18e839f64 ("mm/memory: handle !page case in zap_present_pte() separately")
---
  mm/memory.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
mm/memory.c +3 -1
index f2bc6dd15eb8..904f70b99498 100644
@@ -1536,7 +1536,9 @@ static inline int zap_present_ptes(struct mmu_gather *tlb,
  		ptep_get_and_clear_full(mm, addr, pte, tlb->fullmm);
  		arch_check_zapped_pte(vma, ptent);
  		tlb_remove_tlb_entry(tlb, pte, addr);
-		VM_WARN_ON_ONCE(userfaultfd_wp(vma));
+		if (userfaultfd_pte_wp(vma, ptent))
+			zap_install_uffd_wp_if_needed(vma, addr, pte, 1,
+						      details, ptent);
  		ksm_might_unmap_zero_page(mm, ptent);
  		return 1;
  	}
Signature · 3 lines
Cheers,

David / dhildenb
#2 lore raw
Quoted 14 lines · David Hildenbrand
Quoted 4 lines · On 13.03.24 22:31, [email protected] wrote:

From: Peter Xu <[email protected]>

Commit 0cf18e839f64 of large folio zap work broke uffd-wp. Now mm's uffd unit test "wp-unpopulated" will trigger this WARN_ON_ONCE().

Good that I added the WARN_ON_ONCE() :)

Quoted 5 lines

The WARN_ON_ONCE() asserts that an VMA cannot be registered with userfaultfd-wp if it contains a !normal page, but it's actually possible. One example is an anonymous vma, register with uffd-wp, read anything will install a zero page. Then when zap on it, this should trigger.

Quoted 7 lines

Are you sure? zap_install_uffd_wp_if_needed() contains right at the start:

	/* Zap on anonymous always means dropping everything */
	if (vma_is_anonymous(vma))
		return;

So if that's the case the unit test triggers, I'm confused.

Ah, got it. It's not that we have to place a marker, just that it can happen. Of course it can. All makes sense.

Thanks!

Signature · 3 lines
Cheers,

David / dhildenb
author
#3 lore raw
In reply to David Hildenbrand
Quoted 7 lines · David Hildenbrand
Quoted 4 lines · On 13.03.24 22:31, [email protected] wrote:

From: Peter Xu <[email protected]>

Commit 0cf18e839f64 of large folio zap work broke uffd-wp. Now mm's uffd unit test "wp-unpopulated" will trigger this WARN_ON_ONCE().

Good that I added the WARN_ON_ONCE() :)

To be explict, VM_WARN_ON_ONCE. :) And that's my guess that you didn't hit it when you posted the series and did the tests, as I know latest distros like Fedora dropped DEBUG_VM, so maybe you had your base config out of there (but I normally have it irrelevant of that).

Quoted 7 lines
Quoted 6 lines

The WARN_ON_ONCE() asserts that an VMA cannot be registered with userfaultfd-wp if it contains a !normal page, but it's actually possible. One example is an anonymous vma, register with uffd-wp, read anything will install a zero page. Then when zap on it, this should trigger.

Quoted 5 lines

Are you sure? zap_install_uffd_wp_if_needed() contains right at the start:

	/* Zap on anonymous always means dropping everything */
	if (vma_is_anonymous(vma))
		return;

My example is not exactly how the test failed, but should be a simpler version of it. To trigger this warning I don't think it requires the zero page to be wr-protected at all or have any pte marker involved. UFFDIO_REGISTER should suffice, afaiu (feel free to read the example above again; there's no mention of ioctl(UFFDIO_WRITEPROTECT)).

Quoted 11 lines

So if that's the case the unit test triggers, I'm confused.

Quoted 7 lines

What's more, removing that WARN_ON_ONCE may not be enough either, because we should also not rely on "whether it's a normal page" to decide whether pte marker is needed. For example, one can register wr-protect over some DAX regions to track writes when UFFD_FEATURE_WP_ASYNC enabled, in which case it can have page==NULL for a devmap but we may want to keep the marker around.

Quoted 2 lines

I thought uffd-wp was limited to specific backends only. But looks like that changed with UFFD_FEATURE_WP_ASYNC, I guess?

Correct. That was also what the new PAGEMAP ioctl relies on.

Quoted 7 lines

Change itself looks, good. Not sure about the anon_vma example above.

Thanks!

Thanks,

Signature · 1 line
Peter Xu
#4 lore raw
Quoted 7 lines · Peter Xu
Quoted 6 lines · David Hildenbrand
Quoted 4 lines · On 13.03.24 22:31, [email protected] wrote:

From: Peter Xu <[email protected]>

Commit 0cf18e839f64 of large folio zap work broke uffd-wp. Now mm's uffd unit test "wp-unpopulated" will trigger this WARN_ON_ONCE().

Quoted 6 lines
Quoted 1 line

Good that I added the WARN_ON_ONCE() :)

To be explict, VM_WARN_ON_ONCE. :) And that's my guess that you didn't hit it when you posted the series and did the tests, as I know latest distros like Fedora dropped DEBUG_VM, so maybe you had your base config out of there (but I normally have it irrelevant of that).

It's rather surprising that this went unnoticed for quite a while. I usually do run with DEBUG_VM, but I have a bunch of different VMs where I tests stuff, likely it was off when I ran the selftests.

Signature · 3 lines
Cheers,

David / dhildenb