diff options
| author | Paolo Bonzini | 2019-07-05 14:14:15 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-07-05 14:14:15 +0200 |
| commit | 101628ded5d990f7f364bd4d371ada9b2beaae64 (patch) | |
| tree | b0a5ef669c4ab639d5d8d3e8c64d1a5e7dc1a2ca /arch/x86/kvm | |
| parent | KVM nVMX: Check Host Segment Registers and Descriptor Tables on vmentry of ne... (diff) | |
| download | kernel-qcow2-linux-101628ded5d990f7f364bd4d371ada9b2beaae64.tar.gz kernel-qcow2-linux-101628ded5d990f7f364bd4d371ada9b2beaae64.tar.xz kernel-qcow2-linux-101628ded5d990f7f364bd4d371ada9b2beaae64.zip | |
KVM: LAPIC: ARBPRI is a reserved register for x2APIC
kvm-unit-tests were adjusted to match bare metal behavior, but KVM
itself was not doing what bare metal does; fix that.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index d6ca5c4f29f1..2e4470f2685a 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1318,7 +1318,7 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len, unsigned char alignment = offset & 0xf; u32 result; /* this bitmask has a bit cleared for each reserved register */ - static const u64 rmask = 0x43ff01ffffffe70cULL; + u64 rmask = 0x43ff01ffffffe70cULL; if ((alignment + len) > 4) { apic_debug("KVM_APIC_READ: alignment error %x %d\n", @@ -1326,6 +1326,10 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len, return 1; } + /* ARBPRI is also reserved on x2APIC */ + if (apic_x2apic_mode(apic)) + rmask &= ~(1 << (APIC_ARBPRI >> 4)); + if (offset > 0x3f0 || !(rmask & (1ULL << (offset >> 4)))) { apic_debug("KVM_APIC_READ: read reserved register %x\n", offset); |