From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, "Chang S. Bae" <chang.seok.bae@intel.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Arjan van de Ven <arjan@linux.intel.com>,
kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Subject: [patch 31/31] x86/fpu: Provide a proper function for ex_handler_fprestore()
Date: Tue, 12 Oct 2021 02:00:45 +0200 (CEST) [thread overview]
Message-ID: <20211011223612.145363780@linutronix.de> (raw)
In-Reply-To: 20211011215813.558681373@linutronix.de
To make upcoming changes for support of dynamically enabled features
simpler, provide a proper function for the exception handler which removes
exposure of FPU internals.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/fpu/api.h | 4 +---
arch/x86/kernel/fpu/core.c | 5 +++++
arch/x86/kernel/fpu/internal.h | 2 ++
arch/x86/mm/extable.c | 5 ++---
4 files changed, 10 insertions(+), 6 deletions(-)
--- a/arch/x86/include/asm/fpu/api.h
+++ b/arch/x86/include/asm/fpu/api.h
@@ -113,6 +113,7 @@ static inline void update_pasid(void) {
/* Trap handling */
extern int fpu__exception_code(struct fpu *fpu, int trap_nr);
extern void fpu_sync_fpstate(struct fpu *fpu);
+extern void fpu_reset_from_exception_fixup(void);
/* Boot, hotplug and resume */
extern void fpu__init_cpu(void);
@@ -129,9 +130,6 @@ static inline void fpstate_init_soft(str
/* State tracking */
DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);
-/* FPSTATE */
-extern union fpregs_state init_fpstate;
-
/* FPSTATE related functions which are exported to KVM */
extern void fpu_init_fpstate_user(struct fpu *fpu);
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -155,6 +155,11 @@ void restore_fpregs_from_fpstate(union f
}
}
+void fpu_reset_from_exception_fixup(void)
+{
+ restore_fpregs_from_fpstate(&init_fpstate, xfeatures_mask_fpstate());
+}
+
#if IS_ENABLED(CONFIG_KVM)
void fpu_swap_kvm_fpu(struct fpu *save, struct fpu *rstor, u64 restore_mask)
{
--- a/arch/x86/kernel/fpu/internal.h
+++ b/arch/x86/kernel/fpu/internal.h
@@ -2,6 +2,8 @@
#ifndef __X86_KERNEL_FPU_INTERNAL_H
#define __X86_KERNEL_FPU_INTERNAL_H
+extern union fpregs_state init_fpstate;
+
/* CPU feature check wrappers */
static __always_inline __pure bool use_xsave(void)
{
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
@@ -4,8 +4,7 @@
#include <linux/sched/debug.h>
#include <xen/xen.h>
-#include <asm/fpu/signal.h>
-#include <asm/fpu/xstate.h>
+#include <asm/fpu/api.h>
#include <asm/sev.h>
#include <asm/traps.h>
#include <asm/kdebug.h>
@@ -48,7 +47,7 @@ static bool ex_handler_fprestore(const s
WARN_ONCE(1, "Bad FPU state detected at %pB, reinitializing FPU registers.",
(void *)instruction_pointer(regs));
- restore_fpregs_from_fpstate(&init_fpstate, xfeatures_mask_fpstate());
+ fpu_reset_from_exception_fixup();
return true;
}
next prev parent reply other threads:[~2021-10-12 0:07 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 23:59 [patch 00/31] x86/fpu: Preparatory cleanups for AMX support (part 1) Thomas Gleixner
2021-10-11 23:59 ` [patch 01/31] x86/fpu: Remove pointless argument from switch_fpu_finish() Thomas Gleixner
2021-10-12 0:00 ` [patch 02/31] x86/fpu: Update stale comments Thomas Gleixner
2021-10-12 0:00 ` [patch 03/31] x86/pkru: Remove useless include Thomas Gleixner
2021-10-12 0:00 ` [patch 04/31] x86/fpu: Restrict xsaves()/xrstors() to independent states Thomas Gleixner
2021-10-12 14:24 ` Borislav Petkov
2021-10-12 0:00 ` [patch 05/31] x86/fpu: Cleanup the on_boot_cpu clutter Thomas Gleixner
2021-10-12 0:00 ` [patch 06/31] x86/fpu: Remove pointless memset in fpu_clone() Thomas Gleixner
2021-10-12 0:00 ` [patch 07/31] x86/process: Clone FPU in copy_thread() Thomas Gleixner
2021-10-12 0:00 ` [patch 08/31] x86/fpu: Do not inherit FPU context for kernel and IO worker threads Thomas Gleixner
2021-10-12 0:00 ` [patch 09/31] x86/fpu: Do not inherit FPU context for CLONE_THREAD Thomas Gleixner
2021-10-12 16:10 ` Borislav Petkov
2021-10-12 18:52 ` Thomas Gleixner
2021-10-12 19:01 ` Thomas Gleixner
2021-10-12 0:00 ` [patch 10/31] x86/fpu: Cleanup xstate xcomp_bv initialization Thomas Gleixner
2021-10-12 0:00 ` [patch 11/31] x86/fpu/xstate: Provide and use for_each_xfeature() Thomas Gleixner
2021-10-12 16:45 ` Borislav Petkov
2021-10-12 0:00 ` [patch 12/31] x86/fpu/xstate: Mark all init only functions __init Thomas Gleixner
2021-10-12 0:00 ` [patch 13/31] x86/fpu: Move KVMs FPU swapping to FPU core Thomas Gleixner
2021-10-12 16:53 ` Borislav Petkov
2021-10-12 18:25 ` Thomas Gleixner
2021-10-12 18:26 ` Thomas Gleixner
2021-10-12 17:22 ` Paolo Bonzini
2021-10-13 6:15 ` Liu, Jing2
2021-10-13 6:26 ` Paolo Bonzini
2021-10-13 7:46 ` Liu, Jing2
2021-10-13 8:42 ` Paolo Bonzini
2021-10-13 10:14 ` Andy Lutomirski
2021-10-13 12:26 ` Paolo Bonzini
2021-10-13 14:14 ` Thomas Gleixner
2021-10-13 14:24 ` Thomas Gleixner
2021-10-13 14:59 ` Andy Lutomirski
2021-10-13 15:05 ` Paolo Bonzini
2021-10-13 10:25 ` Liu, Jing2
2021-10-13 12:37 ` Paolo Bonzini
2021-10-13 14:06 ` Thomas Gleixner
2021-10-14 6:50 ` Paolo Bonzini
2021-10-14 8:02 ` Liu, Jing2
2021-10-14 9:01 ` Paolo Bonzini
2021-10-14 11:21 ` Liu, Jing2
2021-10-14 11:33 ` Paolo Bonzini
2021-10-14 11:30 ` Liu, Jing2
2021-10-14 11:39 ` Paolo Bonzini
2021-11-22 8:50 ` Liu, Jing2
2021-10-14 14:09 ` Thomas Gleixner
2021-10-14 14:37 ` Thomas Gleixner
2021-10-14 15:01 ` Paolo Bonzini
2021-10-14 19:14 ` Thomas Gleixner
2021-10-15 9:20 ` Liu, Jing2
2021-10-15 9:36 ` Thomas Gleixner
2021-10-15 14:24 ` Liu, Jing2
2021-10-15 15:53 ` Paolo Bonzini
2021-10-16 14:45 ` Thomas Gleixner
2021-10-15 9:00 ` Liu, Jing2
2021-10-15 10:50 ` Thomas Gleixner
2021-10-15 11:17 ` Paolo Bonzini
2021-10-15 13:01 ` Liu, Jing2
2021-10-14 12:23 ` Thomas Gleixner
2021-10-14 12:26 ` Paolo Bonzini
2021-10-14 14:23 ` Thomas Gleixner
2021-10-13 15:12 ` Thomas Gleixner
2021-10-14 8:21 ` Liu, Jing2
2021-10-14 13:08 ` Thomas Gleixner
2021-10-12 0:00 ` [patch 14/31] x86/fpu: Replace KVMs homebrewn FPU copy from user Thomas Gleixner
2021-10-12 17:00 ` Borislav Petkov
2021-10-13 14:57 ` Sean Christopherson
2021-10-13 15:12 ` Paolo Bonzini
2021-10-13 15:16 ` Thomas Gleixner
2021-10-12 17:30 ` Paolo Bonzini
2021-10-12 0:00 ` [patch 15/31] x86/fpu: Rework copy_xstate_to_uabi_buf() Thomas Gleixner
2021-10-12 17:30 ` Paolo Bonzini
2021-10-12 0:00 ` [patch 16/31] x86/fpu: Replace KVMs homebrewn FPU copy to user Thomas Gleixner
2021-10-12 17:10 ` Borislav Petkov
2021-10-12 17:36 ` Paolo Bonzini
2021-10-12 17:47 ` Thomas Gleixner
2021-10-12 18:40 ` [patch V2 16/31] x86/fpu: Replace KVMs home brewed " Thomas Gleixner
2021-10-13 5:34 ` [patch 16/31] x86/fpu: Replace KVMs homebrewn " Paolo Bonzini
2021-10-12 0:00 ` [patch 17/31] x86/fpu: Mark fpu__init_prepare_fx_sw_frame() as __init Thomas Gleixner
2021-10-12 0:00 ` [patch 18/31] x86/fpu: Move context switch and exit to user inlines into sched.h Thomas Gleixner
2021-10-12 0:00 ` [patch 19/31] x86/fpu: Clean up cpu feature tests Thomas Gleixner
2021-10-12 0:00 ` [patch 20/31] x86/fpu: Make os_xrstor_booting() private Thomas Gleixner
2021-10-12 0:00 ` [patch 21/31] x86/fpu: Move os_xsave() and os_xrstor() to core Thomas Gleixner
2021-10-12 0:00 ` [patch 22/31] x86/fpu: Move legacy ASM wrappers " Thomas Gleixner
2021-10-12 0:00 ` [patch 23/31] x86/fpu: Make WARN_ON_FPU() private Thomas Gleixner
2021-10-12 0:00 ` [patch 24/31] x86/fpu: Move fpregs_restore_userregs() to core Thomas Gleixner
2021-10-12 17:32 ` Borislav Petkov
2021-10-12 0:00 ` [patch 25/31] x86/fpu: Move mxcsr related code " Thomas Gleixner
2021-10-12 0:00 ` [patch 26/31] x86/fpu: Move fpstate functions to api.h Thomas Gleixner
2021-10-12 17:46 ` Borislav Petkov
2021-10-12 0:00 ` [patch 27/31] x86/fpu: Remove internal.h dependency from fpu/signal.h Thomas Gleixner
2021-10-12 0:00 ` [patch 28/31] x86/sev: Include fpu/xcr.h Thomas Gleixner
2021-10-12 7:24 ` Xiaoyao Li
2021-10-12 0:00 ` [patch 29/31] x86/fpu: Mop up the internal.h leftovers Thomas Gleixner
2021-10-12 0:00 ` [patch 30/31] x86/fpu: Replace the includes of fpu/internal.h Thomas Gleixner
2021-10-12 0:00 ` Thomas Gleixner [this message]
2021-10-12 21:15 ` [patch 00/31] x86/fpu: Preparatory cleanups for AMX support (part 1) Thomas Gleixner
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=20211011223612.145363780@linutronix.de \
--to=tglx@linutronix.de \
--cc=arjan@linux.intel.com \
--cc=chang.seok.bae@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).