revert-mm-uffd-fix-warning-without-pte_marker_uffd_wp-compiled-in.patch removed from -mm tree
The quilt patch titled
Subject: Revert "mm/uffd: fix warning without PTE_MARKER_UFFD_WP compiled in"
has been removed from the -mm tree. Its filename was
revert-mm-uffd-fix-warning-without-pte_marker_uffd_wp-compiled-in.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: Revert "mm/uffd: fix warning without PTE_MARKER_UFFD_WP compiled in"
Date: Mon, 24 Oct 2022 15:33:36 -0400
With " mm/uffd: Fix vma check on userfault for wp" to fix the registration, we'll be safe to remove the macro hacks now.
---
mm/hugetlb.c | 4 ---- mm/memory.c | 2 -- mm/mprotect.c | 2 -- 3 files changed, 8 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~revert-mm-uffd-fix-warning-without-pte_marker_uffd_wp-compiled-in +0 -4
@@ -5114,7 +5114,6 @@ static void __unmap_hugepage_range(struc* unmapped and its refcount is dropped, so just clear pte here. */ if (unlikely (!pte_present (pte))) { -#ifdef CONFIG_PTE_MARKER_UFFD_WP /* * If the pte was wr-protected by uffd-wp in any of the * swap forms, meanwhile the caller does not want to
@@ -5126,7 +5125,6 @@ static void __unmap_hugepage_range(strucset_huge_pte_at (mm, address, ptep,make_pte_marker (PTE_MARKER_UFFD_WP )); else -#endif huge_pte_clear (mm ,address ,ptep ,sz );spin_unlock (ptl);continue ;
@@ -5155,13 +5153,11 @@ static void __unmap_hugepage_range(structlb_remove_huge_tlb_entry (h, tlb, ptep, address);if (huge_pte_dirty (pte))set_page_dirty (page); -#ifdef CONFIG_PTE_MARKER_UFFD_WP /* Leave a uffd-wp pte marker if needed */ if (huge_pte_uffd_wp (pte) && !(zap_flags &ZAP_FLAG_DROP_MARKER ))set_huge_pte_at (mm, address, ptep,make_pte_marker (PTE_MARKER_UFFD_WP )); -#endif hugetlb_count_sub (pages_per_huge_page (h), mm);page_remove_rmap (page, vma, true);
mm/memory.c renamed from mm/memory.c~revert-mm-uffd-fix-warning-without-pte_marker_uffd_wp-compiled-in +0 -2
@@ -1393,12 +1393,10 @@ zap_install_uffd_wp_if_needed(struct vm_ unsigned long addr, pte_t *pte, struct zap_details *details, pte_t pteval) { -#ifdef CONFIG_PTE_MARKER_UFFD_WP if (zap_drop_file_uffd_wp(details)) return;pte_install_uffd_wp_if_needed (vma ,addr ,pte ,pteval ); -#endif } static unsigned long zap_pte_range(struct mmu_gather *tlb,
mm/mprotect.c renamed from mm/mprotect.c~revert-mm-uffd-fix-warning-without-pte_marker_uffd_wp-compiled-in +0 -2
@@ -267,7 +267,6 @@ static unsigned long change_pte_range(st }else {/* It must be an none page, or what else?.. */ WARN_ON_ONCE (!pte_none (oldpte)); -#ifdef CONFIG_PTE_MARKER_UFFD_WP if (unlikely (uffd_wp && !vma_is_anonymous (vma))) {/* * For file-backed mem, we need to be able to
@@ -279,7 +278,6 @@ static unsigned long change_pte_range(st make_pte_marker(PTE_MARKER_UFFD_WP)); pages++; } -#endif } }while (pte++, addr +=PAGE_SIZE , addr != end);arch_leave_lazy_mmu_mode ();
_
Patches currently in -mm which might be from [email protected] are
mm-always-compile-in-pte-markers.patch
mm-use-pte-markers-for-swap-errors.patch