mm-x86-implement-arch_check_zapped_pud.patch removed from -mm tree
The quilt patch titled
Subject: mm/x86: implement arch_check_zapped_pud()
has been removed from the -mm tree. Its filename was
mm-x86-implement-arch_check_zapped_pud.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: mm/x86: implement arch_check_zapped_pud()
Date: Mon, 12 Aug 2024 14:12:23 -0400
Introduce arch_check_zapped_pud() to sanity check shadow stack on PUD zaps. It has the same logic as the PMD helper.
One thing to mention is, it might be a good idea to use page_table_check in the future for trapping wrong setups of shadow stack pgtable entries [1]. That is left for the future as a separate effort.
[1] https://lore.kernel.org/all/[email protected]
---
arch/x86/include/asm/pgtable.h | 10 ++++++++++ arch/x86/mm/pgtable.c | 6 ++++++ include/linux/pgtable.h | 6 ++++++ mm/huge_memory.c | 4 +++- 4 files changed, 25 insertions(+), 1 deletion(-)
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~mm-x86-implement-arch_check_zapped_pud +10 -0
@@ -174,6 +174,13 @@ static inline int pud_young(pud_t pud)return pud_flags (pud) & _PAGE_ACCESSED; } +static inline bool pud_shstk (pud_t pud) +{ +return cpu_feature_enabled (X86_FEATURE_SHSTK ) && + (pud_flags (pud) & (_PAGE_RW | _PAGE_DIRTY | _PAGE_PSE)) == + (_PAGE_DIRTY | _PAGE_PSE); +} +static inline int pte_write (pte_t pte) {/*
@@ -1667,6 +1674,9 @@ void arch_check_zapped_pte(struct vm_are#define arch_check_zapped_pmd arch_check_zapped_pmdvoid arch_check_zapped_pmd (struct vm_area_struct *vma,pmd_t pmd); +#define arch_check_zapped_pud arch_check_zapped_pud +void arch_check_zapped_pud (struct vm_area_struct *vma,pud_t pud); +#ifdef CONFIG_XEN_PV #define arch_has_hw_nonleaf_pmd_young arch_has_hw_nonleaf_pmd_youngstatic inline bool arch_has_hw_nonleaf_pmd_young (void )
arch/x86/mm/pgtable.c renamed from arch/x86/mm/pgtable.c~mm-x86-implement-arch_check_zapped_pud +6 -0
@@ -926,3 +926,9 @@ void arch_check_zapped_pmd(struct vm_areVM_WARN_ON_ONCE (!(vma->vm_flags &VM_SHADOW_STACK ) &&pmd_shstk (pmd)); } + +void arch_check_zapped_pud (struct vm_area_struct *vma,pud_t pud) +{ +/* See note in arch_check_zapped_pte() */ +VM_WARN_ON_ONCE (!(vma->vm_flags &VM_SHADOW_STACK ) &&pud_shstk (pud)); +}
include/linux/pgtable.h renamed from include/linux/pgtable.h~mm-x86-implement-arch_check_zapped_pud +6 -0
@@ -447,6 +447,12 @@ static inline void arch_check_zapped_pmd }#endif +#ifndef arch_check_zapped_pud +static inline void arch_check_zapped_pud (struct vm_area_struct *vma,pud_t pud) +{ +} +#endif +#ifndef __HAVE_ARCH_PTEP_GET_AND_CLEAR static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long address,
mm/huge_memory.c renamed from mm/huge_memory.c~mm-x86-implement-arch_check_zapped_pud +3 -1
@@ -2283,12 +2283,14 @@ int zap_huge_pud(struct mmu_gather *tlb, pud_t *pud, unsigned long addr) {spinlock_t *ptl; +pud_t orig_pud; ptl =__pud_trans_huge_lock (pud, vma);if (!ptl)return 0 ; -pudp_huge_get_and_clear_full (vma, addr, pud, tlb->fullmm); + orig_pud =pudp_huge_get_and_clear_full (vma, addr, pud, tlb->fullmm); +arch_check_zapped_pud (vma, orig_pud);tlb_remove_pud_tlb_entry (tlb, pud, addr);if (vma_is_special_huge (vma)) {spin_unlock (ptl);
_
Patches currently in -mm which might be from [email protected] are
mm-introduce-arch_supports_huge_pfnmap-and-special-bits-to-pmd-pud.patch mm-drop-is_huge_zero_pud.patch mm-mark-special-bits-for-huge-pfn-mappings-when-inject.patch mm-allow-thp-orders-for-pfnmaps.patch mm-gup-detect-huge-pfnmap-entries-in-gup-fast.patch mm-pagewalk-check-pfnmap-for-folio_walk_start.patch mm-pagewalk-check-pfnmap-for-folio_walk_start-fix.patch mm-fork-accept-huge-pfnmap-entries.patch mm-always-define-pxx_pgprot.patch mm-new-follow_pfnmap-api.patch kvm-use-follow_pfnmap-api.patch s390-pci_mmio-use-follow_pfnmap-api.patch mm-x86-pat-use-the-new-follow_pfnmap-api.patch vfio-use-the-new-follow_pfnmap-api.patch acrn-use-the-new-follow_pfnmap-api.patch mm-access_process_vm-use-the-new-follow_pfnmap-api.patch mm-remove-follow_pte.patch mm-x86-support-large-pfn-mappings.patch mm-arm64-support-large-pfn-mappings.patch