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: [RFC PATCH 20/32] x86/fred: add a machine check entry stub for FRED
Date: Mon, 19 Dec 2022 22:36:46 -0800 [thread overview]
Message-ID: <20221220063658.19271-21-xin3.li@intel.com> (raw)
In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com>
Add a machine check entry stub for FRED.
Unlike IDT, no need to save/restore dr7 in FRED machine check handler.
Signed-off-by: Xin Li <xin3.li@intel.com>
---
arch/x86/include/asm/fred.h | 1 +
arch/x86/kernel/cpu/mce/core.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h
index 66c274a12e26..01678ced5451 100644
--- a/arch/x86/include/asm/fred.h
+++ b/arch/x86/include/asm/fred.h
@@ -95,6 +95,7 @@ typedef DECLARE_FRED_HANDLER((*fred_handler));
DECLARE_FRED_HANDLER(fred_exc_nmi);
DECLARE_FRED_HANDLER(fred_exc_debug);
DECLARE_FRED_HANDLER(fred_exc_page_fault);
+DECLARE_FRED_HANDLER(fred_exc_machine_check);
#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 2c8ec5c71712..0186c9b39f5f 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -52,6 +52,7 @@
#include <asm/mce.h>
#include <asm/msr.h>
#include <asm/reboot.h>
+#include <asm/fred.h>
#include "internal.h"
@@ -2121,6 +2122,16 @@ DEFINE_IDTENTRY_MCE_USER(exc_machine_check)
exc_machine_check_user(regs);
local_db_restore(dr7);
}
+
+#ifdef CONFIG_X86_FRED
+DEFINE_FRED_HANDLER(fred_exc_machine_check)
+{
+ if (user_mode(regs))
+ exc_machine_check_user(regs);
+ else
+ exc_machine_check_kernel(regs);
+}
+#endif
#else
/* 32bit unified entry point */
DEFINE_IDTENTRY_RAW(exc_machine_check)
--
2.34.1
next prev parent reply other threads:[~2022-12-20 7:03 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-20 6:36 [RFC PATCH 00/32] x86: enable FRED for x86-64 Xin Li
2022-12-20 6:36 ` [RFC PATCH 01/32] x86/traps: let common_interrupt() handle IRQ_MOVE_CLEANUP_VECTOR Xin Li
2022-12-20 6:36 ` [RFC PATCH 02/32] x86/traps: add a system interrupt table for system interrupt dispatch Xin Li
2022-12-20 6:36 ` [RFC PATCH 03/32] x86/traps: add install_system_interrupt_handler() Xin Li
2022-12-20 6:36 ` [RFC PATCH 04/32] x86/traps: add external_interrupt() to dispatch external interrupts Xin Li
2022-12-20 6:36 ` [RFC PATCH 05/32] x86/traps: add exc_raise_irq() for VMX IRQ reinjection Xin Li
2023-01-09 18:20 ` Li, Xin3
2022-12-20 6:36 ` [RFC PATCH 06/32] x86/cpufeature: add the cpu feature bit for FRED Xin Li
2022-12-20 6:36 ` [RFC PATCH 07/32] x86/opcode: add ERETU, ERETS instructions to x86-opcode-map Xin Li
2022-12-20 6:36 ` [RFC PATCH 08/32] x86/objtool: teach objtool about ERETU and ERETS Xin Li
2022-12-20 6:36 ` [RFC PATCH 09/32] x86/cpu: add X86_CR4_FRED macro Xin Li
2022-12-20 6:36 ` [RFC PATCH 10/32] x86/fred: add Kconfig option for FRED (CONFIG_X86_FRED) Xin Li
2022-12-20 6:36 ` [RFC PATCH 11/32] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Xin Li
2022-12-20 6:36 ` [RFC PATCH 12/32] x86/cpu: add MSR numbers for FRED configuration Xin Li
2022-12-20 6:36 ` [RFC PATCH 13/32] x86/fred: header file for event types Xin Li
2022-12-20 6:36 ` [RFC PATCH 14/32] x86/fred: header file with FRED definitions Xin Li
2022-12-20 8:56 ` Peter Zijlstra
2022-12-21 2:58 ` Li, Xin3
2022-12-22 13:03 ` Peter Zijlstra
2022-12-23 19:34 ` H. Peter Anvin
2022-12-20 6:36 ` [RFC PATCH 15/32] x86/fred: make unions for the cs and ss fields in struct pt_regs Xin Li
2022-12-20 6:36 ` [RFC PATCH 16/32] x86/fred: reserve space for the FRED stack frame Xin Li
2022-12-20 6:36 ` [RFC PATCH 17/32] x86/fred: add a page fault entry stub for FRED Xin Li
2022-12-20 6:36 ` [RFC PATCH 18/32] x86/fred: add a debug " Xin Li
2022-12-20 9:15 ` Peter Zijlstra
2022-12-20 6:36 ` [RFC PATCH 19/32] x86/fred: add a NMI " Xin Li
2022-12-20 6:36 ` Xin Li [this message]
2022-12-20 6:36 ` [RFC PATCH 21/32] x86/fred: FRED entry/exit and dispatch code Xin Li
2022-12-20 9:35 ` Peter Zijlstra
2022-12-21 2:56 ` Li, Xin3
2022-12-22 13:08 ` Peter Zijlstra
2022-12-20 6:36 ` [RFC PATCH 22/32] x86/fred: FRED initialization code Xin Li
2022-12-20 9:45 ` Peter Zijlstra
2022-12-20 9:55 ` Andrew Cooper
2022-12-20 10:02 ` Peter Zijlstra
2022-12-21 5:28 ` Li, Xin3
2022-12-21 5:44 ` H. Peter Anvin
2022-12-22 13:09 ` Peter Zijlstra
2022-12-23 19:30 ` H. Peter Anvin
2022-12-23 19:37 ` H. Peter Anvin
2022-12-20 6:36 ` [RFC PATCH 23/32] x86/fred: update MSR_IA32_FRED_RSP0 during task switch Xin Li
2022-12-20 9:48 ` Peter Zijlstra
2022-12-20 18:47 ` Li, Xin3
2022-12-23 19:42 ` H. Peter Anvin
2022-12-24 3:02 ` Li, Xin3
2022-12-20 6:36 ` [RFC PATCH 24/32] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Xin Li
2022-12-20 6:36 ` [RFC PATCH 25/32] x86/fred: disallow the swapgs instruction " Xin Li
2022-12-20 6:36 ` [RFC PATCH 26/32] x86/fred: no ESPFIX needed " Xin Li
2022-12-20 6:36 ` [RFC PATCH 27/32] x86/fred: allow single-step trap and NMI when starting a new thread Xin Li
2022-12-20 6:36 ` [RFC PATCH 28/32] x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user Xin Li
2022-12-20 6:36 ` [RFC PATCH 29/32] x86/ia32: do not modify the DPL bits for a null selector Xin Li
2022-12-20 6:36 ` [RFC PATCH 30/32] x86/fred: allow FRED systems to use interrupt vectors 0x10-0x1f Xin Li
2022-12-20 6:36 ` [RFC PATCH 31/32] x86/fred: allow dynamic stack frame size Xin Li
2022-12-20 6:36 ` [RFC PATCH 32/32] x86/fred: disable FRED by default in its early stage 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=20221220063658.19271-21-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