KVM: x86: Directly return __vmalloc() result in ->vm_alloc()

Directly return the __vmalloc() result in {svm,vmx}_vm_alloc() to pave
the way for handling VM alloc/free in common x86 code, and to obviate
the need to check the result of __vmalloc() in vendor specific code.
Add a build-time assertion to ensure each structs' "kvm" field stays at
offset 0, which allows interpreting a "struct kvm_{svm,vmx}" as a
"struct kvm".

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 0455bd105bbe3f9afe605710298111b1275057f0..fdc88f7350c6d8ae75e4c1b254fb917b54d87c2d 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1946,19 +1946,15 @@ static void __unregister_enc_region_locked(struct kvm *kvm,
 
 static struct kvm *svm_vm_alloc(void)
 {
-       struct kvm_svm *kvm_svm = __vmalloc(sizeof(struct kvm_svm),
-                                           GFP_KERNEL_ACCOUNT | __GFP_ZERO,
-                                           PAGE_KERNEL);
+       BUILD_BUG_ON(offsetof(struct kvm_svm, kvm) != 0);
 
-       if (!kvm_svm)
-               return NULL;
-
-       return &kvm_svm->kvm;
+       return __vmalloc(sizeof(struct kvm_svm),
+                        GFP_KERNEL_ACCOUNT | __GFP_ZERO, PAGE_KERNEL);
 }
 
 static void svm_vm_free(struct kvm *kvm)
 {
-       vfree(to_kvm_svm(kvm));
+       vfree(kvm);
 }
 
 static void sev_vm_destroy(struct kvm *kvm)

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 933c72b97b50052b32531112b263acf829f32fd2..7d19ed7c13d8f3a79b399de93ae4521f3b8b56d9 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6681,20 +6681,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
 
 static struct kvm *vmx_vm_alloc(void)
 {
-       struct kvm_vmx *kvm_vmx = __vmalloc(sizeof(struct kvm_vmx),
-                                           GFP_KERNEL_ACCOUNT | __GFP_ZERO,
-                                           PAGE_KERNEL);
+       BUILD_BUG_ON(offsetof(struct kvm_vmx, kvm) != 0);
 
-       if (!kvm_vmx)
-               return NULL;
-
-       return &kvm_vmx->kvm;
+       return __vmalloc(sizeof(struct kvm_vmx),
+                        GFP_KERNEL_ACCOUNT | __GFP_ZERO, PAGE_KERNEL);
 }
 
 static void vmx_vm_free(struct kvm *kvm)
 {
        kfree(kvm->arch.hyperv.hv_pa_pg);
-       vfree(to_kvm_vmx(kvm));
+       vfree(kvm);
 }
 
 static void vmx_free_vcpu(struct kvm_vcpu *vcpu)