From: Xin Li <xin3.li@intel.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org,
andrew.cooper3@citrix.com, seanjc@google.com,
pbonzini@redhat.com, ravi.v.shankar@intel.com
Subject: [PATCH v4 09/34] x86/cpu: add X86_CR4_FRED macro
Date: Wed, 1 Mar 2023 21:24:46 -0800 [thread overview]
Message-ID: <20230302052511.1918-10-xin3.li@intel.com> (raw)
In-Reply-To: <20230302052511.1918-1-xin3.li@intel.com>
From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
Add X86_CR4_FRED macro for the FRED bit in %cr4. This bit should be a
pinned bit, not to be changed after initialization.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Tested-by: Shan Kang <shan.kang@intel.com>
Signed-off-by: Xin Li <xin3.li@intel.com>
---
arch/x86/include/uapi/asm/processor-flags.h | 2 ++
arch/x86/kernel/cpu/common.c | 11 ++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/uapi/asm/processor-flags.h b/arch/x86/include/uapi/asm/processor-flags.h
index c47cc7f2feeb..a90933f1ff41 100644
--- a/arch/x86/include/uapi/asm/processor-flags.h
+++ b/arch/x86/include/uapi/asm/processor-flags.h
@@ -132,6 +132,8 @@
#define X86_CR4_PKE _BITUL(X86_CR4_PKE_BIT)
#define X86_CR4_CET_BIT 23 /* enable Control-flow Enforcement Technology */
#define X86_CR4_CET _BITUL(X86_CR4_CET_BIT)
+#define X86_CR4_FRED_BIT 32 /* enable FRED kernel entry */
+#define X86_CR4_FRED _BITULL(X86_CR4_FRED_BIT)
/*
* x86-64 Task Priority Register, CR8
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 8cd4126d8253..e8cf6f4cfb52 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -412,10 +412,15 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c)
cr4_clear_bits(X86_CR4_UMIP);
}
-/* These bits should not change their value after CPU init is finished. */
+/*
+ * These bits should not change their value after CPU init is finished.
+ * The explicit cast to unsigned long suppresses a warning on i386 for
+ * x86-64 only feature bits >= 32.
+ */
static const unsigned long cr4_pinned_mask =
- X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_UMIP |
- X86_CR4_FSGSBASE | X86_CR4_CET;
+ (unsigned long)
+ (X86_CR4_SMEP | X86_CR4_SMAP | X86_CR4_UMIP |
+ X86_CR4_FSGSBASE | X86_CR4_CET | X86_CR4_FRED);
static DEFINE_STATIC_KEY_FALSE_RO(cr_pinning);
static unsigned long cr4_pinned_bits __ro_after_init;
--
2.34.1
next prev parent reply other threads:[~2023-03-02 5:51 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 5:24 [PATCH v4 00/34] x86: enable FRED for x86-64 Xin Li
2023-03-02 5:24 ` [PATCH v4 01/34] x86/traps: let common_interrupt() handle IRQ_MOVE_CLEANUP_VECTOR Xin Li
2023-03-02 5:24 ` [PATCH v4 02/34] x86/traps: add a system interrupt table for system interrupt dispatch Xin Li
2023-03-02 5:24 ` [PATCH v4 03/34] x86/traps: add install_system_interrupt_handler() Xin Li
2023-03-02 5:24 ` [PATCH v4 04/34] x86/traps: add external_interrupt() to dispatch external interrupts Xin Li
2023-03-02 5:24 ` [PATCH v4 05/34] x86/traps: export external_interrupt() for VMX IRQ reinjection Xin Li
2023-03-02 5:24 ` [PATCH v4 06/34] x86/cpufeature: add the cpu feature bit for FRED Xin Li
2023-03-02 5:24 ` [PATCH v4 07/34] x86/opcode: add ERETU, ERETS instructions to x86-opcode-map Xin Li
2023-03-02 5:24 ` [PATCH v4 08/34] x86/objtool: teach objtool about ERETU and ERETS Xin Li
2023-03-02 5:24 ` Xin Li [this message]
2023-03-02 5:24 ` [PATCH v4 10/34] x86/fred: add Kconfig option for FRED (CONFIG_X86_FRED) Xin Li
2023-03-02 5:24 ` [PATCH v4 11/34] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Xin Li
2023-03-02 5:24 ` [PATCH v4 12/34] x86/cpu: add MSR numbers for FRED configuration Xin Li
2023-03-02 5:24 ` [PATCH v4 13/34] x86/fred: header file for event types Xin Li
2023-03-02 5:24 ` [PATCH v4 14/34] x86/fred: header file with FRED definitions Xin Li
2023-03-02 5:24 ` [PATCH v4 15/34] x86/fred: make unions for the cs and ss fields in struct pt_regs Xin Li
2023-03-02 5:24 ` [PATCH v4 16/34] x86/fred: reserve space for the FRED stack frame Xin Li
2023-03-02 5:24 ` [PATCH v4 17/34] x86/fred: add a page fault entry stub for FRED Xin Li
2023-03-02 5:24 ` [PATCH v4 18/34] x86/fred: add a debug " Xin Li
2023-03-02 5:24 ` [PATCH v4 19/34] x86/fred: add a NMI " Xin Li
2023-03-02 5:24 ` [PATCH v4 20/34] x86/fred: add a machine check " Xin Li
2023-03-02 5:24 ` [PATCH v4 21/34] x86/fred: FRED entry/exit and dispatch code Xin Li
2023-03-02 5:24 ` [PATCH v4 22/34] x86/fred: FRED initialization code Xin Li
2023-03-02 5:25 ` [PATCH v4 23/34] x86/fred: update MSR_IA32_FRED_RSP0 during task switch Xin Li
2023-03-02 5:25 ` [PATCH v4 24/34] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Xin Li
2023-03-02 5:25 ` [PATCH v4 25/34] x86/fred: disallow the swapgs instruction " Xin Li
2023-03-02 5:25 ` [PATCH v4 26/34] x86/fred: no ESPFIX needed " Xin Li
2023-03-02 5:25 ` [PATCH v4 27/34] x86/fred: allow single-step trap and NMI when starting a new thread Xin Li
2023-03-02 5:25 ` [PATCH v4 28/34] x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user Xin Li
2023-03-02 5:25 ` [PATCH v4 29/34] x86/ia32: do not modify the DPL bits for a null selector Xin Li
2023-03-02 5:25 ` [PATCH v4 30/34] x86/fred: allow FRED systems to use interrupt vectors 0x10-0x1f Xin Li
2023-03-02 5:25 ` [PATCH v4 31/34] x86/fred: allow dynamic stack frame size Xin Li
2023-03-02 5:25 ` [PATCH v4 32/34] x86/fred: disable FRED by default in its early stage Xin Li
2023-03-02 5:25 ` [PATCH v4 33/34] KVM: x86/vmx: call external_interrupt() for IRQ reinjection when FRED is enabled Xin Li
2023-03-06 9:32 ` Li, Xin3
2023-03-02 5:25 ` [PATCH v4 34/34] KVM: x86/vmx: execute "int $2" for NMI " Xin Li
2023-03-06 18:11 ` Sean Christopherson
2023-03-06 18:56 ` Li, Xin3
2023-03-03 4:04 ` [PATCH v4 00/34] x86: enable FRED for x86-64 Kang, Shan
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=20230302052511.1918-10-xin3.li@intel.com \
--to=xin3.li@intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--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