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 v6 19/33] x86/fred: add a machine check entry stub for FRED
Date: Mon, 27 Mar 2023 00:58:24 -0700 [thread overview]
Message-ID: <20230327075838.5403-20-xin3.li@intel.com> (raw)
In-Reply-To: <20230327075838.5403-1-xin3.li@intel.com>
Add a machine check entry stub for FRED.
Tested-by: Shan Kang <shan.kang@intel.com>
Signed-off-by: Xin Li <xin3.li@intel.com>
---
Changes since v5:
* Disallow #DB inside #MCE for robustness sake (Peter Zijlstra).
---
arch/x86/include/asm/fred.h | 1 +
arch/x86/kernel/cpu/mce/core.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h
index f928a03082af..54746e8c0a17 100644
--- a/arch/x86/include/asm/fred.h
+++ b/arch/x86/include/asm/fred.h
@@ -97,6 +97,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 2eec60f50057..859331a6a7ad 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"
@@ -2111,6 +2112,20 @@ 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)
+{
+ unsigned long dr7;
+
+ dr7 = local_db_save();
+ if (user_mode(regs))
+ exc_machine_check_user(regs);
+ else
+ exc_machine_check_kernel(regs);
+ local_db_restore(dr7);
+}
+#endif
#else
/* 32bit unified entry point */
DEFINE_IDTENTRY_RAW(exc_machine_check)
--
2.34.1
next prev parent reply other threads:[~2023-03-27 8:25 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 7:58 [PATCH v6 00/33] x86: enable FRED for x86-64 Xin Li
2023-03-27 7:58 ` [PATCH v6 01/33] x86/traps: let common_interrupt() handle IRQ_MOVE_CLEANUP_VECTOR Xin Li
2023-03-27 7:58 ` [PATCH v6 02/33] x86/fred: make unions for the cs and ss fields in struct pt_regs Xin Li
2023-03-27 7:58 ` [PATCH v6 03/33] x86/traps: add a system interrupt table for system interrupt dispatch Xin Li
2023-03-27 7:58 ` [PATCH v6 04/33] x86/traps: add install_system_interrupt_handler() Xin Li
2023-03-27 7:58 ` [PATCH v6 05/33] x86/traps: add external_interrupt() to dispatch external interrupts Xin Li
2023-03-27 7:58 ` [PATCH v6 06/33] x86/cpufeature: add the cpu feature bit for FRED Xin Li
2023-03-27 7:58 ` [PATCH v6 07/33] x86/opcode: add ERETU, ERETS instructions to x86-opcode-map Xin Li
2023-03-27 7:58 ` [PATCH v6 08/33] x86/objtool: teach objtool about ERETU and ERETS Xin Li
2023-03-27 7:58 ` [PATCH v6 09/33] x86/cpu: add X86_CR4_FRED macro Xin Li
2023-03-27 7:58 ` [PATCH v6 10/33] x86/fred: add Kconfig option for FRED (CONFIG_X86_FRED) Xin Li
2023-03-27 7:58 ` [PATCH v6 11/33] x86/fred: if CONFIG_X86_FRED is disabled, disable FRED support Xin Li
2023-03-27 7:58 ` [PATCH v6 12/33] x86/cpu: add MSR numbers for FRED configuration Xin Li
2023-03-27 7:58 ` [PATCH v6 13/33] x86/fred: header file for event types Xin Li
2023-03-27 7:58 ` [PATCH v6 14/33] x86/fred: header file with FRED definitions Xin Li
2023-03-27 7:58 ` [PATCH v6 15/33] x86/fred: reserve space for the FRED stack frame Xin Li
2023-03-27 7:58 ` [PATCH v6 16/33] x86/fred: add a page fault entry stub for FRED Xin Li
2023-03-27 7:58 ` [PATCH v6 17/33] x86/fred: add a debug " Xin Li
2023-03-27 7:58 ` [PATCH v6 18/33] x86/fred: add a NMI " Xin Li
2023-03-27 7:58 ` Xin Li [this message]
2023-03-27 7:58 ` [PATCH v6 20/33] x86/fred: FRED entry/exit and dispatch code Xin Li
2023-03-27 7:58 ` [PATCH v6 21/33] x86/fred: FRED initialization code Xin Li
2023-03-27 7:58 ` [PATCH v6 22/33] x86/fred: update MSR_IA32_FRED_RSP0 during task switch Xin Li
2023-03-27 7:58 ` [PATCH v6 23/33] x86/fred: let ret_from_fork() jmp to fred_exit_user when FRED is enabled Xin Li
2023-03-27 7:58 ` [PATCH v6 24/33] x86/fred: disallow the swapgs instruction " Xin Li
2023-03-27 7:58 ` [PATCH v6 25/33] x86/fred: no ESPFIX needed " Xin Li
2023-03-27 7:58 ` [PATCH v6 26/33] x86/fred: allow single-step trap and NMI when starting a new thread Xin Li
2023-03-27 7:58 ` [PATCH v6 27/33] x86/fred: fixup fault on ERETU by jumping to fred_entrypoint_user Xin Li
2023-03-31 8:03 ` Lai Jiangshan
2023-04-01 8:12 ` Li, Xin3
2023-03-27 7:58 ` [PATCH v6 28/33] x86/ia32: do not modify the DPL bits for a null selector Xin Li
2023-03-27 7:58 ` [PATCH v6 29/33] x86/fred: allow FRED systems to use interrupt vectors 0x10-0x1f Xin Li
2023-03-27 7:58 ` [PATCH v6 30/33] x86/fred: allow dynamic stack frame size Xin Li
2023-03-27 7:58 ` [PATCH v6 31/33] x86/fred: BUG() when ERETU with %rsp not equal to that when the ring 3 event was just delivered Xin Li
2023-03-27 7:58 ` [PATCH v6 32/33] x86/fred: disable FRED by default in its early stage Xin Li
2023-03-27 7:58 ` [PATCH v6 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=20230327075838.5403-20-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