diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0091-KVM-x86-define-SVM-VMX-specific-kvm_arch_-alloc-free.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0091-KVM-x86-define-SVM-VMX-specific-kvm_arch_-alloc-free.patch | 123 |
1 files changed, 123 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0091-KVM-x86-define-SVM-VMX-specific-kvm_arch_-alloc-free.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0091-KVM-x86-define-SVM-VMX-specific-kvm_arch_-alloc-free.patch new file mode 100644 index 00000000..7573bb34 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0091-KVM-x86-define-SVM-VMX-specific-kvm_arch_-alloc-free.patch @@ -0,0 +1,123 @@ +From a91cb665ad19c0f1e7adc797137a40b2b784298f Mon Sep 17 00:00:00 2001 +From: Sudheesh Mavila <sudheesh.mavila@amd.com> +Date: Tue, 23 Oct 2018 12:18:07 +0530 +Subject: [PATCH 91/95] KVM: x86: define SVM/VMX specific + kvm_arch_[alloc|free]_vm + +From 434a1e94469d3b603f1efabfb044182de4cf88ef + +Define kvm_arch_[alloc|free]_vm in x86 as pass through functions +to new kvm_x86_ops vm_alloc and vm_free, and move the current +allocation logic as-is to SVM and VMX. Vendor specific alloc/free +functions set the stage for SVM/VMX wrappers of 'struct kvm', +which will allow us to move the growing number of SVM/VMX specific +member variables out of 'struct kvm_arch'. + +Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> + +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + arch/x86/include/asm/kvm_host.h | 13 +++++++++++++ + arch/x86/kvm/svm.c | 12 ++++++++++++ + arch/x86/kvm/vmx.c | 13 +++++++++++++ + 3 files changed, 38 insertions(+) + mode change 100644 => 100755 arch/x86/kvm/vmx.c + +diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h +index 13894c0..0b2bcd2 100755 +--- a/arch/x86/include/asm/kvm_host.h ++++ b/arch/x86/include/asm/kvm_host.h +@@ -928,6 +928,8 @@ struct kvm_x86_ops { + bool (*has_emulated_msr)(int index); + void (*cpuid_update)(struct kvm_vcpu *vcpu); + ++ struct kvm *(*vm_alloc)(void); ++ void (*vm_free)(struct kvm *); + int (*vm_init)(struct kvm *kvm); + void (*vm_destroy)(struct kvm *kvm); + +@@ -1094,6 +1096,17 @@ struct kvm_arch_async_pf { + + extern struct kvm_x86_ops *kvm_x86_ops; + ++#define __KVM_HAVE_ARCH_VM_ALLOC ++static inline struct kvm *kvm_arch_alloc_vm(void) ++{ ++ return kvm_x86_ops->vm_alloc(); ++} ++ ++static inline void kvm_arch_free_vm(struct kvm *kvm) ++{ ++ return kvm_x86_ops->vm_free(kvm); ++} ++ + int kvm_mmu_module_init(void); + void kvm_mmu_module_exit(void); + +diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c +index e7815a3..e6c4353 100755 +--- a/arch/x86/kvm/svm.c ++++ b/arch/x86/kvm/svm.c +@@ -1715,6 +1715,16 @@ static void __unregister_enc_region_locked(struct kvm *kvm, + kfree(region); + } + ++static struct kvm *svm_vm_alloc(void) ++{ ++ return kzalloc(sizeof(struct kvm), GFP_KERNEL); ++} ++ ++static void svm_vm_free(struct kvm *kvm) ++{ ++ kfree(kvm); ++} ++ + static void sev_vm_destroy(struct kvm *kvm) + { + struct kvm_sev_info *sev = &kvm->arch.sev_info; +@@ -6791,6 +6801,8 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { + .vcpu_free = svm_free_vcpu, + .vcpu_reset = svm_vcpu_reset, + ++ .vm_alloc = svm_vm_alloc, ++ .vm_free = svm_vm_free, + .vm_init = avic_vm_init, + .vm_destroy = svm_vm_destroy, + +diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c +old mode 100644 +new mode 100755 +index 815ff09..26dc4f4 +--- a/arch/x86/kvm/vmx.c ++++ b/arch/x86/kvm/vmx.c +@@ -9942,6 +9942,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) + } + STACK_FRAME_NON_STANDARD(vmx_vcpu_run); + ++static struct kvm *vmx_vm_alloc(void) ++{ ++ return kzalloc(sizeof(struct kvm), GFP_KERNEL); ++} ++ ++static void vmx_vm_free(struct kvm *kvm) ++{ ++ kfree(kvm); ++} ++ + static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) + { + struct vcpu_vmx *vmx = to_vmx(vcpu); +@@ -12517,6 +12527,9 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { + .hardware_disable = hardware_disable, + .cpu_has_accelerated_tpr = report_flexpriority, + .has_emulated_msr = vmx_has_emulated_msr, ++ .vm_init = vmx_vm_init, ++ .vm_alloc = vmx_vm_alloc, ++ .vm_free = vmx_vm_free, + + .vm_init = vmx_vm_init, + +-- +2.7.4 + |