lkml.org 
[lkml]   [2022]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 076/108] KVM: TDX: handle vcpu migration over logical processor
    Date
    From: Isaku Yamahata <isaku.yamahata@intel.com>

    For vcpu migration, in the case of VMX, VCMS is flushed on the source pcpu,
    and load it on the target pcpu. There are corresponding TDX SEAMCALL APIs,
    call them on vcpu migration. The logic is mostly same as VMX except the
    TDX SEAMCALLs are used.

    When shutting down the machine, (VMX or TDX) vcpus needs to be shutdown on
    each pcpu. Do the similar for TDX with TDX SEAMCALL APIs.

    Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
    ---
    arch/x86/kvm/vmx/main.c | 43 +++++++++++--
    arch/x86/kvm/vmx/tdx.c | 121 +++++++++++++++++++++++++++++++++++++
    arch/x86/kvm/vmx/tdx.h | 2 +
    arch/x86/kvm/vmx/x86_ops.h | 6 ++
    4 files changed, 168 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
    index 379b3343557b..6d46ae9c5dce 100644
    --- a/arch/x86/kvm/vmx/main.c
    +++ b/arch/x86/kvm/vmx/main.c
    @@ -17,6 +17,25 @@ static bool vt_is_vm_type_supported(unsigned long type)
    (enable_tdx && tdx_is_vm_type_supported(type));
    }

    +static int vt_hardware_enable(void)
    +{
    + int ret;
    +
    + ret = vmx_hardware_enable();
    + if (ret)
    + return ret;
    +
    + tdx_hardware_enable();
    + return 0;
    +}
    +
    +static void vt_hardware_disable(void)
    +{
    + /* Note, TDX *and* VMX need to be disabled if TDX is enabled. */
    + tdx_hardware_disable();
    + vmx_hardware_disable();
    +}
    +
    static __init int vt_hardware_setup(void)
    {
    int ret;
    @@ -141,6 +160,14 @@ static fastpath_t vt_vcpu_run(struct kvm_vcpu *vcpu)
    return vmx_vcpu_run(vcpu);
    }

    +static void vt_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
    +{
    + if (is_td_vcpu(vcpu))
    + return tdx_vcpu_load(vcpu, cpu);
    +
    + return vmx_vcpu_load(vcpu, cpu);
    +}
    +
    static void vt_flush_tlb_all(struct kvm_vcpu *vcpu)
    {
    if (is_td_vcpu(vcpu))
    @@ -199,6 +226,14 @@ static void vt_load_mmu_pgd(struct kvm_vcpu *vcpu, hpa_t root_hpa,
    vmx_load_mmu_pgd(vcpu, root_hpa, pgd_level);
    }

    +static void vt_sched_in(struct kvm_vcpu *vcpu, int cpu)
    +{
    + if (is_td_vcpu(vcpu))
    + return;
    +
    + vmx_sched_in(vcpu, cpu);
    +}
    +
    static int vt_mem_enc_ioctl(struct kvm *kvm, void __user *argp)
    {
    if (!is_td(kvm))
    @@ -222,8 +257,8 @@ struct kvm_x86_ops vt_x86_ops __initdata = {
    .offline_cpu = tdx_offline_cpu,
    .check_processor_compatibility = vmx_check_processor_compatibility,

    - .hardware_enable = vmx_hardware_enable,
    - .hardware_disable = vmx_hardware_disable,
    + .hardware_enable = vt_hardware_enable,
    + .hardware_disable = vt_hardware_disable,
    .has_emulated_msr = vmx_has_emulated_msr,

    .is_vm_type_supported = vt_is_vm_type_supported,
    @@ -239,7 +274,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = {
    .vcpu_reset = vt_vcpu_reset,

    .prepare_switch_to_guest = vt_prepare_switch_to_guest,
    - .vcpu_load = vmx_vcpu_load,
    + .vcpu_load = vt_vcpu_load,
    .vcpu_put = vt_vcpu_put,

    .update_exception_bitmap = vmx_update_exception_bitmap,
    @@ -327,7 +362,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = {

    .request_immediate_exit = vmx_request_immediate_exit,

    - .sched_in = vmx_sched_in,
    + .sched_in = vt_sched_in,

    .cpu_dirty_log_size = PML_ENTITY_NUM,
    .update_cpu_dirty_logging = vmx_update_cpu_dirty_logging,
    diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
    index 5807a2f564af..fc4de83a2df8 100644
    --- a/arch/x86/kvm/vmx/tdx.c
    +++ b/arch/x86/kvm/vmx/tdx.c
    @@ -51,6 +51,14 @@ static DEFINE_MUTEX(tdx_lock);
    static struct mutex *tdx_mng_key_config_lock;
    static atomic_t nr_configured_hkid;

    +/*
    + * A per-CPU list of TD vCPUs associated with a given CPU. Used when a CPU
    + * is brought down to invoke TDH_VP_FLUSH on the approapriate TD vCPUS.
    + * Protected by interrupt mask. This list is manipulated in process context
    + * of vcpu and IPI callback. See tdx_flush_vp_on_cpu().
    + */
    +static DEFINE_PER_CPU(struct list_head, associated_tdvcpus);
    +
    static __always_inline hpa_t set_hkid_to_hpa(hpa_t pa, u16 hkid)
    {
    return pa | ((hpa_t)hkid << boot_cpu_data.x86_phys_bits);
    @@ -82,6 +90,36 @@ static inline bool is_td_finalized(struct kvm_tdx *kvm_tdx)
    return kvm_tdx->finalized;
    }

    +static inline void tdx_disassociate_vp(struct kvm_vcpu *vcpu)
    +{
    + list_del(&to_tdx(vcpu)->cpu_list);
    +
    + /*
    + * Ensure tdx->cpu_list is updated is before setting vcpu->cpu to -1,
    + * otherwise, a different CPU can see vcpu->cpu = -1 and add the vCPU
    + * to its list before its deleted from this CPUs list.
    + */
    + smp_wmb();
    +
    + vcpu->cpu = -1;
    +}
    +
    +void tdx_hardware_enable(void)
    +{
    + INIT_LIST_HEAD(&per_cpu(associated_tdvcpus, raw_smp_processor_id()));
    +}
    +
    +void tdx_hardware_disable(void)
    +{
    + int cpu = raw_smp_processor_id();
    + struct list_head *tdvcpus = &per_cpu(associated_tdvcpus, cpu);
    + struct vcpu_tdx *tdx, *tmp;
    +
    + /* Safe variant needed as tdx_disassociate_vp() deletes the entry. */
    + list_for_each_entry_safe(tdx, tmp, tdvcpus, cpu_list)
    + tdx_disassociate_vp(&tdx->vcpu);
    +}
    +
    static void tdx_clear_page(unsigned long page)
    {
    const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
    @@ -176,6 +214,41 @@ static void tdx_reclaim_td_page(struct tdx_td_page *page)
    }
    }

    +static void tdx_flush_vp(void *arg)
    +{
    + struct kvm_vcpu *vcpu = arg;
    + u64 err;
    +
    + lockdep_assert_irqs_disabled();
    +
    + /* Task migration can race with CPU offlining. */
    + if (vcpu->cpu != raw_smp_processor_id())
    + return;
    +
    + /*
    + * No need to do TDH_VP_FLUSH if the vCPU hasn't been initialized. The
    + * list tracking still needs to be updated so that it's correct if/when
    + * the vCPU does get initialized.
    + */
    + if (is_td_vcpu_created(to_tdx(vcpu))) {
    + err = tdh_vp_flush(to_tdx(vcpu)->tdvpr.pa);
    + if (unlikely(err && err != TDX_VCPU_NOT_ASSOCIATED)) {
    + if (WARN_ON_ONCE(err))
    + pr_tdx_error(TDH_VP_FLUSH, err, NULL);
    + }
    + }
    +
    + tdx_disassociate_vp(vcpu);
    +}
    +
    +static void tdx_flush_vp_on_cpu(struct kvm_vcpu *vcpu)
    +{
    + if (unlikely(vcpu->cpu == -1))
    + return;
    +
    + smp_call_function_single(vcpu->cpu, tdx_flush_vp, vcpu, 1);
    +}
    +
    static int tdx_do_tdh_phymem_cache_wb(void *param)
    {
    u64 err = 0;
    @@ -200,6 +273,8 @@ void tdx_mmu_release_hkid(struct kvm *kvm)
    struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
    cpumask_var_t packages;
    bool cpumask_allocated;
    + struct kvm_vcpu *vcpu;
    + unsigned long j;
    u64 err;
    int ret;
    int i;
    @@ -210,6 +285,19 @@ void tdx_mmu_release_hkid(struct kvm *kvm)
    if (!is_td_created(kvm_tdx))
    goto free_hkid;

    + kvm_for_each_vcpu(j, vcpu, kvm)
    + tdx_flush_vp_on_cpu(vcpu);
    +
    + mutex_lock(&tdx_lock);
    + err = tdh_mng_vpflushdone(kvm_tdx->tdr.pa);
    + mutex_unlock(&tdx_lock);
    + if (WARN_ON_ONCE(err)) {
    + pr_tdx_error(TDH_MNG_VPFLUSHDONE, err, NULL);
    + pr_err("tdh_mng_vpflushdone failed. HKID %d is leaked.\n",
    + kvm_tdx->hkid);
    + return;
    + }
    +
    cpumask_allocated = zalloc_cpumask_var(&packages, GFP_KERNEL);
    cpus_read_lock();
    for_each_online_cpu(i) {
    @@ -355,6 +443,26 @@ int tdx_vcpu_create(struct kvm_vcpu *vcpu)
    return 0;
    }

    +void tdx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
    +{
    + struct vcpu_tdx *tdx = to_tdx(vcpu);
    +
    + if (vcpu->cpu == cpu)
    + return;
    +
    + tdx_flush_vp_on_cpu(vcpu);
    +
    + local_irq_disable();
    + /*
    + * Pairs with the smp_wmb() in tdx_disassociate_vp() to ensure
    + * vcpu->cpu is read before tdx->cpu_list.
    + */
    + smp_rmb();
    +
    + list_add(&tdx->cpu_list, &per_cpu(associated_tdvcpus, cpu));
    + local_irq_enable();
    +}
    +
    void tdx_prepare_switch_to_guest(struct kvm_vcpu *vcpu)
    {
    struct vcpu_tdx *tdx = to_tdx(vcpu);
    @@ -405,6 +513,19 @@ void tdx_vcpu_free(struct kvm_vcpu *vcpu)
    tdx->tdvpx = NULL;
    }
    tdx_reclaim_td_page(&tdx->tdvpr);
    +
    + /*
    + * kvm_free_vcpus()
    + * -> kvm_unload_vcpu_mmu()
    + *
    + * does vcpu_load() for every vcpu after they already disassociated
    + * from the per cpu list when tdx_vm_teardown(). So we need to
    + * disassociate them again, otherwise the freed vcpu data will be
    + * accessed when do list_{del,add}() on associated_tdvcpus list
    + * later.
    + */
    + tdx_flush_vp_on_cpu(vcpu);
    + WARN_ON_ONCE(vcpu->cpu != -1);
    }

    void tdx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
    diff --git a/arch/x86/kvm/vmx/tdx.h b/arch/x86/kvm/vmx/tdx.h
    index e5f973b2d752..c02073102a5f 100644
    --- a/arch/x86/kvm/vmx/tdx.h
    +++ b/arch/x86/kvm/vmx/tdx.h
    @@ -68,6 +68,8 @@ struct vcpu_tdx {
    struct tdx_td_page tdvpr;
    struct tdx_td_page *tdvpx;

    + struct list_head cpu_list;
    +
    union tdx_exit_reason exit_reason;

    bool vcpu_initialized;
    diff --git a/arch/x86/kvm/vmx/x86_ops.h b/arch/x86/kvm/vmx/x86_ops.h
    index a4e50c5a4bf5..d4fcb6b29ffe 100644
    --- a/arch/x86/kvm/vmx/x86_ops.h
    +++ b/arch/x86/kvm/vmx/x86_ops.h
    @@ -138,6 +138,8 @@ int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops);
    bool tdx_is_vm_type_supported(unsigned long type);
    void tdx_hardware_unsetup(void);
    int tdx_offline_cpu(void);
    +void tdx_hardware_enable(void);
    +void tdx_hardware_disable(void);
    int tdx_dev_ioctl(void __user *argp);

    int tdx_vm_init(struct kvm *kvm);
    @@ -150,6 +152,7 @@ void tdx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event);
    fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu);
    void tdx_prepare_switch_to_guest(struct kvm_vcpu *vcpu);
    void tdx_vcpu_put(struct kvm_vcpu *vcpu);
    +void tdx_vcpu_load(struct kvm_vcpu *vcpu, int cpu);

    int tdx_vm_ioctl(struct kvm *kvm, void __user *argp);
    int tdx_vcpu_ioctl(struct kvm_vcpu *vcpu, void __user *argp);
    @@ -162,6 +165,8 @@ static inline int tdx_hardware_setup(struct kvm_x86_ops *x86_ops) { return 0; }
    static inline bool tdx_is_vm_type_supported(unsigned long type) { return false; }
    static inline void tdx_hardware_unsetup(void) {}
    static inline int tdx_offline_cpu(void) { return 0; }
    +static inline void tdx_hardware_enable(void) {}
    +static inline void tdx_hardware_disable(void) {}
    static inline int tdx_dev_ioctl(void __user *argp) { return -EOPNOTSUPP; };

    static inline int tdx_vm_init(struct kvm *kvm) { return -EOPNOTSUPP; }
    @@ -175,6 +180,7 @@ static inline void tdx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) {}
    static inline fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu) { return EXIT_FASTPATH_NONE; }
    static inline void tdx_prepare_switch_to_guest(struct kvm_vcpu *vcpu) {}
    static inline void tdx_vcpu_put(struct kvm_vcpu *vcpu) {}
    +static inline void tdx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) {}

    static inline int tdx_vm_ioctl(struct kvm *kvm, void __user *argp) { return -EOPNOTSUPP; }
    static inline int tdx_vcpu_ioctl(struct kvm_vcpu *vcpu, void __user *argp) { return -EOPNOTSUPP; }
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-10-30 07:32    [W:2.913 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site