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

Commit 4c1a50de authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: mmu: remove ASSERT(vcpu) 



Because ASSERT is just a printk, these would oops right away.
The assertion thus hardly adds anything.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ad896af0

arch/x86/kvm/mmu.c

+0 −13
Original line number Diff line number Diff line
@@ -3329,7 +3329,6 @@ static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva, 
	if (r)

		return r;



	ASSERT(vcpu);

	ASSERT(VALID_PAGE(vcpu->arch.mmu.root_hpa));



	gfn = gva >> PAGE_SHIFT;
@@ -3396,7 +3395,6 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code, 
	int write = error_code & PFERR_WRITE_MASK;

	bool map_writable;



	ASSERT(vcpu);

	ASSERT(VALID_PAGE(vcpu->arch.mmu.root_hpa));



	if (unlikely(error_code & PFERR_RSVD_MASK)) {
@@ -3808,7 +3806,6 @@ void kvm_init_shadow_mmu(struct kvm_vcpu *vcpu) 
	bool smep = kvm_read_cr4_bits(vcpu, X86_CR4_SMEP);

	struct kvm_mmu *context = &vcpu->arch.mmu;



	ASSERT(vcpu);

	ASSERT(!VALID_PAGE(context->root_hpa));



	if (!is_paging(vcpu))
@@ -3832,7 +3829,6 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly) 
{

	struct kvm_mmu *context = &vcpu->arch.mmu;



	ASSERT(vcpu);

	ASSERT(!VALID_PAGE(context->root_hpa));



	context->shadow_root_level = kvm_x86_ops->get_tdp_level();
@@ -3914,8 +3910,6 @@ static void init_kvm_mmu(struct kvm_vcpu *vcpu) 


void kvm_mmu_reset_context(struct kvm_vcpu *vcpu)

{

	ASSERT(vcpu);



	kvm_mmu_unload(vcpu);

	init_kvm_mmu(vcpu);

}
@@ -4271,8 +4265,6 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu) 
	struct page *page;

	int i;



	ASSERT(vcpu);



	/*

	 * When emulating 32-bit mode, cr3 is only 32 bits even on x86_64.

	 * Therefore we need to allocate shadow page tables in the first
@@ -4291,8 +4283,6 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu) 


int kvm_mmu_create(struct kvm_vcpu *vcpu)

{

	ASSERT(vcpu);



	vcpu->arch.walk_mmu = &vcpu->arch.mmu;

	vcpu->arch.mmu.root_hpa = INVALID_PAGE;

	vcpu->arch.mmu.translate_gpa = translate_gpa;
@@ -4303,7 +4293,6 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) 


void kvm_mmu_setup(struct kvm_vcpu *vcpu)

{

	ASSERT(vcpu);

	ASSERT(!VALID_PAGE(vcpu->arch.mmu.root_hpa));



	init_kvm_mmu(vcpu);
@@ -4611,8 +4600,6 @@ EXPORT_SYMBOL_GPL(kvm_mmu_get_spte_hierarchy); 


void kvm_mmu_destroy(struct kvm_vcpu *vcpu)

{

	ASSERT(vcpu);



	kvm_mmu_unload(vcpu);

	free_mmu_pages(vcpu);

	mmu_free_memory_caches(vcpu);