Skip to content

Commit 582b01b

Browse files
KAGA-KOKOsuryasaimadhu
authored andcommitted
x86/fpu: Remove old KVM FPU interface
No more users. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent d69c138 commit 582b01b

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed

arch/x86/include/asm/fpu/api.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,12 @@ static inline void fpstate_init_soft(struct swregs_state *soft) {}
131131
DECLARE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);
132132

133133
/* fpstate-related functions which are exported to KVM */
134-
extern void fpu_init_fpstate_user(struct fpu *fpu);
135134
extern void fpstate_clear_xstate_component(struct fpstate *fps, unsigned int xfeature);
136135

137136
/* KVM specific functions */
138137
extern bool fpu_alloc_guest_fpstate(struct fpu_guest *gfpu);
139138
extern void fpu_free_guest_fpstate(struct fpu_guest *gfpu);
140139
extern int fpu_swap_kvm_fpstate(struct fpu_guest *gfpu, bool enter_guest);
141-
extern void fpu_swap_kvm_fpu(struct fpu *save, struct fpu *rstor, u64 restore_mask);
142140

143141
extern void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf, unsigned int size, u32 pkru);
144142
extern int fpu_copy_uabi_to_guest_fpstate(struct fpu_guest *gfpu, const void *buf, u64 xcr0, u32 *vpkru);

arch/x86/kernel/fpu/core.c

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -245,29 +245,6 @@ int fpu_swap_kvm_fpstate(struct fpu_guest *guest_fpu, bool enter_guest)
245245
}
246246
EXPORT_SYMBOL_GPL(fpu_swap_kvm_fpstate);
247247

248-
void fpu_swap_kvm_fpu(struct fpu *save, struct fpu *rstor, u64 restore_mask)
249-
{
250-
fpregs_lock();
251-
252-
if (save) {
253-
struct fpstate *fpcur = current->thread.fpu.fpstate;
254-
255-
if (test_thread_flag(TIF_NEED_FPU_LOAD))
256-
memcpy(&save->fpstate->regs, &fpcur->regs, fpcur->size);
257-
else
258-
save_fpregs_to_fpstate(save);
259-
}
260-
261-
if (rstor) {
262-
restore_mask &= XFEATURE_MASK_FPSTATE;
263-
restore_fpregs_from_fpstate(rstor->fpstate, restore_mask);
264-
}
265-
266-
fpregs_mark_activate();
267-
fpregs_unlock();
268-
}
269-
EXPORT_SYMBOL_GPL(fpu_swap_kvm_fpu);
270-
271248
void fpu_copy_guest_fpstate_to_uabi(struct fpu_guest *gfpu, void *buf,
272249
unsigned int size, u32 pkru)
273250
{
@@ -437,15 +414,6 @@ void fpstate_reset(struct fpu *fpu)
437414
__fpstate_reset(fpu->fpstate);
438415
}
439416

440-
#if IS_ENABLED(CONFIG_KVM)
441-
void fpu_init_fpstate_user(struct fpu *fpu)
442-
{
443-
fpstate_reset(fpu);
444-
fpstate_init_user(fpu->fpstate);
445-
}
446-
EXPORT_SYMBOL_GPL(fpu_init_fpstate_user);
447-
#endif
448-
449417
/* Clone current's FPU state on fork */
450418
int fpu_clone(struct task_struct *dst)
451419
{

0 commit comments

Comments
 (0)