KVM: x86: Whitelist port 0x7e for pre-incrementing %rip
PATCH 1/1 KVM: x86: Whitelist port 0x7e for pre-incrementing %rip
KVM's recent bug fix to update %rip after emulating I/O broke userspace that relied on the previous behavior of incrementing %rip prior to exiting to userspace. When running a Windows XP guest on AMD hardware, Qemu may patch "OUT 0x7E" instructions in reaction to the OUT itself. Because KVM's old behavior was to increment %rip before exiting to userspace to handle the I/O, Qemu manually adjusted %rip to account for the OUT instruction.
Arguably this is a userspace bug as KVM requires userspace to re-enter the kernel to complete instruction emulation before taking any other actions. That being said, this is a bit of a grey area and breaking userspace that has worked for many years is bad.
Pre-increment %rip on OUT to port 0x7e before exiting to userspace to hack around the issue.
--- arch/x86/kvm/x86.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +18 -2
@@ -6539,6 +6539,12 @@ int kvm_emulate_instruction_from_buffer(struct kvm_vcpu *vcpu, }EXPORT_SYMBOL_GPL (kvm_emulate_instruction_from_buffer); +static int complete_fast_pio_out_port_0x7e (struct kvm_vcpu *vcpu) +{ + vcpu->arch.pio.count =0 ; +return 1 ; +} +static int complete_fast_pio_out (struct kvm_vcpu *vcpu) { vcpu->arch.pio.count =0 ;
@@ -6555,12 +6561,22 @@ static int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size,unsigned long val =kvm_register_read (vcpu,VCPU_REGS_RAX );int ret =emulator_pio_out_emulated (&vcpu->arch.emulate_ctxt, size, port, &val,1 ); +if (ret) +return ret; -if (!ret) { +/* +* Workaround userspace that relies on old KVM behavior of %rip being +* incremented prior to exiting to userspace to handle "OUT 0x7e". +*/ +if (port ==0x7e ) { + vcpu->arch.complete_userspace_io = + complete_fast_pio_out_port_0x7e; +kvm_skip_emulated_instruction (vcpu); + }else { vcpu->arch.pio.linear_rip =kvm_get_linear_rip (vcpu); vcpu->arch.complete_userspace_io = complete_fast_pio_out; } -return ret; +return 0 ; }static int complete_fast_pio_in (struct kvm_vcpu *vcpu)
Signature · 1 line
2.21.0
Paolo Bonzini
maintainer----- Original Message -----
Quoted 21 lines
From: "Sean Christopherson" <[email protected]>
To: "Paolo Bonzini" <[email protected]>, "Radim Krčmář" <[email protected]>
Cc: [email protected], "Simon Becherer" <[email protected]>, "Iakov Karpov" <[email protected]>, "Gabriele Balducci" <[email protected]>, "Antti Antinoja" <[email protected]>, "Takashi Iwai" <[email protected]>, "Jiri Slaby" <[email protected]>, "Greg Kroah-Hartman" <[email protected]>
Sent: Saturday, April 27, 2019 1:38:46 AM
Subject: [PATCH] KVM: x86: Whitelist port0x7efor pre-incrementing %ripKVM's recent bug fix to update %rip after emulating I/O broke userspace that relied on the previous behavior of incrementing %rip prior to exiting to userspace. When running a Windows XP guest on AMD hardware, Qemu may patch "OUT
0x7E" instructions in reaction to the OUT itself. Because KVM's old behavior was to increment %rip before exiting to userspace to handle the I/O, Qemu manually adjusted %rip to account for the OUT instruction.Arguably this is a userspace bug as KVM requires userspace to re-enter the kernel to complete instruction emulation before taking any other actions. That being said, this is a bit of a grey area and breaking userspace that has worked for many years is bad.
Quoted 4 lines
Pre-increment %rip on OUT to port
0x7ebefore exiting to userspace to hack around the issue.Fixes 45def77ebf79e ("KVM: x86: update %rip after emulating IO")
The patch should probably be tweaked to use the quirks mechanism. I'll post an adjusted version next Monday.
Paolo
Quoted 2 lines · Paolo Bonzini
The patch should probably be tweaked to use the quirks mechanism. I'll post an adjusted version next Monday.
I took the liberty of posting v2 since it's a trivial change.