korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-28 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86/fpu: Replace KVMs xstate component clearing

Browse Source 
In order to prepare for the support of dynamically enabled FPU features,
move the clearing of xstate components to the FPU core code.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: kvm@vger.kernel.org
Link: https://lkml.kernel.org/r/20211013145322.399567049@linutronix.de
This commit is contained in:
Thomas Gleixner 2021-10-13 16:55:31 +02:00 committed by Borislav Petkov
parent 18b3fa1ad1
commit 087df48c29
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/fpu/api.h
View File

@ -132,6 +132,7 @@ DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);
/* fpstate-related functions which are exported to KVM */ /* fpstate-related functions which are exported to KVM */
extern void fpu_init_fpstate_user(struct fpu *fpu); extern void fpu_init_fpstate_user(struct fpu *fpu);
extern void fpstate_clear_xstate_component(struct fpstate *fps, unsigned int xfeature);
/* KVM specific functions */ /* KVM specific functions */
extern void fpu_swap_kvm_fpu(struct fpu *save, struct fpu *rstor, u64 restore_mask); extern void fpu_swap_kvm_fpu(struct fpu *save, struct fpu *rstor, u64 restore_mask);

1
arch/x86/include/asm/fpu/xstate.h
View File

@ -128,7 +128,6 @@ extern u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
extern void __init update_regset_xstate_info(unsigned int size, extern void __init update_regset_xstate_info(unsigned int size,
u64 xstate_mask); u64 xstate_mask);
void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr);
int xfeature_size(int xfeature_nr); int xfeature_size(int xfeature_nr);
int copy_uabi_from_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf); int copy_uabi_from_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf);
int copy_sigframe_from_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf); int copy_sigframe_from_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf);

12
arch/x86/kernel/fpu/xstate.c
View File

@ -908,7 +908,6 @@ void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr)
return __raw_xsave_addr(xsave, xfeature_nr); return __raw_xsave_addr(xsave, xfeature_nr);
} }
EXPORT_SYMBOL_GPL(get_xsave_addr);
#ifdef CONFIG_ARCH_HAS_PKEYS #ifdef CONFIG_ARCH_HAS_PKEYS
@ -1257,6 +1256,17 @@ void xrstors(struct xregs_state *xstate, u64 mask)
WARN_ON_ONCE(err); WARN_ON_ONCE(err);
} }
#if IS_ENABLED(CONFIG_KVM)
void fpstate_clear_xstate_component(struct fpstate *fps, unsigned int xfeature)
{
void *addr = get_xsave_addr(&fps->regs.xsave, xfeature);
if (addr)
memset(addr, 0, xstate_sizes[xfeature]);
}
EXPORT_SYMBOL_GPL(fpstate_clear_xstate_component);
#endif
#ifdef CONFIG_PROC_PID_ARCH_STATUS #ifdef CONFIG_PROC_PID_ARCH_STATUS
/* /*
* Report the amount of time elapsed in millisecond since last AVX512 * Report the amount of time elapsed in millisecond since last AVX512

2
arch/x86/kernel/fpu/xstate.h
View File

@ -21,6 +21,8 @@ extern void __copy_xstate_to_uabi_buf(struct membuf to, struct xregs_state *xsav
extern void fpu__init_cpu_xstate(void); extern void fpu__init_cpu_xstate(void);
extern void fpu__init_system_xstate(void); extern void fpu__init_system_xstate(void);
extern void *get_xsave_addr(struct xregs_state *xsave, int xfeature_nr);
/* XSAVE/XRSTOR wrapper functions */ /* XSAVE/XRSTOR wrapper functions */
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64

14
arch/x86/kvm/x86.c
View File

@ -10705,7 +10705,7 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
vcpu->arch.apf.halted = false; vcpu->arch.apf.halted = false;
if (vcpu->arch.guest_fpu && kvm_mpx_supported()) { if (vcpu->arch.guest_fpu && kvm_mpx_supported()) {
void *mpx_state_buffer; struct fpstate *fpstate = vcpu->arch.guest_fpu->fpstate;
/* /*
* To avoid have the INIT path from kvm_apic_has_events() that be * To avoid have the INIT path from kvm_apic_has_events() that be
@ -10713,14 +10713,10 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
*/ */
if (init_event) if (init_event)
kvm_put_guest_fpu(vcpu); kvm_put_guest_fpu(vcpu);
mpx_state_buffer = get_xsave_addr(&vcpu->arch.guest_fpu->state.xsave,
XFEATURE_BNDREGS); fpstate_clear_xstate_component(fpstate, XFEATURE_BNDREGS);
if (mpx_state_buffer) fpstate_clear_xstate_component(fpstate, XFEATURE_BNDCSR);
memset(mpx_state_buffer, 0, sizeof(struct mpx_bndreg_state));
mpx_state_buffer = get_xsave_addr(&vcpu->arch.guest_fpu->state.xsave,
XFEATURE_BNDCSR);
if (mpx_state_buffer)
memset(mpx_state_buffer, 0, sizeof(struct mpx_bndcsr));
if (init_event) if (init_event)
kvm_load_guest_fpu(vcpu); kvm_load_guest_fpu(vcpu);
} }