Add a range flag marking an invalidation that only upgrades permissions, with no PFN change and no revoked access. change_protection() sets it for MM_CP_PERM_UPGRADE and for the userfaultfd resolves, which unprotect a page and thus only restore access. Now that change_protection() keeps writable entries writable on these changes, no present entry loses access. Writable migration and device-private entries are still made read-only, which does not affect secondary MMUs. Migration entries are only installed after secondary MMUs are invalidated, and device-private pages are migrated back, with an invalidation, before the CPU can access them. hugetlb_change_protection() never sets the flag, as hugetlb does not restore the write bit and may unshare page tables. A secondary MMU can use the flag to keep its mappings rather than zap them. Consumers that ignore it are unaffected. Signed-off-by: Carlos López --- include/linux/mmu_notifier.h | 5 +++++ mm/hugetlb.c | 4 ++++ mm/mprotect.c | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index a11a44eef521..112be28cdf6b 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -60,6 +60,11 @@ enum mmu_notifier_event { }; #define MMU_NOTIFIER_RANGE_BLOCKABLE (1 << 0) +/* + * Set on an invalidation that only expands permissions without + * revoking any existing access, nor freeing/moving the underlying page. + */ +#define MMU_NOTIFIER_RANGE_PERM_UPGRADE (1 << 1) struct mmu_notifier_ops { /* diff --git a/mm/hugetlb.c b/mm/hugetlb.c index da5d04edf7c1..1a69d1da527e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6606,6 +6606,10 @@ long hugetlb_change_protection(struct vm_area_struct *vma, * In the case of shared PMDs, the area to flush could be beyond * start/end. Set range.start/range.end to cover the maximum possible * range if PMD sharing is possible. + * + * MMU_NOTIFIER_RANGE_PERM_UPGRADE is never set here. hugetlb does not + * restore the write bit, and huge_pmd_unshare() may drop the mapping, + * so this is not a strict permission upgrade. */ mmu_notifier_range_init(&range, MMU_NOTIFY_PROTECTION_VMA, 0, mm, start, end); diff --git a/mm/mprotect.c b/mm/mprotect.c index 16b8aef755ab..fb2023dc6e66 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -601,8 +601,9 @@ static inline long change_pud_range(struct mmu_gather *tlb, continue; if (!range.start) { - mmu_notifier_range_init(&range, - MMU_NOTIFY_PROTECTION_VMA, 0, + mmu_notifier_range_init(&range, MMU_NOTIFY_PROTECTION_VMA, + mm_cp_is_perm_upgrade(cp_flags) ? + MMU_NOTIFIER_RANGE_PERM_UPGRADE : 0, vma->vm_mm, addr, end); mmu_notifier_invalidate_range_start(&range); } -- 2.51.0