Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74545705 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: x86: fix initial PAT value 



PAT should be 0007_0406_0007_0406h on RESET and not modified on INIT.
VMX used a wrong value (host's PAT) and while SVM used the right one,
it never got to arch.pat.

This is not an issue with QEMU as it will force the correct value.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 653f52c3

arch/x86/kvm/svm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1176,7 +1176,7 @@ static void init_vmcb(struct vcpu_svm *svm, bool init_event) 
		clr_exception_intercept(svm, PF_VECTOR);

		clr_exception_intercept(svm, PF_VECTOR);

		clr_cr_intercept(svm, INTERCEPT_CR3_READ);

		clr_cr_intercept(svm, INTERCEPT_CR3_READ);

		clr_cr_intercept(svm, INTERCEPT_CR3_WRITE);

		clr_cr_intercept(svm, INTERCEPT_CR3_WRITE);

		save->g_pat = 0x0007040600070406ULL;

		save->g_pat = svm->vcpu.arch.pat;

		save->cr3 = 0;

		save->cr3 = 0;

		save->cr4 = 0;

		save->cr4 = 0;

	}

	}

arch/x86/kvm/vmx.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -4667,16 +4667,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) 
	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);

	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);

	vmcs_write64(VM_ENTRY_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.guest));

	vmcs_write64(VM_ENTRY_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.guest));





	if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) {

	if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)

		u32 msr_low, msr_high;

		vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);

		u64 host_pat;

		rdmsr(MSR_IA32_CR_PAT, msr_low, msr_high);

		host_pat = msr_low | ((u64) msr_high << 32);

		/* Write the default value follow host pat */

		vmcs_write64(GUEST_IA32_PAT, host_pat);

		/* Keep arch.pat sync with GUEST_IA32_PAT */

		vmx->vcpu.arch.pat = host_pat;

	}





	for (i = 0; i < ARRAY_SIZE(vmx_msr_index); ++i) {

	for (i = 0; i < ARRAY_SIZE(vmx_msr_index); ++i) {

		u32 index = vmx_msr_index[i];

		u32 index = vmx_msr_index[i];

arch/x86/kvm/x86.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -7408,6 +7408,8 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 




	vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);

	vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);





	vcpu->arch.pat = MSR_IA32_CR_PAT_DEFAULT;



	kvm_async_pf_hash_reset(vcpu);

	kvm_async_pf_hash_reset(vcpu);

	kvm_pmu_init(vcpu);

	kvm_pmu_init(vcpu);

arch/x86/kvm/x86.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,8 @@ 
#include <linux/kvm_host.h>

#include <linux/kvm_host.h>

#include "kvm_cache_regs.h"

#include "kvm_cache_regs.h"





#define MSR_IA32_CR_PAT_DEFAULT  0x0007040600070406ULL



static inline void kvm_clear_exception_queue(struct kvm_vcpu *vcpu)

static inline void kvm_clear_exception_queue(struct kvm_vcpu *vcpu)

{

{

	vcpu->arch.exception.pending = false;

	vcpu->arch.exception.pending = false;