mm-hugetlb-fix-uffd-wp-handling-for-migration-entries-in-hugetlb_change_protection.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: fix uffd-wp handling for migration entries in hugetlb_change_protection()
has been removed from the -mm tree. Its filename was
mm-hugetlb-fix-uffd-wp-handling-for-migration-entries-in-hugetlb_change_protection.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/hugetlb: fix uffd-wp handling for migration entries in hugetlb_change_protection()
Date: Thu, 22 Dec 2022 21:55:11 +0100
We have to update the uffd-wp SWP PTE bit independent of the type of migration entry. Currently, if we're unlucky and we want to install/clear the uffd-wp bit just while we're migrating a read-only mapped hugetlb page, we would miss to set/clear the uffd-wp bit.
Further, if we're processing a readable-exclusive migration entry and neither want to set or clear the uffd-wp bit, we could currently end up losing the uffd-wp bit. Note that the same would hold for writable migrating entries, however, having a writable migration entry with the uffd-wp bit set would already mean that something went wrong.
Note that the change from !is_readable_migration_entry -> writable_migration_entry is harmless and actually cleaner, as raised by Miaohe Lin and discussed in [1].
[1] https://lkml.kernel.org/r/[email protected]
---
mm/hugetlb.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-fix-uffd-wp-handling-for-migration-entries-in-hugetlb_change_protection +9 -8
@@ -6662,10 +6662,9 @@ unsigned long hugetlb_change_protection( }else if (unlikely (is_hugetlb_entry_migration (pte))) {swp_entry_t entry =pte_to_swp_entry (pte);struct page *page =pfn_swap_entry_to_page (entry); +pte_t newpte = pte; -if (!is_readable_migration_entry (entry)) { -pte_t newpte; - +if (is_writable_migration_entry (entry)) {if (PageAnon (page)) entry =make_readable_exclusive_migration_entry (swp_offset (entry));
@@ -6673,13 +6672,15 @@ unsigned long hugetlb_change_protection( entry =make_readable_migration_entry (swp_offset (entry)); newpte =swp_entry_to_pte (entry); -if (uffd_wp) - newpte =pte_swp_mkuffd_wp (newpte); -else if (uffd_wp_resolve) - newpte =pte_swp_clear_uffd_wp (newpte); -set_huge_pte_at (mm, address, ptep, newpte); pages++; } + +if (uffd_wp) + newpte =pte_swp_mkuffd_wp (newpte); +else if (uffd_wp_resolve) + newpte =pte_swp_clear_uffd_wp (newpte); +if (!pte_same (pte, newpte)) +set_huge_pte_at (mm, address, ptep, newpte); }else if (unlikely (is_pte_marker (pte))) {/* No other markers apply for now. */ WARN_ON_ONCE (!pte_marker_uffd_wp (pte));
_
Patches currently in -mm which might be from [email protected] are
mm-userfaultfd-rely-on-vma-vm_page_prot-in-uffd_wp_range.patch mm-userfaultfd-rely-on-vma-vm_page_prot-in-uffd_wp_range-fix.patch mm-mprotect-drop-pgprot_t-parameter-from-change_protection.patch mm-mprotect-drop-pgprot_t-parameter-from-change_protection-fix.patch selftests-vm-cow-add-cow-tests-for-collapsing-of-pte-mapped-anon-thp.patch mm-nommu-factor-out-check-for-nommu-shared-mappings-into-is_nommu_shared_mapping.patch mm-nommu-dont-use-vm_mayshare-for-map_private-mappings.patch drivers-misc-open-dice-dont-touch-vm_mayshare.patch selftests-mm-define-madv_pageout-to-fix-compilation-issues.patch