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 19/34] x86/fred: add a NMI entry stub for FRED
Date: Wed, 1 Mar 2023 21:24:56 -0800 [thread overview]
Message-ID: <20230302052511.1918-20-xin3.li@intel.com> (raw)
In-Reply-To: <20230302052511.1918-1-xin3.li@intel.com>
From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
On a FRED system, NMIs nest both with themselves and faults, transient
information is saved into the stack frame, and NMI unblocking only
happens when the stack frame indicates that so should happen.
Thus, the NMI entry stub for FRED is really quite small...
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/fred.h | 1 +
arch/x86/kernel/nmi.c | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/arch/x86/include/asm/fred.h b/arch/x86/include/asm/fred.h
index 633dd9e6a68e..f928a03082af 100644
--- a/arch/x86/include/asm/fred.h
+++ b/arch/x86/include/asm/fred.h
@@ -94,6 +94,7 @@ static __always_inline unsigned long fred_event_data(struct pt_regs *regs)
#define DEFINE_FRED_HANDLER(f) noinstr DECLARE_FRED_HANDLER(f)
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);
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 776f4b1e395b..1deedfd6de69 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -34,6 +34,7 @@
#include <asm/cache.h>
#include <asm/nospec-branch.h>
#include <asm/sev.h>
+#include <asm/fred.h>
#define CREATE_TRACE_POINTS
#include <trace/events/nmi.h>
@@ -643,6 +644,33 @@ void nmi_backtrace_stall_check(const struct cpumask *btp)
#endif
+#ifdef CONFIG_X86_FRED
+DEFINE_FRED_HANDLER(fred_exc_nmi)
+{
+ /*
+ * With FRED, CR2 and DR6 are pushed atomically on faults,
+ * so we don't have to worry about saving and restoring them.
+ * Breakpoint faults nest, so assume it is OK to leave DR7
+ * enabled.
+ */
+ irqentry_state_t irq_state = irqentry_nmi_enter(regs);
+
+ /*
+ * VM exits induced by NMIs keep NMI blocked, and we do
+ * "int $2" to reinject the NMI w/ NMI kept being blocked.
+ * However "int $2" doesn't set the nmi bit in the FRED
+ * stack frame, so we explicitly set it to make sure a
+ * later ERETS will unblock NMI immediately.
+ */
+ regs->nmi = 1;
+
+ inc_irq_stat(__nmi_count);
+ default_do_nmi(regs);
+
+ irqentry_nmi_exit(regs, irq_state);
+}
+#endif
+
void stop_nmi(void)
{
ignore_nmis++;
--
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 ` [PATCH v4 09/34] x86/cpu: add X86_CR4_FRED macro Xin Li
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 ` Xin Li [this message]
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-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=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