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>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Subject: [PATCH v23 04/28] x86/cpufeatures: Introduce X86_FEATURE_CET and setup functions
Date: Tue, 16 Mar 2021 08:10:30 -0700 [thread overview]
Message-ID: <20210316151054.5405-5-yu-cheng.yu@intel.com> (raw)
In-Reply-To: <20210316151054.5405-1-yu-cheng.yu@intel.com>
Introduce a software-defined X86_FEATURE_CET, which indicates either Shadow
Stack or Indirect Branch Tracking (or both) is present. Also introduce
related cpu init/setup functions.
Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
arch/x86/include/asm/cpufeatures.h | 2 +-
arch/x86/include/asm/disabled-features.h | 5 ++++-
arch/x86/include/uapi/asm/processor-flags.h | 2 ++
arch/x86/kernel/cpu/common.c | 14 ++++++++++++++
arch/x86/kernel/cpu/intel.c | 3 +++
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h
index bf861fc89fef..d771e62677de 100644
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@ -108,7 +108,7 @@
#define X86_FEATURE_EXTD_APICID ( 3*32+26) /* Extended APICID (8 bits) */
#define X86_FEATURE_AMD_DCM ( 3*32+27) /* AMD multi-node processor */
#define X86_FEATURE_APERFMPERF ( 3*32+28) /* P-State hardware coordination feedback capability (APERF/MPERF MSRs) */
-/* free ( 3*32+29) */
+#define X86_FEATURE_CET ( 3*32+29) /* Control-flow enforcement */
#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */
#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31) /* TSC has known frequency */
diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
index 914b353fe75c..b9a73b882cf9 100644
--- a/arch/x86/include/asm/disabled-features.h
+++ b/arch/x86/include/asm/disabled-features.h
@@ -71,9 +71,11 @@
#ifdef CONFIG_X86_CET
#define DISABLE_SHSTK 0
#define DISABLE_IBT 0
+#define DISABLE_CET 0
#else
#define DISABLE_SHSTK (1 << (X86_FEATURE_SHSTK & 31))
#define DISABLE_IBT (1 << (X86_FEATURE_IBT & 31))
+#define DISABLE_CET (1 << (X86_FEATURE_CET & 31))
#endif
/*
@@ -82,7 +84,8 @@
#define DISABLED_MASK0 (DISABLE_VME)
#define DISABLED_MASK1 0
#define DISABLED_MASK2 0
-#define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR)
+#define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR| \
+ DISABLE_CET)
#define DISABLED_MASK4 (DISABLE_PCID)
#define DISABLED_MASK5 0
#define DISABLED_MASK6 0
diff --git a/arch/x86/include/uapi/asm/processor-flags.h b/arch/x86/include/uapi/asm/processor-flags.h
index bcba3c643e63..a8df907e8017 100644
--- a/arch/x86/include/uapi/asm/processor-flags.h
+++ b/arch/x86/include/uapi/asm/processor-flags.h
@@ -130,6 +130,8 @@
#define X86_CR4_SMAP _BITUL(X86_CR4_SMAP_BIT)
#define X86_CR4_PKE_BIT 22 /* enable Protection Keys support */
#define X86_CR4_PKE _BITUL(X86_CR4_PKE_BIT)
+#define X86_CR4_CET_BIT 23 /* enable Control-flow Enforcement */
+#define X86_CR4_CET _BITUL(X86_CR4_CET_BIT)
/*
* x86-64 Task Priority Register, CR8
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index ab640abe26b6..6bd07727089e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -510,6 +510,14 @@ static __init int setup_disable_pku(char *arg)
__setup("nopku", setup_disable_pku);
#endif /* CONFIG_X86_64 */
+static __always_inline void setup_cet(struct cpuinfo_x86 *c)
+{
+ if (!cpu_feature_enabled(X86_FEATURE_CET))
+ return;
+
+ cr4_set_bits(X86_CR4_CET);
+}
+
/*
* Some CPU features depend on higher CPUID levels, which may not always
* be available due to CPUID level capping or broken virtualization
@@ -1255,6 +1263,11 @@ static void __init cpu_parse_early_param(void)
if (cmdline_find_option_bool(boot_command_line, "noxsaves"))
setup_clear_cpu_cap(X86_FEATURE_XSAVES);
+ if (cmdline_find_option_bool(boot_command_line, "no_user_shstk"))
+ setup_clear_cpu_cap(X86_FEATURE_SHSTK);
+ if (cmdline_find_option_bool(boot_command_line, "no_user_ibt"))
+ setup_clear_cpu_cap(X86_FEATURE_IBT);
+
arglen = cmdline_find_option(boot_command_line, "clearcpuid", arg, sizeof(arg));
if (arglen <= 0)
return;
@@ -1594,6 +1607,7 @@ static void identify_cpu(struct cpuinfo_x86 *c)
x86_init_rdrand(c);
setup_pku(c);
+ setup_cet(c);
/*
* Clear/Set all flags overridden by options, need do it
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 0e422a544835..2e11d9555e9b 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -334,6 +334,9 @@ static void early_init_intel(struct cpuinfo_x86 *c)
static void bsp_init_intel(struct cpuinfo_x86 *c)
{
+ if (cpu_has(c, X86_FEATURE_SHSTK) || cpu_has(c, X86_FEATURE_IBT))
+ setup_force_cpu_cap(X86_FEATURE_CET);
+
resctrl_cpu_detect(c);
}
--
2.21.0
next prev parent reply other threads:[~2021-03-16 15:12 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 15:10 [PATCH v23 00/28] Control-flow Enforcement: Shadow Stack Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 01/28] Documentation/x86: Add CET description Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 02/28] x86/cet/shstk: Add Kconfig option for user-mode control-flow protection Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 03/28] x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET) Yu-cheng Yu
2021-03-16 15:10 ` Yu-cheng Yu [this message]
2021-03-16 15:10 ` [PATCH v23 05/28] x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 06/28] x86/cet: Add control-protection fault handler Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 07/28] x86/mm: Remove _PAGE_DIRTY from kernel RO pages Yu-cheng Yu
2021-03-22 9:13 ` Kirill A. Shutemov
2021-03-22 14:52 ` Yu, Yu-cheng
2021-03-16 15:10 ` [PATCH v23 08/28] x86/mm: Move pmd_write(), pud_write() up in the file Yu-cheng Yu
2021-03-22 11:28 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 09/28] x86/mm: Introduce _PAGE_COW Yu-cheng Yu
2021-03-22 11:29 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 10/28] drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS Yu-cheng Yu
2021-03-22 11:30 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 11/28] x86/mm: Update pte_modify for _PAGE_COW Yu-cheng Yu
2021-03-22 11:31 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 12/28] x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COW Yu-cheng Yu
2021-03-22 10:15 ` Kirill A. Shutemov
2021-03-22 10:46 ` Peter Zijlstra
2021-03-22 11:38 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 13/28] mm: Introduce VM_SHSTK for shadow stack memory Yu-cheng Yu
2021-03-22 11:33 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 14/28] x86/mm: Shadow Stack page fault error checking Yu-cheng Yu
2021-03-22 10:38 ` Kirill A. Shutemov
2021-03-22 17:27 ` Yu, Yu-cheng
2021-03-16 15:10 ` [PATCH v23 15/28] x86/mm: Update maybe_mkwrite() for shadow stack Yu-cheng Yu
2021-03-17 15:56 ` Borislav Petkov
2021-03-22 10:46 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 16/28] mm: Fixup places that call pte_mkwrite() directly Yu-cheng Yu
2021-03-18 9:47 ` Borislav Petkov
2021-03-18 11:16 ` Borislav Petkov
2021-03-16 15:10 ` [PATCH v23 17/28] mm: Add guard pages around a shadow stack Yu-cheng Yu
2021-03-22 10:55 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 18/28] mm/mmap: Add shadow stack pages to memory accounting Yu-cheng Yu
2021-03-22 10:57 ` Kirill A. Shutemov
2021-03-26 15:46 ` Yu, Yu-cheng
2021-03-29 10:10 ` Kirill A. Shutemov
2021-03-16 15:10 ` [PATCH v23 19/28] mm: Update can_follow_write_pte() for shadow stack Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 20/28] mm/mprotect: Exclude shadow stack from preserve_write Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 21/28] mm: Re-introduce vm_flags to do_mmap() Yu-cheng Yu
2021-03-18 11:42 ` Borislav Petkov
2021-03-18 15:59 ` Yu, Yu-cheng
2021-03-18 16:13 ` Borislav Petkov
2021-03-16 15:10 ` [PATCH v23 22/28] x86/cet/shstk: User-mode shadow stack support Yu-cheng Yu
2021-03-18 12:32 ` Borislav Petkov
2021-03-18 19:05 ` Yu, Yu-cheng
2021-03-19 9:28 ` Borislav Petkov
2021-03-19 15:15 ` Yu, Yu-cheng
2021-03-16 15:10 ` [PATCH v23 23/28] x86/cet/shstk: Handle signals for shadow stack Yu-cheng Yu
2021-03-19 12:51 ` Borislav Petkov
2021-03-16 15:10 ` [PATCH v23 24/28] ELF: Introduce arch_setup_elf_property() Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 25/28] x86/cet/shstk: Handle thread shadow stack Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 26/28] x86/cet/shstk: Add arch_prctl functions for " Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 27/28] mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.h Yu-cheng Yu
2021-03-16 15:10 ` [PATCH v23 28/28] mm: Introduce PROT_SHSTK for shadow stack Yu-cheng Yu
2021-03-22 11:27 ` Kirill A. Shutemov
2021-03-16 21:15 ` [PATCH v23 00/28] Control-flow Enforcement: Shadow Stack Peter Zijlstra
2021-03-16 21:34 ` Yu, Yu-cheng
2021-03-17 9:18 ` Ingo Molnar
2021-03-17 10:14 ` Peter Zijlstra
2021-03-19 16:24 ` Yu, Yu-cheng
2021-03-19 21:43 ` Yu, Yu-cheng
2021-03-23 20:49 ` Peter Zijlstra
2021-03-23 21:03 ` 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=20210316151054.5405-5-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=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=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).