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: arm64: Convert to the generic perf callbacks
    The following commit has been merged into the perf/core branch of tip:

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

    KVM: arm64: Convert to the generic perf callbacks

    Drop arm64's version of the callbacks in favor of the callbacks provided
    by generic KVM, which are semantically identical.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Reviewed-by: Marc Zyngier <maz@kernel.org>
    Link: https://lore.kernel.org/r/20211111020738.2512932-15-seanjc@google.com
    ---
    arch/arm64/kvm/perf.c | 34 ++--------------------------------
    1 file changed, 2 insertions(+), 32 deletions(-)

    diff --git a/arch/arm64/kvm/perf.c b/arch/arm64/kvm/perf.c
    index dfa9bce..374c496 100644
    --- a/arch/arm64/kvm/perf.c
    +++ b/arch/arm64/kvm/perf.c
    @@ -13,42 +13,12 @@

    DEFINE_STATIC_KEY_FALSE(kvm_arm_pmu_available);

    -static unsigned int kvm_guest_state(void)
    -{
    - struct kvm_vcpu *vcpu = kvm_get_running_vcpu();
    - unsigned int state;
    -
    - if (!vcpu)
    - return 0;
    -
    - state = PERF_GUEST_ACTIVE;
    - if (!vcpu_mode_priv(vcpu))
    - state |= PERF_GUEST_USER;
    -
    - return state;
    -}
    -
    -static unsigned long kvm_get_guest_ip(void)
    -{
    - struct kvm_vcpu *vcpu = kvm_get_running_vcpu();
    -
    - if (WARN_ON_ONCE(!vcpu))
    - return 0;
    -
    - return *vcpu_pc(vcpu);
    -}
    -
    -static struct perf_guest_info_callbacks kvm_guest_cbs = {
    - .state = kvm_guest_state,
    - .get_ip = kvm_get_guest_ip,
    -};
    -
    void kvm_perf_init(void)
    {
    - perf_register_guest_info_callbacks(&kvm_guest_cbs);
    + kvm_register_perf_callbacks(NULL);
    }

    void kvm_perf_teardown(void)
    {
    - perf_unregister_guest_info_callbacks(&kvm_guest_cbs);
    + kvm_unregister_perf_callbacks();
    }
    \
     
     \ /
      Last update: 2021-11-18 15:35    [W:4.080 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site