From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-api@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Andy Lutomirski <luto@kernel.org>,
Balbir Singh <bsingharora@gmail.com>,
Borislav Petkov <bp@alien8.de>,
Cyrill Gorcunov <gorcunov@gmail.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Eugene Syromiatnikov <esyr@redhat.com>,
Florian Weimer <fweimer@redhat.com>,
"H.J. Lu" <hjl.tools@gmail.com>, Jann Horn <jannh@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Kees Cook <keescook@chromium.org>,
Mike Kravetz <mike.kravetz@oracle.com>,
Nadav Amit <nadav.amit@gmail.com>,
Oleg Nesterov <oleg@redhat.com>, Pavel Machek <pavel@ucw.cz>,
Peter Zijlstra <peterz@infradead.org>,
Randy Dunlap <rdunlap@infradead.org>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Vedvyas Shanbhogue <vedvyas.shanbhogue@intel.com>,
Dave Martin <Dave.Martin@arm.com>,
Weijiang Yang <weijiang.yang@intel.com>,
Pengfei Xu <pengfei.xu@intel.com>,
Haitao Huang <haitao.huang@intel.com>,
Rick P Edgecombe <rick.p.edgecombe@intel.com>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH v28 16/32] x86/mm: Update maybe_mkwrite() for shadow stack
Date: Thu, 22 Jul 2021 13:52:03 -0700 [thread overview]
Message-ID: <20210722205219.7934-17-yu-cheng.yu@intel.com> (raw)
In-Reply-To: <20210722205219.7934-1-yu-cheng.yu@intel.com>
When serving a page fault, maybe_mkwrite() makes a PTE writable if its vma
has VM_WRITE.
A shadow stack vma has VM_SHADOW_STACK. Its PTEs have _PAGE_DIRTY, but not
_PAGE_WRITE. In fork(), _PAGE_DIRTY is cleared to cause copy-on-write,
and in the page fault handler, _PAGE_DIRTY is restored and the shadow stack
page is writable again.
Introduce an x86 version of maybe_mkwrite(), which sets proper PTE bits
according to VM flags.
Apply the same changes to maybe_pmd_mkwrite().
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
Reviewed-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Kees Cook <keescook@chromium.org>
---
arch/x86/include/asm/pgtable.h | 6 ++++++
arch/x86/mm/pgtable.c | 20 ++++++++++++++++++++
include/linux/mm.h | 2 ++
mm/huge_memory.c | 2 ++
4 files changed, 30 insertions(+)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index df4ce715560a..bfe4ea2b652d 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -280,6 +280,9 @@ static inline int pmd_trans_huge(pmd_t pmd)
return (pmd_val(pmd) & (_PAGE_PSE|_PAGE_DEVMAP)) == _PAGE_PSE;
}
+#define maybe_pmd_mkwrite maybe_pmd_mkwrite
+extern pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma);
+
#ifdef CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD
static inline int pud_trans_huge(pud_t pud)
{
@@ -1632,6 +1635,9 @@ static inline bool arch_faults_on_old_pte(void)
return false;
}
+#define maybe_mkwrite maybe_mkwrite
+extern pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma);
+
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_PGTABLE_H */
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 3364fe62b903..ba449d12ec32 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -610,6 +610,26 @@ int pmdp_clear_flush_young(struct vm_area_struct *vma,
}
#endif
+pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
+{
+ if (likely(vma->vm_flags & VM_WRITE))
+ pte = pte_mkwrite(pte);
+ else if (likely(vma->vm_flags & VM_SHADOW_STACK))
+ pte = pte_mkwrite_shstk(pte);
+ return pte;
+}
+
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma)
+{
+ if (likely(vma->vm_flags & VM_WRITE))
+ pmd = pmd_mkwrite(pmd);
+ else if (likely(vma->vm_flags & VM_SHADOW_STACK))
+ pmd = pmd_mkwrite_shstk(pmd);
+ return pmd;
+}
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+
/**
* reserve_top_address - reserves a hole in the top of kernel address space
* @reserve - size of hole to reserve
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 4a9985e50819..4548f75cef14 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1015,12 +1015,14 @@ void free_compound_page(struct page *page);
* pte_mkwrite. But get_user_pages can cause write faults for mappings
* that do not have writing enabled, when used by access_process_vm.
*/
+#ifndef maybe_mkwrite
static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
{
if (likely(vma->vm_flags & VM_WRITE))
pte = pte_mkwrite(pte);
return pte;
}
+#endif
vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page);
void do_set_pte(struct vm_fault *vmf, struct page *page, unsigned long addr);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index afff3ac87067..c8dd5913884e 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -491,12 +491,14 @@ static int __init setup_transparent_hugepage(char *str)
}
__setup("transparent_hugepage=", setup_transparent_hugepage);
+#ifndef maybe_pmd_mkwrite
pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma)
{
if (likely(vma->vm_flags & VM_WRITE))
pmd = pmd_mkwrite(pmd);
return pmd;
}
+#endif
#ifdef CONFIG_MEMCG
static inline struct deferred_split *get_deferred_split_queue(struct page *page)
--
2.21.0
next prev parent reply other threads:[~2021-07-22 20:53 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 20:51 [PATCH v28 00/32] Control-flow Enforcement: Shadow Stack Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 01/32] Documentation/x86: Add CET description Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 02/32] x86/cet/shstk: Add Kconfig option for Shadow Stack Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 03/32] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 04/32] x86/cpufeatures: Introduce CPU setup and option parsing for CET Yu-cheng Yu
2021-08-09 16:06 ` Borislav Petkov
2021-08-10 15:39 ` Yu, Yu-cheng
2021-08-10 16:51 ` Borislav Petkov
2021-07-22 20:51 ` [PATCH v28 05/32] x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states Yu-cheng Yu
2021-08-09 16:46 ` Borislav Petkov
2021-08-10 15:50 ` Yu, Yu-cheng
2021-07-22 20:51 ` [PATCH v28 06/32] x86/cet: Add control-protection fault handler Yu-cheng Yu
2021-08-09 17:51 ` Borislav Petkov
2021-08-10 16:06 ` Yu, Yu-cheng
2021-07-22 20:51 ` [PATCH v28 07/32] x86/mm: Remove _PAGE_DIRTY from kernel RO pages Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 08/32] x86/mm: Move pmd_write(), pud_write() up in the file Yu-cheng Yu
2021-08-09 18:02 ` Borislav Petkov
2021-07-22 20:51 ` [PATCH v28 09/32] x86/mm: Introduce _PAGE_COW Yu-cheng Yu
2021-08-16 10:43 ` Borislav Petkov
2021-08-17 18:24 ` Yu, Yu-cheng
2021-08-17 19:54 ` Borislav Petkov
2021-08-17 20:13 ` Andy Lutomirski
2021-08-17 20:24 ` Borislav Petkov
2021-08-17 20:51 ` Andy Lutomirski
2021-08-17 21:01 ` Borislav Petkov
2021-08-18 16:38 ` Yu, Yu-cheng
2021-08-21 16:27 ` Borislav Petkov
2021-07-22 20:51 ` [PATCH v28 10/32] drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 11/32] x86/mm: Update pte_modify for _PAGE_COW Yu-cheng Yu
2021-07-22 20:51 ` [PATCH v28 12/32] x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COW Yu-cheng Yu
2021-08-16 16:01 ` Borislav Petkov
2021-08-17 18:33 ` Yu, Yu-cheng
2021-07-22 20:52 ` [PATCH v28 13/32] mm: Move VM_UFFD_MINOR_BIT from 37 to 38 Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 14/32] mm: Introduce VM_SHADOW_STACK for shadow stack memory Yu-cheng Yu
2021-08-16 16:35 ` Borislav Petkov
2021-08-17 18:35 ` Yu, Yu-cheng
2021-07-22 20:52 ` [PATCH v28 15/32] x86/mm: Shadow Stack page fault error checking Yu-cheng Yu
2021-07-22 20:52 ` Yu-cheng Yu [this message]
2021-08-16 17:03 ` [PATCH v28 16/32] x86/mm: Update maybe_mkwrite() for shadow stack Borislav Petkov
2021-08-17 18:36 ` Yu, Yu-cheng
2021-07-22 20:52 ` [PATCH v28 17/32] mm: Fixup places that call pte_mkwrite() directly Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 18/32] mm: Add guard pages around a shadow stack Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 19/32] mm/mmap: Add shadow stack pages to memory accounting Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 20/32] mm: Update can_follow_write_pte() for shadow stack Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 21/32] mm/mprotect: Exclude shadow stack from preserve_write Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 22/32] mm: Re-introduce vm_flags to do_mmap() Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 23/32] x86/cet/shstk: Add user-mode shadow stack support Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 24/32] x86/process: Change copy_thread() argument 'arg' to 'stack_size' Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 25/32] x86/cet/shstk: Handle thread shadow stack Yu-cheng Yu
2021-07-22 21:05 ` Dave Hansen
2021-07-23 17:30 ` Yu, Yu-cheng
2021-07-22 20:52 ` [PATCH v28 26/32] x86/cet/shstk: Introduce shadow stack token setup/verify routines Yu-cheng Yu
2021-07-22 21:15 ` Dave Hansen
2021-07-23 18:01 ` Yu, Yu-cheng
2021-07-22 20:52 ` [PATCH v28 27/32] x86/cet/shstk: Handle signals for shadow stack Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 28/32] ELF: Introduce arch_setup_elf_property() Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 29/32] x86/cet/shstk: Add arch_prctl functions for shadow stack Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 30/32] mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.h Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 31/32] mm: Update arch_validate_flags() to test vma anonymous Yu-cheng Yu
2021-07-22 20:52 ` [PATCH v28 32/32] mm: Introduce PROT_SHADOW_STACK for shadow stack Yu-cheng Yu
2021-07-22 21:08 ` [PATCH v28 00/32] Control-flow Enforcement: Shadow Stack Dave Hansen
2021-07-23 17:28 ` Yu, Yu-cheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210722205219.7934-17-yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=Dave.Martin@arm.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=bsingharora@gmail.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=esyr@redhat.com \
--cc=fweimer@redhat.com \
--cc=gorcunov@gmail.com \
--cc=haitao.huang@intel.com \
--cc=hjl.tools@gmail.com \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=nadav.amit@gmail.com \
--cc=oleg@redhat.com \
--cc=pavel@ucw.cz \
--cc=pengfei.xu@intel.com \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=rdunlap@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=tglx@linutronix.de \
--cc=vedvyas.shanbhogue@intel.com \
--cc=weijiang.yang@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).