lkml.org 
[lkml]   [2021]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: perf/core] KVM: x86: Register perf callbacks after calling vendor's hardware_setup()
    The following commit has been merged into the perf/core branch of tip:

    Commit-ID: 5c7df80e2ce4c954c80eb4ecf5fa002a5ff5d2d6
    Gitweb: https://git.kernel.org/tip/5c7df80e2ce4c954c80eb4ecf5fa002a5ff5d2d6
    Author: Sean Christopherson <seanjc@google.com>
    AuthorDate: Thu, 11 Nov 2021 02:07:23
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Wed, 17 Nov 2021 14:49:06 +01:00

    KVM: x86: Register perf callbacks after calling vendor's hardware_setup()

    Wait to register perf callbacks until after doing vendor hardaware setup.
    VMX's hardware_setup() configures Intel Processor Trace (PT) mode, and a
    future fix to register the Intel PT guest interrupt hook if and only if
    Intel PT is exposed to the guest will consume the configured PT mode.

    Delaying registration to hardware setup is effectively a nop as KVM's perf
    hooks all pivot on the per-CPU current_vcpu, which is non-NULL only when
    KVM is handling an IRQ/NMI in a VM-Exit path. I.e. current_vcpu will be
    NULL throughout both kvm_arch_init() and kvm_arch_hardware_setup().

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Paolo Bonzini <pbonzini@redhat.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20211111020738.2512932-3-seanjc@google.com
    ---
    arch/x86/kvm/x86.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index dc7eb5f..50f0cd1 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -8626,8 +8626,6 @@ int kvm_arch_init(void *opaque)

    kvm_timer_init();

    - perf_register_guest_info_callbacks(&kvm_guest_cbs);
    -
    if (boot_cpu_has(X86_FEATURE_XSAVE)) {
    host_xcr0 = xgetbv(XCR_XFEATURE_ENABLED_MASK);
    supported_xcr0 = host_xcr0 & KVM_SUPPORTED_XCR0;
    @@ -8659,7 +8657,6 @@ void kvm_arch_exit(void)
    clear_hv_tscchange_cb();
    #endif
    kvm_lapic_exit();
    - perf_unregister_guest_info_callbacks(&kvm_guest_cbs);

    if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
    cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block,
    @@ -11225,6 +11222,8 @@ int kvm_arch_hardware_setup(void *opaque)
    memcpy(&kvm_x86_ops, ops->runtime_ops, sizeof(kvm_x86_ops));
    kvm_ops_static_call_update();

    + perf_register_guest_info_callbacks(&kvm_guest_cbs);
    +
    if (!kvm_cpu_cap_has(X86_FEATURE_XSAVES))
    supported_xss = 0;

    @@ -11252,6 +11251,8 @@ int kvm_arch_hardware_setup(void *opaque)

    void kvm_arch_hardware_unsetup(void)
    {
    + perf_unregister_guest_info_callbacks(&kvm_guest_cbs);
    +
    static_call(kvm_x86_hardware_unsetup)();
    }

    \
     
     \ /
      Last update: 2021-11-18 15:36    [W:7.630 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site