[PATCH v30 21/32] mm/mprotect: Exclude shadow stack from preserve_write
flat view
STALE1854d
REVIEWED: 1 (0M)
From: Yu-cheng Yu <hidden>
Date: 2021-08-30 18:17:09
Also in:
linux-api, linux-arch, linux-mm, lkml
Subsystem:
memory management, memory management - thp (transparent huge page), memory mapping, the rest · Maintainers:
Andrew Morton, David Hildenbrand, Liam R. Howlett, Lorenzo Stoakes, Linus Torvalds
Status: Reviewed.
Revision v30 (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]
- 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 [diff against previous]
- v28 [diff against previous]
- v29 [diff against previous]
- v30 current [diff against previous]
In change_pte_range(), when a PTE is changed for prot_numa, _PAGE_RW is preserved to avoid the additional write fault after the NUMA hinting fault. However, pte_write() now includes both normal writable and shadow stack (RW=0, Dirty=1) PTEs, but the latter does not have _PAGE_RW and has no need to preserve it. Exclude shadow stack from preserve_write test, and apply the same change to change_huge_pmd(). Signed-off-by: Yu-cheng Yu <redacted> Reviewed-by: Kirill A. Shutemov <redacted> --- v25: - Move is_shadow_stack_mapping() to a separate line. v24: - Change arch_shadow_stack_mapping() to is_shadow_stack_mapping(). --- mm/huge_memory.c | 7 +++++++ mm/mprotect.c | 7 +++++++ 2 files changed, 14 insertions(+)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index d35acb59dde9..bb38ecdf992f 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c@@ -1776,6 +1776,13 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, return 0; preserve_write = prot_numa && pmd_write(*pmd); + + /* + * Preserve only normal writable huge PMD, but not shadow + * stack (RW=0, Dirty=1). + */ + if (is_shadow_stack_mapping(vma->vm_flags)) + preserve_write = false; ret = 1; #ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 9b424f2fd3a9..94cb799216ec 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c@@ -77,6 +77,13 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, pte_t ptent; bool preserve_write = prot_numa && pte_write(oldpte); + /* + * Preserve only normal writable PTE, but not shadow + * stack (RW=0, Dirty=1). + */ + if (is_shadow_stack_mapping(vma->vm_flags)) + preserve_write = false; + /* * Avoid trapping faults against the zero or KSM * pages. See similar comment in change_huge_pmd.
--
2.21.0