lkml.org 
[lkml]   [2021]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v2 35/69] KVM: x86: Introduce vm_teardown() hook in kvm_arch_vm_destroy()
    Date
    From: Sean Christopherson <sean.j.christopherson@intel.com>

    Add a second kvm_x86_ops hook in kvm_arch_vm_destroy() to support TDX's
    destruction path, which needs to first put the VM into a teardown state,
    then free per-vCPU resource, and finally free per-VM resources.

    Note, this knowingly creates a discrepancy in nomenclature for SVM as
    svm_vm_teardown() invokes avic_vm_destroy() and sev_vm_destroy().
    Moving the now-misnamed functions or renaming them is left to a future
    patch so as not to introduce a functional change for SVM.

    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
    Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
    ---
    arch/x86/include/asm/kvm-x86-ops.h | 1 +
    arch/x86/include/asm/kvm_host.h | 1 +
    arch/x86/kvm/svm/svm.c | 8 +++++++-
    arch/x86/kvm/vmx/vmx.c | 12 ++++++++++++
    arch/x86/kvm/x86.c | 3 ++-
    5 files changed, 23 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h
    index 01457da0162b..95ae4a71cfbc 100644
    --- a/arch/x86/include/asm/kvm-x86-ops.h
    +++ b/arch/x86/include/asm/kvm-x86-ops.h
    @@ -20,6 +20,7 @@ KVM_X86_OP(has_emulated_msr)
    KVM_X86_OP(vcpu_after_set_cpuid)
    KVM_X86_OP(is_vm_type_supported)
    KVM_X86_OP(vm_init)
    +KVM_X86_OP(vm_teardown)
    KVM_X86_OP_NULL(vm_destroy)
    KVM_X86_OP(vcpu_create)
    KVM_X86_OP(vcpu_free)
    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index e3abf077f328..96e6cd95d884 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -1217,6 +1217,7 @@ struct kvm_x86_ops {
    bool (*is_vm_type_supported)(unsigned long vm_type);
    unsigned int vm_size;
    int (*vm_init)(struct kvm *kvm);
    + void (*vm_teardown)(struct kvm *kvm);
    void (*vm_destroy)(struct kvm *kvm);

    /* Create, but do not attach this VCPU */
    diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
    index 286a49b09269..bcc3fc4872a3 100644
    --- a/arch/x86/kvm/svm/svm.c
    +++ b/arch/x86/kvm/svm/svm.c
    @@ -4416,12 +4416,17 @@ static void svm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector)
    sev_vcpu_deliver_sipi_vector(vcpu, vector);
    }

    -static void svm_vm_destroy(struct kvm *kvm)
    +static void svm_vm_teardown(struct kvm *kvm)
    {
    avic_vm_destroy(kvm);
    sev_vm_destroy(kvm);
    }

    +static void svm_vm_destroy(struct kvm *kvm)
    +{
    +
    +}
    +
    static bool svm_is_vm_type_supported(unsigned long type)
    {
    return type == KVM_X86_LEGACY_VM;
    @@ -4456,6 +4461,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
    .is_vm_type_supported = svm_is_vm_type_supported,
    .vm_size = sizeof(struct kvm_svm),
    .vm_init = svm_vm_init,
    + .vm_teardown = svm_vm_teardown,
    .vm_destroy = svm_vm_destroy,

    .prepare_guest_switch = svm_prepare_guest_switch,
    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index 84c2df824ecc..36756a356704 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -6995,6 +6995,16 @@ static int vmx_vm_init(struct kvm *kvm)
    return 0;
    }

    +static void vmx_vm_teardown(struct kvm *kvm)
    +{
    +
    +}
    +
    +static void vmx_vm_destroy(struct kvm *kvm)
    +{
    +
    +}
    +
    static int __init vmx_check_processor_compat(void)
    {
    struct vmcs_config vmcs_conf;
    @@ -7613,6 +7623,8 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
    .is_vm_type_supported = vmx_is_vm_type_supported,
    .vm_size = sizeof(struct kvm_vmx),
    .vm_init = vmx_vm_init,
    + .vm_teardown = vmx_vm_teardown,
    + .vm_destroy = vmx_vm_destroy,

    .vcpu_create = vmx_create_vcpu,
    .vcpu_free = vmx_free_vcpu,
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index da9f1081cb03..4b436cae1732 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -11043,7 +11043,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
    __x86_set_memory_region(kvm, TSS_PRIVATE_MEMSLOT, 0, 0);
    mutex_unlock(&kvm->slots_lock);
    }
    - static_call_cond(kvm_x86_vm_destroy)(kvm);
    + static_call(kvm_x86_vm_teardown)(kvm);
    kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1));
    kvm_pic_destroy(kvm);
    kvm_ioapic_destroy(kvm);
    @@ -11054,6 +11054,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
    kvm_page_track_cleanup(kvm);
    kvm_xen_destroy_vm(kvm);
    kvm_hv_destroy_vm(kvm);
    + static_call_cond(kvm_x86_vm_destroy)(kvm);
    }

    void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot)
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-07-03 00:06    [W:4.288 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site