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

Commit 67253af5 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: Add kvm_x86_ops get_tdp_level() 



The function get_tdp_level() provided the number of tdp level for EPT and
NPT rather than the NPT specific macro.

Signed-off-by: default avatarSheng Yang <sheng.yang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 8c6d6adc

arch/x86/kvm/mmu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, 
	spin_lock(&vcpu->kvm->mmu_lock);

	spin_lock(&vcpu->kvm->mmu_lock);

	kvm_mmu_free_some_pages(vcpu);

	kvm_mmu_free_some_pages(vcpu);

	r = __direct_map(vcpu, gpa, error_code & PFERR_WRITE_MASK,

	r = __direct_map(vcpu, gpa, error_code & PFERR_WRITE_MASK,

			 largepage, gfn, pfn, TDP_ROOT_LEVEL);

			 largepage, gfn, pfn, kvm_x86_ops->get_tdp_level());

	spin_unlock(&vcpu->kvm->mmu_lock);

	spin_unlock(&vcpu->kvm->mmu_lock);





	return r;

	return r;
@@ -1450,7 +1450,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) 
	context->page_fault = tdp_page_fault;

	context->page_fault = tdp_page_fault;

	context->free = nonpaging_free;

	context->free = nonpaging_free;

	context->prefetch_page = nonpaging_prefetch_page;

	context->prefetch_page = nonpaging_prefetch_page;

	context->shadow_root_level = TDP_ROOT_LEVEL;

	context->shadow_root_level = kvm_x86_ops->get_tdp_level();

	context->root_hpa = INVALID_PAGE;

	context->root_hpa = INVALID_PAGE;





	if (!is_paging(vcpu)) {

	if (!is_paging(vcpu)) {

arch/x86/kvm/mmu.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -3,12 +3,6 @@ 




#include <linux/kvm_host.h>

#include <linux/kvm_host.h>





#ifdef CONFIG_X86_64

#define TDP_ROOT_LEVEL PT64_ROOT_LEVEL

#else

#define TDP_ROOT_LEVEL PT32E_ROOT_LEVEL

#endif



#define PT64_PT_BITS 9

#define PT64_PT_BITS 9

#define PT64_ENT_PER_PAGE (1 << PT64_PT_BITS)

#define PT64_ENT_PER_PAGE (1 << PT64_PT_BITS)

#define PT32_PT_BITS 10

#define PT32_PT_BITS 10

arch/x86/kvm/svm.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -1863,6 +1863,15 @@ static bool svm_cpu_has_accelerated_tpr(void) 
	return false;

	return false;

}

}





static int get_npt_level(void)

{

#ifdef CONFIG_X86_64

	return PT64_ROOT_LEVEL;

#else

	return PT32E_ROOT_LEVEL;

#endif

}



static struct kvm_x86_ops svm_x86_ops = {

static struct kvm_x86_ops svm_x86_ops = {

	.cpu_has_kvm_support = has_svm,

	.cpu_has_kvm_support = has_svm,

	.disabled_by_bios = is_disabled,

	.disabled_by_bios = is_disabled,
@@ -1920,6 +1929,7 @@ static struct kvm_x86_ops svm_x86_ops = { 
	.inject_pending_vectors = do_interrupt_requests,

	.inject_pending_vectors = do_interrupt_requests,





	.set_tss_addr = svm_set_tss_addr,

	.set_tss_addr = svm_set_tss_addr,

	.get_tdp_level = get_npt_level,

};

};





static int __init svm_init(void)

static int __init svm_init(void)

arch/x86/kvm/vmx.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -2788,6 +2788,11 @@ static void __init vmx_check_processor_compat(void *rtn) 
	}

	}

}

}





static int get_ept_level(void)

{

	return VMX_EPT_DEFAULT_GAW + 1;

}



static struct kvm_x86_ops vmx_x86_ops = {

static struct kvm_x86_ops vmx_x86_ops = {

	.cpu_has_kvm_support = cpu_has_kvm_support,

	.cpu_has_kvm_support = cpu_has_kvm_support,

	.disabled_by_bios = vmx_disabled_by_bios,

	.disabled_by_bios = vmx_disabled_by_bios,
@@ -2844,6 +2849,7 @@ static struct kvm_x86_ops vmx_x86_ops = { 
	.inject_pending_vectors = do_interrupt_requests,

	.inject_pending_vectors = do_interrupt_requests,





	.set_tss_addr = vmx_set_tss_addr,

	.set_tss_addr = vmx_set_tss_addr,

	.get_tdp_level = get_ept_level,

};

};





static int __init vmx_init(void)

static int __init vmx_init(void)

arch/x86/kvm/vmx.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -351,5 +351,6 @@ enum vmcs_field { 
#define VMX_EPT_EXTENT_INDIVIDUAL_BIT		(1ull << 24)

#define VMX_EPT_EXTENT_INDIVIDUAL_BIT		(1ull << 24)

#define VMX_EPT_EXTENT_CONTEXT_BIT		(1ull << 25)

#define VMX_EPT_EXTENT_CONTEXT_BIT		(1ull << 25)

#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)

#define VMX_EPT_EXTENT_GLOBAL_BIT		(1ull << 26)

#define VMX_EPT_DEFAULT_GAW			3





#endif
 
#endif