Skip to content

Commit 5663d8f

Browse files
xzpeterbonzini
authored andcommitted
kvm: x86: fix WARN due to uninitialized guest FPU state
------------[ cut here ]------------ Bad FPU state detected at kvm_put_guest_fpu+0xd8/0x2d0 [kvm], reinitializing FPU registers. WARNING: CPU: 1 PID: 4594 at arch/x86/mm/extable.c:103 ex_handler_fprestore+0x88/0x90 CPU: 1 PID: 4594 Comm: qemu-system-x86 Tainted: G B OE 4.15.0-rc2+ #10 RIP: 0010:ex_handler_fprestore+0x88/0x90 Call Trace: fixup_exception+0x4e/0x60 do_general_protection+0xff/0x270 general_protection+0x22/0x30 RIP: 0010:kvm_put_guest_fpu+0xd8/0x2d0 [kvm] RSP: 0018:ffff8803d5627810 EFLAGS: 00010246 kvm_vcpu_reset+0x3b4/0x3c0 [kvm] kvm_apic_accept_events+0x1c0/0x240 [kvm] kvm_arch_vcpu_ioctl_run+0x1658/0x2fb0 [kvm] kvm_vcpu_ioctl+0x479/0x880 [kvm] do_vfs_ioctl+0x142/0x9a0 SyS_ioctl+0x74/0x80 do_syscall_64+0x15f/0x600 where kvm_put_guest_fpu is called without a prior kvm_load_guest_fpu. To fix it, move kvm_load_guest_fpu to the very beginning of kvm_arch_vcpu_ioctl_run. Cc: stable@vger.kernel.org Fixes: f775b13 Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent d73235d commit 5663d8f

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

arch/x86/kvm/x86.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7264,13 +7264,12 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu)
72647264

72657265
int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
72667266
{
7267-
struct fpu *fpu = &current->thread.fpu;
72687267
int r;
72697268

7270-
fpu__initialize(fpu);
7271-
72727269
kvm_sigset_activate(vcpu);
72737270

7271+
kvm_load_guest_fpu(vcpu);
7272+
72747273
if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {
72757274
if (kvm_run->immediate_exit) {
72767275
r = -EINTR;
@@ -7296,14 +7295,12 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
72967295
}
72977296
}
72987297

7299-
kvm_load_guest_fpu(vcpu);
7300-
73017298
if (unlikely(vcpu->arch.complete_userspace_io)) {
73027299
int (*cui)(struct kvm_vcpu *) = vcpu->arch.complete_userspace_io;
73037300
vcpu->arch.complete_userspace_io = NULL;
73047301
r = cui(vcpu);
73057302
if (r <= 0)
7306-
goto out_fpu;
7303+
goto out;
73077304
} else
73087305
WARN_ON(vcpu->arch.pio.count || vcpu->mmio_needed);
73097306

@@ -7312,9 +7309,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
73127309
else
73137310
r = vcpu_run(vcpu);
73147311

7315-
out_fpu:
7316-
kvm_put_guest_fpu(vcpu);
73177312
out:
7313+
kvm_put_guest_fpu(vcpu);
73187314
post_kvm_run_save(vcpu);
73197315
kvm_sigset_deactivate(vcpu);
73207316

0 commit comments

Comments
 (0)