[PATCH v27 17/31] mm: Fixup places that call pte_mkwrite() directly
flat view
STALE1928d
SUPERSEDED: 1 (0M)
From: Yu-cheng Yu <hidden>
Date: 2021-05-21 22:15:06
Also in:
linux-api, linux-arch, linux-mm, lkml
Subsystem:
memory management, memory management - core, memory management - migration, memory management - thp (transparent huge page), memory mapping, the rest · Maintainers:
Andrew Morton, David Hildenbrand, Liam R. Howlett, Lorenzo Stoakes, Linus Torvalds
Status: Superseded by v30 (posted 2021-08-30). [go to v30]
Revision v27 (25 revisions archived); 1 review trailer.
Revisions (25)
- v6
- v7 [diff against previous]
- v8 [diff against previous]
- v9 [diff against previous]
- v10 [diff against previous]
- v11 [diff against previous]
- v12 [diff against previous]
- v13 [diff against previous]
- v14 [diff against previous] re-posted go to this post
- v15 [diff against previous]
- v16 [diff against previous]
- v17 [diff against previous]
- v18 [diff against previous]
- v19 [diff against previous]
- v20 [diff against previous]
- v21 [diff against previous]
- v22 [diff against previous]
- v23 [diff against previous]
- v24 [diff against previous]
- v25 [diff against previous]
- v26 [diff against previous]
- v27 current [diff against previous]
- v28 [diff against previous]
- v29 [diff against previous]
- v30 [diff against previous]
When serving a page fault, maybe_mkwrite() makes a PTE writable if it is in a writable vma. A shadow stack vma is writable, but its PTEs need _PAGE_DIRTY to be set to become writable. For this reason, maybe_mkwrite() has been updated. There are a few places that call pte_mkwrite() directly, but have the same result as from maybe_mkwrite(). These sites need to be updated for shadow stack as well. Thus, change them to maybe_mkwrite(): - do_anonymous_page() and migrate_vma_insert_page() check VM_WRITE directly and call pte_mkwrite(), which is the same as maybe_mkwrite(). Change them to maybe_mkwrite(). - In do_numa_page(), if the numa entry was writable, then pte_mkwrite() is called directly. Fix it by doing maybe_mkwrite(). Make the same changes to do_huge_pmd_numa_page(). - In change_pte_range(), pte_mkwrite() is called directly. Replace it with maybe_mkwrite(). Signed-off-by: Yu-cheng Yu <redacted> Reviewed-by: Kirill A. Shutemov <redacted> Cc: Kees Cook <redacted> --- v25: - Apply same changes to do_huge_pmd_numa_page() as to do_numa_page(). mm/huge_memory.c | 2 +- mm/memory.c | 5 ++--- mm/migrate.c | 3 +-- mm/mprotect.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e613278fe5e1..819f6c32eb5b 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c@@ -1551,7 +1551,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf, pmd_t pmd) pmd = pmd_modify(pmd, vma->vm_page_prot); pmd = pmd_mkyoung(pmd); if (was_writable) - pmd = pmd_mkwrite(pmd); + pmd = maybe_pmd_mkwrite(pmd, vma); set_pmd_at(vma->vm_mm, haddr, vmf->pmd, pmd); update_mmu_cache_pmd(vma, vmf->address, vmf->pmd); unlock_page(page);
diff --git a/mm/memory.c b/mm/memory.c
index 730daa00952b..2b6d068587cb 100644
--- a/mm/memory.c
+++ b/mm/memory.c@@ -3602,8 +3602,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) __SetPageUptodate(page); entry = mk_pte(page, vma->vm_page_prot); - if (vma->vm_flags & VM_WRITE) - entry = pte_mkwrite(pte_mkdirty(entry)); + entry = maybe_mkwrite(pte_mkdirty(entry), vma); vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl);
@@ -4225,7 +4224,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) pte = pte_modify(old_pte, vma->vm_page_prot); pte = pte_mkyoung(pte); if (was_writable) - pte = pte_mkwrite(pte); + pte = maybe_mkwrite(pte, vma); ptep_modify_prot_commit(vma, vmf->address, vmf->pte, old_pte, pte); update_mmu_cache(vma, vmf->address, vmf->pte); pte_unmap_unlock(vmf->pte, vmf->ptl);
diff --git a/mm/migrate.c b/mm/migrate.c
index b234c3f3acb7..1c307a01d995 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c@@ -2939,8 +2939,7 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, } } else { entry = mk_pte(page, vma->vm_page_prot); - if (vma->vm_flags & VM_WRITE) - entry = pte_mkwrite(pte_mkdirty(entry)); + entry = maybe_mkwrite(pte_mkdirty(entry), vma); } ptep = pte_offset_map_lock(mm, pmdp, addr, &ptl);
diff --git a/mm/mprotect.c b/mm/mprotect.c
index e7a443157988..819dd14c962a 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c@@ -135,7 +135,7 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, if (dirty_accountable && pte_dirty(ptent) && (pte_soft_dirty(ptent) || !(vma->vm_flags & VM_SOFTDIRTY))) { - ptent = pte_mkwrite(ptent); + ptent = maybe_mkwrite(ptent, vma); } ptep_modify_prot_commit(vma, addr, pte, oldpte, ptent); pages++;
--
2.21.0