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@amacapital.net>, 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> Cc: Yu-cheng Yu <yu-cheng.yu@intel.com> Subject: [PATCH v7 08/27] mm: Introduce VM_SHSTK for shadow stack memory Date: Thu, 6 Jun 2019 13:06:27 -0700 [thread overview] Message-ID: <20190606200646.3951-9-yu-cheng.yu@intel.com> (raw) In-Reply-To: <20190606200646.3951-1-yu-cheng.yu@intel.com> VM_SHSTK indicates a shadow stack memory area. The shadow stack is implemented only for the 64-bit kernel. Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com> --- fs/proc/task_mmu.c | 3 +++ include/linux/mm.h | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 01d4eb0e6bd1..dd8b0cd1ea36 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -661,6 +661,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) [ilog2(VM_PKEY_BIT4)] = "", #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ +#ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER + [ilog2(VM_SHSTK)] = "ss" +#endif }; size_t i; diff --git a/include/linux/mm.h b/include/linux/mm.h index 0e8834ac32b7..398f1e1c35e5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -287,11 +287,13 @@ extern unsigned int kobjsize(const void *objp); #define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) #define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) #define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) #define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) #define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS @@ -329,6 +331,12 @@ extern unsigned int kobjsize(const void *objp); # define VM_MPX VM_NONE #endif +#ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER +# define VM_SHSTK VM_HIGH_ARCH_5 +#else +# define VM_SHSTK VM_NONE +#endif + #ifndef VM_GROWSUP # define VM_GROWSUP VM_NONE #endif -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
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@amacapital.net>, 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> Cc: Yu-cheng Yu <yu-cheng.yu@intel.com> Subject: [PATCH v7 08/27] mm: Introduce VM_SHSTK for shadow stack memory Date: Thu, 6 Jun 2019 13:06:27 -0700 [thread overview] Message-ID: <20190606200646.3951-9-yu-cheng.yu@intel.com> (raw) In-Reply-To: <20190606200646.3951-1-yu-cheng.yu@intel.com> VM_SHSTK indicates a shadow stack memory area. The shadow stack is implemented only for the 64-bit kernel. Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com> --- fs/proc/task_mmu.c | 3 +++ include/linux/mm.h | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 01d4eb0e6bd1..dd8b0cd1ea36 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -661,6 +661,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma) [ilog2(VM_PKEY_BIT4)] = "", #endif #endif /* CONFIG_ARCH_HAS_PKEYS */ +#ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER + [ilog2(VM_SHSTK)] = "ss" +#endif }; size_t i; diff --git a/include/linux/mm.h b/include/linux/mm.h index 0e8834ac32b7..398f1e1c35e5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -287,11 +287,13 @@ extern unsigned int kobjsize(const void *objp); #define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */ +#define VM_HIGH_ARCH_BIT_5 37 /* bit only usable on 64-bit architectures */ #define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0) #define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1) #define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2) #define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3) #define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#define VM_HIGH_ARCH_5 BIT(VM_HIGH_ARCH_BIT_5) #endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */ #ifdef CONFIG_ARCH_HAS_PKEYS @@ -329,6 +331,12 @@ extern unsigned int kobjsize(const void *objp); # define VM_MPX VM_NONE #endif +#ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER +# define VM_SHSTK VM_HIGH_ARCH_5 +#else +# define VM_SHSTK VM_NONE +#endif + #ifndef VM_GROWSUP # define VM_GROWSUP VM_NONE #endif -- 2.17.1
next prev parent reply other threads:[~2019-06-06 20:17 UTC|newest] Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-06 20:06 [PATCH v7 00/27] Control-flow Enforcement: Shadow Stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 01/27] Documentation/x86: Add CET description Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 02/27] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 03/27] x86/fpu/xstate: Change names to separate XSAVES system and user states Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 04/27] x86/fpu/xstate: Introduce XSAVES system states Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 21:18 ` Dave Hansen 2019-06-06 21:18 ` Dave Hansen 2019-06-06 22:04 ` Andy Lutomirski 2019-06-06 22:04 ` Andy Lutomirski 2019-06-06 22:08 ` Dave Hansen 2019-06-06 22:08 ` Dave Hansen 2019-06-06 22:10 ` Yu-cheng Yu 2019-06-06 22:10 ` Yu-cheng Yu 2019-06-06 22:10 ` Yu-cheng Yu 2019-06-07 1:54 ` Andy Lutomirski 2019-06-07 1:54 ` Andy Lutomirski 2019-06-06 20:06 ` [PATCH v7 05/27] x86/fpu/xstate: Add XSAVES system states for shadow stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-07 7:07 ` Peter Zijlstra 2019-06-07 7:07 ` Peter Zijlstra 2019-06-07 16:14 ` Yu-cheng Yu 2019-06-07 16:14 ` Yu-cheng Yu 2019-06-07 16:14 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 06/27] x86/cet: Add control protection exception handler Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 07/27] x86/cet/shstk: Add Kconfig option for user-mode shadow stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu [this message] 2019-06-06 20:06 ` [PATCH v7 08/27] mm: Introduce VM_SHSTK for shadow stack memory Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 09/27] mm/mmap: Prevent Shadow Stack VMA merges Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 10/27] x86/mm: Change _PAGE_DIRTY to _PAGE_DIRTY_HW Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 11/27] x86/mm: Introduce _PAGE_DIRTY_SW Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 12/27] drm/i915/gvt: Update _PAGE_DIRTY to _PAGE_DIRTY_BITS Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 13/27] x86/mm: Modify ptep_set_wrprotect and pmdp_set_wrprotect for _PAGE_DIRTY_SW Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 14/27] x86/mm: Shadow stack page fault error checking Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 15/27] mm: Handle shadow stack page fault Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-07 7:30 ` Peter Zijlstra 2019-06-07 7:30 ` Peter Zijlstra 2019-06-06 20:06 ` [PATCH v7 16/27] mm: Handle THP/HugeTLB " Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 17/27] mm: Update can_follow_write_pte/pmd for shadow stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 18/27] mm: Introduce do_mmap_locked() Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-07 7:43 ` Peter Zijlstra 2019-06-07 7:43 ` Peter Zijlstra 2019-06-07 7:47 ` Peter Zijlstra 2019-06-07 7:47 ` Peter Zijlstra 2019-06-07 16:16 ` Yu-cheng Yu 2019-06-07 16:16 ` Yu-cheng Yu 2019-06-07 16:16 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 19/27] x86/cet/shstk: User-mode shadow stack support Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 20/27] x86/cet/shstk: Introduce WRUSS instruction Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 21/27] x86/cet/shstk: Handle signals for shadow stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 22/27] binfmt_elf: Extract .note.gnu.property from an ELF file Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-07 7:58 ` Peter Zijlstra 2019-06-07 7:58 ` Peter Zijlstra 2019-06-07 16:17 ` Yu-cheng Yu 2019-06-07 16:17 ` Yu-cheng Yu 2019-06-07 16:17 ` Yu-cheng Yu 2019-06-07 18:01 ` Dave Martin 2019-06-07 18:01 ` Dave Martin 2019-06-10 16:29 ` Yu-cheng Yu 2019-06-10 16:29 ` Yu-cheng Yu 2019-06-10 16:29 ` Yu-cheng Yu 2019-06-10 16:57 ` Dave Martin 2019-06-10 16:57 ` Dave Martin 2019-06-10 17:24 ` Florian Weimer 2019-06-10 17:24 ` Florian Weimer 2019-06-10 17:24 ` Florian Weimer 2019-06-11 11:41 ` Dave Martin 2019-06-11 11:41 ` Dave Martin 2019-06-11 19:31 ` Yu-cheng Yu 2019-06-11 19:31 ` Yu-cheng Yu 2019-06-11 19:31 ` Yu-cheng Yu 2019-06-12 9:32 ` Dave Martin 2019-06-12 9:32 ` Dave Martin 2019-06-12 19:04 ` Yu-cheng Yu 2019-06-12 19:04 ` Yu-cheng Yu 2019-06-12 19:04 ` Yu-cheng Yu 2019-06-13 13:26 ` Dave Martin 2019-06-13 13:26 ` Dave Martin 2019-06-17 11:08 ` Florian Weimer 2019-06-17 11:08 ` Florian Weimer 2019-06-17 11:08 ` Florian Weimer 2019-06-17 12:20 ` Thomas Gleixner 2019-06-17 12:20 ` Thomas Gleixner 2019-06-17 12:20 ` Thomas Gleixner 2019-06-18 9:12 ` Dave Martin 2019-06-18 9:12 ` Dave Martin 2019-06-18 12:41 ` Peter Zijlstra 2019-06-18 12:41 ` Peter Zijlstra 2019-06-18 12:47 ` Florian Weimer 2019-06-18 12:47 ` Florian Weimer 2019-06-18 12:47 ` Florian Weimer 2019-06-18 12:55 ` Peter Zijlstra 2019-06-18 12:55 ` Peter Zijlstra 2019-06-18 13:32 ` Dave Martin 2019-06-18 13:32 ` Dave Martin 2019-06-18 13:32 ` Dave Martin 2019-06-18 13:32 ` Dave Martin 2019-06-18 14:58 ` Yu-cheng Yu 2019-06-18 14:58 ` Yu-cheng Yu 2019-06-18 14:58 ` Yu-cheng Yu 2019-06-18 15:49 ` Florian Weimer 2019-06-18 15:49 ` Florian Weimer 2019-06-18 15:49 ` Florian Weimer 2019-06-18 15:53 ` Yu-cheng Yu 2019-06-18 15:53 ` Yu-cheng Yu 2019-06-18 15:53 ` Yu-cheng Yu 2019-06-18 16:05 ` Florian Weimer 2019-06-18 16:05 ` Florian Weimer 2019-06-18 16:05 ` Florian Weimer 2019-06-18 16:00 ` Yu-cheng Yu 2019-06-18 16:00 ` Yu-cheng Yu 2019-06-18 16:00 ` Yu-cheng Yu 2019-06-18 16:20 ` Dave Martin 2019-06-18 16:20 ` Dave Martin 2019-06-18 16:25 ` Florian Weimer 2019-06-18 16:25 ` Florian Weimer 2019-06-18 16:25 ` Florian Weimer 2019-06-18 16:50 ` Dave Martin 2019-06-18 16:50 ` Dave Martin 2019-06-06 20:06 ` [PATCH v7 23/27] x86/cet/shstk: ELF header parsing of Shadow Stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-07 7:54 ` Peter Zijlstra 2019-06-07 7:54 ` Peter Zijlstra 2019-06-06 20:06 ` [PATCH v7 24/27] x86/cet/shstk: Handle thread shadow stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 25/27] mm/mmap: Add Shadow stack pages to memory accounting Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-11 17:55 ` Dave Hansen 2019-06-11 17:55 ` Dave Hansen 2019-06-11 19:22 ` Yu-cheng Yu 2019-06-11 19:22 ` Yu-cheng Yu 2019-06-11 19:22 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 26/27] x86/cet/shstk: Add arch_prctl functions for Shadow Stack Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-06-06 20:06 ` [PATCH v7 27/27] x86/cet/shstk: Add Shadow Stack instructions to opcode map Yu-cheng Yu 2019-06-06 20:06 ` Yu-cheng Yu 2019-11-01 14:03 ` Adrian Hunter 2019-11-01 14:03 ` Adrian Hunter 2019-11-01 14:17 ` Yu-cheng Yu 2019-11-01 14:17 ` Yu-cheng Yu 2019-11-01 14:17 ` Yu-cheng Yu
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=20190606200646.3951-9-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=hjl.tools@gmail.com \ --cc=hpa@zytor.com \ --cc=jannh@google.com \ --cc=keescook@chromium.org \ --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@amacapital.net \ --cc=mike.kravetz@oracle.com \ --cc=mingo@redhat.com \ --cc=nadav.amit@gmail.com \ --cc=oleg@redhat.com \ --cc=pavel@ucw.cz \ --cc=peterz@infradead.org \ --cc=ravi.v.shankar@intel.com \ --cc=rdunlap@infradead.org \ --cc=tglx@linutronix.de \ --cc=vedvyas.shanbhogue@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.