From: Xin Li <xin3.li@intel.com>
To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org,
kvm@vger.kernel.org, xen-devel@lists.xenproject.org
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
luto@kernel.org, pbonzini@redhat.com, seanjc@google.com,
peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com,
mhiramat@kernel.org, andrew.cooper3@citrix.com,
jiangshanlai@gmail.com, nik.borisov@suse.com
Subject: [PATCH v11 23/37] x86/fred: Make exc_page_fault() work for FRED
Date: Sat, 23 Sep 2023 02:41:58 -0700 [thread overview]
Message-ID: <20230923094212.26520-24-xin3.li@intel.com> (raw)
In-Reply-To: <20230923094212.26520-1-xin3.li@intel.com>
From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
On a FRED system, the faulting address (CR2) is passed on the stack,
to avoid the problem of transient state. Thus we get the page fault
address from the stack instead of CR2.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Tested-by: Shan Kang <shan.kang@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Xin Li <xin3.li@intel.com>
---
arch/x86/mm/fault.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index ab778eac1952..7675bc067153 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -34,6 +34,7 @@
#include <asm/kvm_para.h> /* kvm_handle_async_pf */
#include <asm/vdso.h> /* fixup_vdso_exception() */
#include <asm/irq_stack.h>
+#include <asm/fred.h>
#define CREATE_TRACE_POINTS
#include <asm/trace/exceptions.h>
@@ -1516,8 +1517,10 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code,
DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault)
{
- unsigned long address = read_cr2();
irqentry_state_t state;
+ unsigned long address;
+
+ address = cpu_feature_enabled(X86_FEATURE_FRED) ? fred_event_data(regs) : read_cr2();
prefetchw(¤t->mm->mmap_lock);
--
2.34.1
next prev parent reply other threads:[~2023-09-23 10:11 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-23 9:41 [PATCH v11 00/37] x86: enable FRED for x86-64 Xin Li
2023-09-23 9:41 ` [PATCH v11 01/37] x86/cpufeatures: Add the cpu feature bit for WRMSRNS Xin Li
2023-09-23 9:41 ` [PATCH v11 02/37] x86/opcode: Add the WRMSRNS instruction to the x86 opcode map Xin Li
2023-09-23 9:41 ` [PATCH v11 03/37] x86/msr: Add the WRMSRNS instruction support Xin Li
2023-09-23 9:41 ` [PATCH v11 04/37] x86/entry: Remove idtentry_sysvec from entry_{32,64}.S Xin Li
2023-09-23 9:41 ` [PATCH v11 05/37] x86/trapnr: Add event type macros to <asm/trapnr.h> Xin Li
2023-09-26 8:10 ` Nikolay Borisov
2023-09-26 9:26 ` andrew.cooper3
2023-09-27 5:15 ` Li, Xin3
2023-09-27 14:51 ` H. Peter Anvin
2023-09-23 9:41 ` [PATCH v11 06/37] Documentation/x86/64: Add a documentation for FRED Xin Li
2023-09-23 9:41 ` [PATCH v11 07/37] x86/fred: Add Kconfig option for FRED (CONFIG_X86_FRED) Xin Li
2023-09-23 9:41 ` [PATCH v11 08/37] x86/cpufeatures: Add the cpu feature bit for FRED Xin Li
2023-09-23 9:41 ` [PATCH v11 09/37] x86/fred: Disable FRED support if CONFIG_X86_FRED is disabled Xin Li
2023-09-23 9:41 ` [PATCH v11 10/37] x86/fred: Disable FRED by default in its early stage Xin Li
2023-09-23 9:41 ` [PATCH v11 11/37] x86/opcode: Add ERET[US] instructions to the x86 opcode map Xin Li
2023-09-23 9:41 ` [PATCH v11 12/37] x86/objtool: Teach objtool about ERET[US] Xin Li
2023-09-23 9:41 ` [PATCH v11 13/37] x86/cpu: Add X86_CR4_FRED macro Xin Li
2023-09-23 9:41 ` [PATCH v11 14/37] x86/cpu: Add MSR numbers for FRED configuration Xin Li
2023-09-23 9:41 ` [PATCH v11 15/37] x86/ptrace: Cleanup the definition of the pt_regs structure Xin Li
2023-09-23 9:41 ` [PATCH v11 16/37] x86/ptrace: Add FRED additional information to " Xin Li
2023-09-23 9:41 ` [PATCH v11 17/37] x86/fred: Add a new header file for FRED definitions Xin Li
2023-09-23 9:41 ` [PATCH v11 18/37] x86/fred: Reserve space for the FRED stack frame Xin Li
2023-09-23 9:41 ` [PATCH v11 19/37] x86/fred: Update MSR_IA32_FRED_RSP0 during task switch Xin Li
2023-09-23 9:41 ` [PATCH v11 20/37] x86/fred: Disallow the swapgs instruction when FRED is enabled Xin Li
2023-09-23 9:41 ` [PATCH v11 21/37] x86/fred: No ESPFIX needed " Xin Li
2023-09-23 9:41 ` [PATCH v11 22/37] x86/fred: Allow single-step trap and NMI when starting a new task Xin Li
2023-09-23 9:41 ` Xin Li [this message]
2023-09-23 9:41 ` [PATCH v11 24/37] x86/idtentry: Incorporate definitions/declarations of the FRED entries Xin Li
2023-09-23 9:42 ` [PATCH v11 25/37] x86/fred: Add a debug fault entry stub for FRED Xin Li
2023-09-23 9:42 ` [PATCH v11 26/37] x86/fred: Add a NMI " Xin Li
2023-09-23 9:42 ` [PATCH v11 27/37] x86/fred: Add a machine check " Xin Li
2023-09-23 9:42 ` [PATCH v11 28/37] x86/fred: FRED entry/exit and dispatch code Xin Li
2023-09-23 9:42 ` [PATCH v11 29/37] x86/traps: Add sysvec_install() to install a system interrupt handler Xin Li
2023-09-23 9:42 ` [PATCH v11 30/37] x86/fred: Let ret_from_fork_asm() jmp to asm_fred_exit_user when FRED is enabled Xin Li
2023-09-23 9:42 ` [PATCH v11 31/37] x86/fred: Fixup fault on ERETU by jumping to fred_entrypoint_user Xin Li
2023-09-23 9:42 ` [PATCH v11 32/37] x86/entry/calling: Allow PUSH_AND_CLEAR_REGS being used beyond actual entry code Xin Li
2023-09-23 9:42 ` [PATCH v11 33/37] x86/entry: Add fred_entry_from_kvm() for VMX to handle IRQ/NMI Xin Li
2023-09-23 9:42 ` [PATCH v11 34/37] KVM: VMX: Call fred_entry_from_kvm() for IRQ/NMI handling Xin Li
2023-09-23 9:42 ` [PATCH v11 35/37] x86/syscall: Split IDT syscall setup code into idt_syscall_init() Xin Li
2023-09-25 16:07 ` H. Peter Anvin
2023-09-25 17:56 ` Li, Xin3
2023-09-25 18:55 ` H. Peter Anvin
2023-09-26 6:58 ` Li, Xin3
2023-09-28 18:01 ` Thomas Gleixner
2023-09-23 9:42 ` [PATCH v11 36/37] x86/fred: Add FRED initialization functions Xin Li
2023-09-23 9:42 ` [PATCH v11 37/37] x86/fred: Invoke FRED initialization code to enable FRED 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=20230923094212.26520-24-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=jgross@suse.com \
--cc=jiangshanlai@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=nik.borisov@suse.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 \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).