From: David Hildenbrand <david@redhat.com>

Date: Thu, 24 Aug 2017 20:51:34 +0200

Subject: KVM: VMX: cleanup init_rmode_identity_map()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Patch-mainline: v4.15-rc1

Git-commit: d8a6e365b208a36f9e789ee50c55096b71367431

References: bsc#1077761

No need for another enable_ept check. kvm->arch.ept_identity_map_addr

only has to be inititalized once. Having alloc_identity_pagetable() is

overkill and dropping BUG_ONs is always nice.

Reviewed-by: Radim Krčmář <rkrcmar@redhat.com>

Signed-off-by: David Hildenbrand <david@redhat.com>

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

Acked-by: Alexander Graf <agraf@suse.de>

---

 arch/x86/kvm/vmx.c |   26 ++++----------------------

 1 file changed, 4 insertions(+), 22 deletions(-)

--- a/arch/x86/kvm/vmx.c

+++ b/arch/x86/kvm/vmx.c

@@ -904,7 +904,6 @@

 static bool guest_state_valid(struct kvm_vcpu *vcpu);

 static u32 vmx_segment_access_rights(struct kvm_segment *var);

 static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx);

-static int alloc_identity_pagetable(struct kvm *kvm);

 static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu);

 static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked);

 static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12,

@@ -4772,18 +4771,18 @@

 	kvm_pfn_t identity_map_pfn;

 	u32 tmp;

-	if (!enable_ept)

-		return 0;

-

 	/* Protect kvm->arch.ept_identity_pagetable_done. */

 	mutex_lock(&kvm->slots_lock);

 	if (likely(kvm->arch.ept_identity_pagetable_done))

 		goto out2;

+	if (!kvm->arch.ept_identity_map_addr)

+		kvm->arch.ept_identity_map_addr = VMX_EPT_IDENTITY_PAGETABLE_ADDR;

 	identity_map_pfn = kvm->arch.ept_identity_map_addr >> PAGE_SHIFT;

-	r = alloc_identity_pagetable(kvm);

+	r = __x86_set_memory_region(kvm, IDENTITY_PAGETABLE_PRIVATE_MEMSLOT,

+				    kvm->arch.ept_identity_map_addr, PAGE_SIZE);

 	if (r < 0)

 		goto out2;

@@ -4855,20 +4854,6 @@

 	return r;

 }

-static int alloc_identity_pagetable(struct kvm *kvm)

-{

-	/* Called with kvm->slots_lock held. */

-

-	int r = 0;

-

-	BUG_ON(kvm->arch.ept_identity_pagetable_done);

-

-	r = __x86_set_memory_region(kvm, IDENTITY_PAGETABLE_PRIVATE_MEMSLOT,

-				    kvm->arch.ept_identity_map_addr, PAGE_SIZE);

-

-	return r;

-}

-

 static int allocate_vpid(void)

 {

 	int vpid;

@@ -9546,9 +9531,6 @@

 	}

 	if (enable_ept) {

-		if (!kvm->arch.ept_identity_map_addr)

-			kvm->arch.ept_identity_map_addr =

-				VMX_EPT_IDENTITY_PAGETABLE_ADDR;

 		err = init_rmode_identity_map(kvm);

 		if (err)

 			goto free_vmcs;