From: "tip-bot2 for Sean Christopherson" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sean Christopherson <seanjc@google.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Marc Zyngier <maz@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] KVM: arm64: Convert to the generic perf callbacks
Date: Thu, 18 Nov 2021 14:34:38 -0000 [thread overview]
Message-ID: <163724607868.11128.9418762241597798046.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211111020738.2512932-15-seanjc@google.com>
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();
}
next prev parent reply other threads:[~2021-11-18 14:34 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 2:07 [PATCH v4 00/17] perf: KVM: Fix, optimize, and clean up callbacks Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 01/17] perf: Protect perf_guest_cbs with RCU Sean Christopherson
2021-11-11 7:26 ` Paolo Bonzini
2021-11-11 10:47 ` Peter Zijlstra
2021-11-12 7:55 ` Paolo Bonzini
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 02/17] KVM: x86: Register perf callbacks after calling vendor's hardware_setup() Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 03/17] KVM: x86: Register Processor Trace interrupt hook iff PT enabled in guest Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 04/17] perf: Stop pretending that perf can handle multiple guest callbacks Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 05/17] perf: Drop dead and useless guest "support" from arm, csky, nds32 and riscv Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 06/17] perf/core: Rework guest callbacks to prepare for static_call support Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Like Xu
2021-11-11 2:07 ` [PATCH v4 07/17] perf: Add wrappers for invoking guest callbacks Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 08/17] perf: Force architectures to opt-in to " Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 09/17] perf/core: Use static_call to optimize perf_guest_info_callbacks Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2022-02-02 18:43 ` [PATCH v4 09/17] " Sean Christopherson
2022-02-04 17:35 ` Sami Tolvanen
2022-02-06 13:08 ` Peter Zijlstra
2022-02-06 18:45 ` Kees Cook
2022-02-06 20:28 ` Peter Zijlstra
2022-02-07 2:55 ` Kees Cook
2022-02-18 22:35 ` Will McVicker
2022-08-24 16:45 ` Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 10/17] KVM: x86: Drop current_vcpu for kvm_running_vcpu + kvm_arch_vcpu variable Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 11/17] KVM: x86: More precisely identify NMI from guest when handling PMI Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 12/17] KVM: Move x86's perf guest info callbacks to generic KVM Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 13/17] KVM: x86: Move Intel Processor Trace interrupt handler to vmx.c Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 14/17] KVM: arm64: Convert to the generic perf callbacks Sean Christopherson
2021-11-18 14:34 ` tip-bot2 for Sean Christopherson [this message]
2021-11-11 2:07 ` [PATCH v4 15/17] KVM: arm64: Hide kvm_arm_pmu_available behind CONFIG_HW_PERF_EVENTS=y Sean Christopherson
2021-11-11 21:49 ` Marc Zyngier
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 16/17] KVM: arm64: Drop perf.c and fold its tiny bits of code into arm.c Sean Christopherson
2021-11-11 21:49 ` Marc Zyngier
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 2:07 ` [PATCH v4 17/17] perf: Drop guest callback (un)register stubs Sean Christopherson
2021-11-18 14:34 ` [tip: perf/core] " tip-bot2 for Sean Christopherson
2021-11-11 11:19 ` [PATCH v4 00/17] perf: KVM: Fix, optimize, and clean up callbacks Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=163724607868.11128.9418762241597798046.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maz@kernel.org \
--cc=peterz@infradead.org \
--cc=seanjc@google.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).