lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 15/37] KVM: x86: Introduce .hv_inject_synthetic_vmexit_post_tlb_flush() nested hook
    Date
    Hyper-V supports injecting synthetic L2->L1 exit after performing
    L2 TLB flush operation but the procedure is vendor specific. Introduce
    .hv_inject_synthetic_vmexit_post_tlb_flush nested hook for it.

    Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
    ---
    arch/x86/include/asm/kvm_host.h | 1 +
    arch/x86/kvm/Makefile | 3 ++-
    arch/x86/kvm/svm/hyperv.c | 11 +++++++++++
    arch/x86/kvm/svm/hyperv.h | 2 ++
    arch/x86/kvm/svm/nested.c | 1 +
    arch/x86/kvm/vmx/evmcs.c | 4 ++++
    arch/x86/kvm/vmx/evmcs.h | 1 +
    arch/x86/kvm/vmx/nested.c | 1 +
    8 files changed, 23 insertions(+), 1 deletion(-)
    create mode 100644 arch/x86/kvm/svm/hyperv.c

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 46a04bc8cd50..16fdea767209 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -1597,6 +1597,7 @@ struct kvm_x86_nested_ops {
    int (*enable_evmcs)(struct kvm_vcpu *vcpu,
    uint16_t *vmcs_version);
    uint16_t (*get_evmcs_version)(struct kvm_vcpu *vcpu);
    + void (*hv_inject_synthetic_vmexit_post_tlb_flush)(struct kvm_vcpu *vcpu);
    };

    struct kvm_x86_init_ops {
    diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
    index 30f244b64523..b6d53b045692 100644
    --- a/arch/x86/kvm/Makefile
    +++ b/arch/x86/kvm/Makefile
    @@ -25,7 +25,8 @@ kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \
    vmx/evmcs.o vmx/nested.o vmx/posted_intr.o
    kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o

    -kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o
    +kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \
    + svm/sev.o svm/hyperv.o

    ifdef CONFIG_HYPERV
    kvm-amd-y += svm/svm_onhyperv.o
    diff --git a/arch/x86/kvm/svm/hyperv.c b/arch/x86/kvm/svm/hyperv.c
    new file mode 100644
    index 000000000000..911f51021af1
    --- /dev/null
    +++ b/arch/x86/kvm/svm/hyperv.c
    @@ -0,0 +1,11 @@
    +// SPDX-License-Identifier: GPL-2.0-only
    +/*
    + * AMD SVM specific code for Hyper-V on KVM.
    + *
    + * Copyright 2022 Red Hat, Inc. and/or its affiliates.
    + */
    +#include "hyperv.h"
    +
    +void svm_hv_inject_synthetic_vmexit_post_tlb_flush(struct kvm_vcpu *vcpu)
    +{
    +}
    diff --git a/arch/x86/kvm/svm/hyperv.h b/arch/x86/kvm/svm/hyperv.h
    index 8cf702fed7e5..dd2e393f84a0 100644
    --- a/arch/x86/kvm/svm/hyperv.h
    +++ b/arch/x86/kvm/svm/hyperv.h
    @@ -48,4 +48,6 @@ static inline void nested_svm_hv_update_vm_vp_ids(struct kvm_vcpu *vcpu)
    hv_vcpu->nested.vp_id = hve->hv_vp_id;
    }

    +void svm_hv_inject_synthetic_vmexit_post_tlb_flush(struct kvm_vcpu *vcpu);
    +
    #endif /* __ARCH_X86_KVM_SVM_HYPERV_H__ */
    diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
    index 7bf35f3345c2..b203e6cd75dc 100644
    --- a/arch/x86/kvm/svm/nested.c
    +++ b/arch/x86/kvm/svm/nested.c
    @@ -1718,4 +1718,5 @@ struct kvm_x86_nested_ops svm_nested_ops = {
    .get_nested_state_pages = svm_get_nested_state_pages,
    .get_state = svm_get_nested_state,
    .set_state = svm_set_nested_state,
    + .hv_inject_synthetic_vmexit_post_tlb_flush = svm_hv_inject_synthetic_vmexit_post_tlb_flush,
    };
    diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c
    index 6a61b1ae7942..805afc170b5b 100644
    --- a/arch/x86/kvm/vmx/evmcs.c
    +++ b/arch/x86/kvm/vmx/evmcs.c
    @@ -439,3 +439,7 @@ int nested_enable_evmcs(struct kvm_vcpu *vcpu,

    return 0;
    }
    +
    +void vmx_hv_inject_synthetic_vmexit_post_tlb_flush(struct kvm_vcpu *vcpu)
    +{
    +}
    diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h
    index f886a8ff0342..584741b85eb6 100644
    --- a/arch/x86/kvm/vmx/evmcs.h
    +++ b/arch/x86/kvm/vmx/evmcs.h
    @@ -245,5 +245,6 @@ int nested_enable_evmcs(struct kvm_vcpu *vcpu,
    uint16_t *vmcs_version);
    void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata);
    int nested_evmcs_check_controls(struct vmcs12 *vmcs12);
    +void vmx_hv_inject_synthetic_vmexit_post_tlb_flush(struct kvm_vcpu *vcpu);

    #endif /* __KVM_X86_VMX_EVMCS_H */
    diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
    index 3a8a5881b609..5c311b2cb52e 100644
    --- a/arch/x86/kvm/vmx/nested.c
    +++ b/arch/x86/kvm/vmx/nested.c
    @@ -6858,4 +6858,5 @@ struct kvm_x86_nested_ops vmx_nested_ops = {
    .write_log_dirty = nested_vmx_write_pml_buffer,
    .enable_evmcs = nested_enable_evmcs,
    .get_evmcs_version = nested_get_evmcs_version,
    + .hv_inject_synthetic_vmexit_post_tlb_flush = vmx_hv_inject_synthetic_vmexit_post_tlb_flush,
    };
    --
    2.35.3
    \
     
     \ /
      Last update: 2022-05-27 18:00    [W:4.131 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site