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,
jiangshanlai@gmail.com, shan.kang@intel.com
Subject: [PATCH v7 12/33] x86/cpu: add MSR numbers for FRED configuration
Date: Tue, 4 Apr 2023 03:26:55 -0700 [thread overview]
Message-ID: <20230404102716.1795-13-xin3.li@intel.com> (raw)
In-Reply-To: <20230404102716.1795-1-xin3.li@intel.com>
From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
Add MSR numbers for the FRED configuration registers.
Originally-by: Megha Dey <megha.dey@intel.com>
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/asm/msr-index.h | 13 ++++++++++++-
tools/arch/x86/include/asm/msr-index.h | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index ad35355ee43e..87db728f8bbc 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -36,8 +36,19 @@
#define EFER_FFXSR (1<<_EFER_FFXSR)
#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS)
-/* Intel MSRs. Some also available on other CPUs */
+/* FRED MSRs */
+#define MSR_IA32_FRED_RSP0 0x1cc /* Level 0 stack pointer */
+#define MSR_IA32_FRED_RSP1 0x1cd /* Level 1 stack pointer */
+#define MSR_IA32_FRED_RSP2 0x1ce /* Level 2 stack pointer */
+#define MSR_IA32_FRED_RSP3 0x1cf /* Level 3 stack pointer */
+#define MSR_IA32_FRED_STKLVLS 0x1d0 /* Exception stack levels */
+#define MSR_IA32_FRED_SSP0 MSR_IA32_PL0_SSP /* Level 0 shadow stack pointer */
+#define MSR_IA32_FRED_SSP1 0x1d1 /* Level 1 shadow stack pointer */
+#define MSR_IA32_FRED_SSP2 0x1d2 /* Level 2 shadow stack pointer */
+#define MSR_IA32_FRED_SSP3 0x1d3 /* Level 3 shadow stack pointer */
+#define MSR_IA32_FRED_CONFIG 0x1d4 /* Entrypoint and interrupt stack level */
+/* Intel MSRs. Some also available on other CPUs */
#define MSR_TEST_CTRL 0x00000033
#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29
#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT)
diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h
index ad35355ee43e..87db728f8bbc 100644
--- a/tools/arch/x86/include/asm/msr-index.h
+++ b/tools/arch/x86/include/asm/msr-index.h
@@ -36,8 +36,19 @@
#define EFER_FFXSR (1<<_EFER_FFXSR)
#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS)
-/* Intel MSRs. Some also available on other CPUs */
+/* FRED MSRs */
+#define MSR_IA32_FRED_RSP0 0x1cc /* Level 0 stack pointer */
+#define MSR_IA32_FRED_RSP1 0x1cd /* Level 1 stack pointer */
+#define MSR_IA32_FRED_RSP2 0x1ce /* Level 2 stack pointer */
+#define MSR_IA32_FRED_RSP3 0x1cf /* Level 3 stack pointer */
+#define MSR_IA32_FRED_STKLVLS 0x1d0 /* Exception stack levels */
+#define MSR_IA32_FRED_SSP0 MSR_IA32_PL0_SSP /* Level 0 shadow stack pointer */
+#define MSR_IA32_FRED_SSP1 0x1d1 /* Level 1 shadow stack pointer */
+#define MSR_IA32_FRED_SSP2 0x1d2 /* Level 2 shadow stack pointer */
+#define MSR_IA32_FRED_SSP3 0x1d3 /* Level 3 shadow stack pointer */
+#define MSR_IA32_FRED_CONFIG 0x1d4 /* Entrypoint and interrupt stack level */
+/* Intel MSRs. Some also available on other CPUs */
#define MSR_TEST_CTRL 0x00000033
#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29
#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT)
--
2.34.1
next prev parent reply other threads:[~2023-04-04 10:54 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-04 10:26 [PATCH v7 00/33] x86: enable FRED for x86-64 Xin Li
2023-04-04 10:26 ` [PATCH v7 01/33] x86/traps: let common_interrupt() handle IRQ_MOVE_CLEANUP_VECTOR Xin Li
2023-04-04 10:26 ` [PATCH v7 02/33] x86/fred: make unions for the cs and ss fields in struct pt_regs Xin Li
2023-04-04 10:26 ` [PATCH v7 03/33] x86/traps: add a system interrupt table for system interrupt dispatch Xin Li
2023-04-04 10:26 ` [PATCH v7 04/33] x86/traps: add install_system_interrupt_handler() Xin Li
2023-04-04 10:26 ` [PATCH v7 05/33] x86/traps: add external_interrupt() to dispatch external interrupts Xin Li
2023-04-04 10:26 ` [PATCH v7 06/33] x86/cpufeature: add the cpu feature bit for FRED Xin Li
2023-04-04 10:26 ` [PATCH v7 07/33] x86/opcode: add ERETU, ERETS instructions to x86-opcode-map Xin Li
2023-04-04 10:26 ` [PATCH v7 08/33] x86/objtool: teach objtool about ERETU and ERETS Xin Li
2023-04-04 10:26 ` [PATCH v7 09/33] x86/cpu: add X86_CR4_FRED macro Xin Li
2023-04-04 10:26 ` [PATCH v7 10/33] x86/fred: add Kconfig option for FRED (CONFIG_X86_FRED) Xin Li
2023-04-04 10:26 ` [PATCH v7 11/33] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Xin Li
2023-04-04 10:26 ` Xin Li [this message]
2023-04-04 10:26 ` [PATCH v7 13/33] x86/fred: header file for event types Xin Li
2023-04-04 10:26 ` [PATCH v7 14/33] x86/fred: header file with FRED definitions Xin Li
2023-04-04 10:26 ` [PATCH v7 15/33] x86/fred: reserve space for the FRED stack frame Xin Li
2023-04-04 10:26 ` [PATCH v7 16/33] x86/fred: add a page fault entry stub for FRED Xin Li
2023-04-04 10:27 ` [PATCH v7 17/33] x86/fred: add a debug " Xin Li
2023-04-04 10:27 ` [PATCH v7 18/33] x86/fred: add a NMI " Xin Li
2023-04-04 10:27 ` [PATCH v7 19/33] x86/fred: add a machine check " Xin Li
2023-04-04 10:27 ` [PATCH v7 20/33] x86/fred: FRED entry/exit and dispatch code Xin Li
2023-04-04 10:27 ` [PATCH v7 21/33] x86/fred: FRED initialization code Xin Li
2023-04-04 10:27 ` [PATCH v7 22/33] x86/fred: update MSR_IA32_FRED_RSP0 during task switch Xin Li
2023-04-04 10:27 ` [PATCH v7 23/33] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Xin Li
2023-04-10 18:16 ` Dave Hansen
2023-04-10 18:31 ` Li, Xin3
2023-04-10 19:25 ` Li, Xin3
2023-04-04 10:27 ` [PATCH v7 24/33] x86/fred: disallow the swapgs instruction " Xin Li
2023-04-04 10:27 ` [PATCH v7 25/33] x86/fred: no ESPFIX needed " Xin Li
2023-04-04 10:27 ` [PATCH v7 26/33] x86/fred: allow single-step trap and NMI when starting a new thread Xin Li
2023-04-04 10:27 ` [PATCH v7 27/33] x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user Xin Li
2023-04-04 10:27 ` [PATCH v7 28/33] x86/ia32: do not modify the DPL bits for a null selector Xin Li
2023-04-04 10:27 ` [PATCH v7 29/33] x86/fred: allow FRED systems to use interrupt vectors 0x10-0x1f Xin Li
2023-04-04 10:27 ` [PATCH v7 30/33] x86/fred: allow dynamic stack frame size Xin Li
2023-04-04 10:27 ` [PATCH v7 31/33] x86/fred: BUG() when ERETU with %rsp not equal to that when the ring 3 event was just delivered Xin Li
2023-04-04 10:27 ` [PATCH v7 32/33] x86/fred: disable FRED by default in its early stage Xin Li
2023-04-04 10:27 ` [PATCH v7 33/33] KVM: x86/vmx: refactor VMX_DO_EVENT_IRQOFF to generate FRED stack frames Xin Li
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=20230404102716.1795-13-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=jiangshanlai@gmail.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=shan.kang@intel.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