lkml.org 
[lkml]   [2021]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 13/16] KVM: x86: Move Intel Processor Trace interrupt handler to vmx.c
    From
    Now that all state needed for VMX's PT interrupt handler is exposed to
    vmx.c (specifically the currently running vCPU), move the handler into
    vmx.c where it belongs.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    arch/x86/include/asm/kvm_host.h | 2 +-
    arch/x86/kvm/vmx/vmx.c | 22 +++++++++++++++++++++-
    arch/x86/kvm/x86.c | 20 +-------------------
    3 files changed, 23 insertions(+), 21 deletions(-)

    diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
    index 6efe4e03a6d2..d40814b57ae8 100644
    --- a/arch/x86/include/asm/kvm_host.h
    +++ b/arch/x86/include/asm/kvm_host.h
    @@ -1495,7 +1495,7 @@ struct kvm_x86_init_ops {
    int (*disabled_by_bios)(void);
    int (*check_processor_compatibility)(void);
    int (*hardware_setup)(void);
    - bool (*intel_pt_intr_in_guest)(void);
    + unsigned int (*handle_intel_pt_intr)(void);

    struct kvm_x86_ops *runtime_ops;
    };
    diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
    index 61a4f5ff2acd..33f92febe3ce 100644
    --- a/arch/x86/kvm/vmx/vmx.c
    +++ b/arch/x86/kvm/vmx/vmx.c
    @@ -7687,6 +7687,20 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
    .vcpu_deliver_sipi_vector = kvm_vcpu_deliver_sipi_vector,
    };

    +static unsigned int vmx_handle_intel_pt_intr(void)
    +{
    + struct kvm_vcpu *vcpu = kvm_get_running_vcpu();
    +
    + /* '0' on failure so that the !PT case can use a RET0 static call. */
    + if (!kvm_arch_pmi_in_guest(vcpu))
    + return 0;
    +
    + kvm_make_request(KVM_REQ_PMI, vcpu);
    + __set_bit(MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT,
    + (unsigned long *)&vcpu->arch.pmu.global_status);
    + return 1;
    +}
    +
    static __init void vmx_setup_user_return_msrs(void)
    {

    @@ -7713,6 +7727,8 @@ static __init void vmx_setup_user_return_msrs(void)
    kvm_add_user_return_msr(vmx_uret_msrs_list[i]);
    }

    +static struct kvm_x86_init_ops vmx_init_ops __initdata;
    +
    static __init int hardware_setup(void)
    {
    unsigned long host_bndcfgs;
    @@ -7873,6 +7889,10 @@ static __init int hardware_setup(void)
    return -EINVAL;
    if (!enable_ept || !cpu_has_vmx_intel_pt())
    pt_mode = PT_MODE_SYSTEM;
    + if (pt_mode == PT_MODE_HOST_GUEST)
    + vmx_init_ops.handle_intel_pt_intr = vmx_handle_intel_pt_intr;
    + else
    + vmx_init_ops.handle_intel_pt_intr = NULL;

    setup_default_sgx_lepubkeyhash();

    @@ -7898,7 +7918,7 @@ static struct kvm_x86_init_ops vmx_init_ops __initdata = {
    .disabled_by_bios = vmx_disabled_by_bios,
    .check_processor_compatibility = vmx_check_processor_compat,
    .hardware_setup = hardware_setup,
    - .intel_pt_intr_in_guest = vmx_pt_mode_is_host_guest,
    + .handle_intel_pt_intr = NULL,

    .runtime_ops = &vmx_x86_ops,
    };
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 1bea616402e6..b79b2d29260d 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -8264,20 +8264,6 @@ static void kvm_timer_init(void)
    kvmclock_cpu_online, kvmclock_cpu_down_prep);
    }

    -static unsigned int kvm_handle_intel_pt_intr(void)
    -{
    - struct kvm_vcpu *vcpu = kvm_get_running_vcpu();
    -
    - /* '0' on failure so that the !PT case can use a RET0 static call. */
    - if (!kvm_arch_pmi_in_guest(vcpu))
    - return 0;
    -
    - kvm_make_request(KVM_REQ_PMI, vcpu);
    - __set_bit(MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI_BIT,
    - (unsigned long *)&vcpu->arch.pmu.global_status);
    - return 1;
    -}
    -
    #ifdef CONFIG_X86_64
    static void pvclock_gtod_update_fn(struct work_struct *work)
    {
    @@ -11031,11 +11017,7 @@ int kvm_arch_hardware_setup(void *opaque)
    memcpy(&kvm_x86_ops, ops->runtime_ops, sizeof(kvm_x86_ops));
    kvm_ops_static_call_update();

    - /* Temporary ugliness. */
    - if (ops->intel_pt_intr_in_guest && ops->intel_pt_intr_in_guest())
    - kvm_register_perf_callbacks(kvm_handle_intel_pt_intr);
    - else
    - kvm_register_perf_callbacks(NULL);
    + kvm_register_perf_callbacks(ops->handle_intel_pt_intr);

    if (!kvm_cpu_cap_has(X86_FEATURE_XSAVES))
    supported_xss = 0;
    --
    2.33.0.464.g1972c5931b-goog
    \
     
     \ /
      Last update: 2021-09-22 02:07    [W:3.248 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site