]> www.infradead.org Git - users/dwmw2/linux.git/commit
KVM: x86/xen: fix Xen hypercall page msr handling
authorJoao Martins <joao.m.martins@oracle.com>
Wed, 13 Jun 2018 10:10:37 +0000 (06:10 -0400)
committerDavid Woodhouse <dwmw@amazon.co.uk>
Mon, 4 Jan 2021 15:52:28 +0000 (15:52 +0000)
commit5860429e1338c7953ae9d1f28bb18a8eb8cff696
tree7416a71bea53b67dcbe62827b61e08b769a5d97f
parent6a447b0e3151893f6d4a889956553c06d2e775c6
KVM: x86/xen: fix Xen hypercall page msr handling

Xen usually places its MSR at 0x40000000 or 0x40000200 depending on
whether it is running in viridian mode or not. Note that this is not
ABI guaranteed, so it is possible for Xen to advertise the MSR some
place else.

Given the way xen_hvm_config() is handled, if the former address is
selected, this will conflict with Hyper-V's MSR
(HV_X64_MSR_GUEST_OS_ID) which unconditionally uses the same address.

Given that the MSR location is arbitrary, move the xen_hvm_config()
handling to the top of kvm_set_msr_common() before falling through.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
arch/x86/kvm/x86.c