From: Marc Zyngier <marc.zyngier@arm.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, Gleb Natapov <gleb@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Shannon Zhao <shannon.zhao@linaro.org>,
kvmarm@lists.cs.columbia.edu
Subject: [PATCH 74/95] arm64: KVM: Free perf event of PMU when destroying vcpu
Date: Wed, 9 Mar 2016 07:31:08 +0000 [thread overview]
Message-ID: <1457508689-19672-75-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1457508689-19672-1-git-send-email-marc.zyngier@arm.com>
From: Shannon Zhao <shannon.zhao@linaro.org>
When KVM frees VCPU, it needs to free the perf_event of PMU.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/kvm/arm.c | 1 +
include/kvm/arm_pmu.h | 2 ++
virt/kvm/arm/pmu.c | 21 +++++++++++++++++++++
3 files changed, 24 insertions(+)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c5e9591..9d133df 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -266,6 +266,7 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
kvm_mmu_free_memory_caches(vcpu);
kvm_timer_vcpu_terminate(vcpu);
kvm_vgic_vcpu_destroy(vcpu);
+ kvm_pmu_vcpu_destroy(vcpu);
kmem_cache_free(kvm_vcpu_cache, vcpu);
}
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h
index b4993eb..9f87d71 100644
--- a/include/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
@@ -43,6 +43,7 @@ u64 kvm_pmu_get_counter_value(struct kvm_vcpu *vcpu, u64 select_idx);
void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val);
u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu);
void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu);
+void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu);
void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val);
void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val);
void kvm_pmu_overflow_set(struct kvm_vcpu *vcpu, u64 val);
@@ -69,6 +70,7 @@ static inline u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu)
return 0;
}
static inline void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu) {}
+static inline void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu) {}
static inline void kvm_pmu_disable_counter(struct kvm_vcpu *vcpu, u64 val) {}
static inline void kvm_pmu_enable_counter(struct kvm_vcpu *vcpu, u64 val) {}
static inline void kvm_pmu_overflow_set(struct kvm_vcpu *vcpu, u64 val) {}
diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c
index 1dbbc2c..9b83857 100644
--- a/virt/kvm/arm/pmu.c
+++ b/virt/kvm/arm/pmu.c
@@ -101,6 +101,27 @@ void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu)
}
}
+/**
+ * kvm_pmu_vcpu_destroy - free perf event of PMU for cpu
+ * @vcpu: The vcpu pointer
+ *
+ */
+void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu)
+{
+ int i;
+ struct kvm_pmu *pmu = &vcpu->arch.pmu;
+
+ for (i = 0; i < ARMV8_PMU_MAX_COUNTERS; i++) {
+ struct kvm_pmc *pmc = &pmu->pmc[i];
+
+ if (pmc->perf_event) {
+ perf_event_disable(pmc->perf_event);
+ perf_event_release_kernel(pmc->perf_event);
+ pmc->perf_event = NULL;
+ }
+ }
+}
+
u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu)
{
u64 val = vcpu_sys_reg(vcpu, PMCR_EL0) >> ARMV8_PMU_PMCR_N_SHIFT;
--
2.1.4
next prev parent reply other threads:[~2016-03-09 7:35 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 7:29 [PULL] KVM/ARM updates for 4.6 Marc Zyngier
2016-03-09 7:29 ` [PATCH 01/95] arm/arm64: KVM: Add hook for C-based stage2 init Marc Zyngier
2016-03-09 7:29 ` [PATCH 02/95] ARM: KVM: Move the HYP code to its own section Marc Zyngier
2016-03-09 7:29 ` [PATCH 03/95] ARM: KVM: Remove __kvm_hyp_code_start/__kvm_hyp_code_end Marc Zyngier
2016-03-09 7:29 ` [PATCH 04/95] ARM: KVM: Move VFP registers to a CPU context structure Marc Zyngier
2016-03-09 7:29 ` [PATCH 05/95] ARM: KVM: Move CP15 array into the " Marc Zyngier
2016-03-09 7:30 ` [PATCH 06/95] ARM: KVM: Move GP registers " Marc Zyngier
2016-03-09 7:30 ` [PATCH 07/95] ARM: KVM: Add a HYP-specific header file Marc Zyngier
2016-03-09 7:30 ` [PATCH 08/95] ARM: KVM: Add system register accessor macros Marc Zyngier
2016-03-09 7:30 ` [PATCH 09/95] ARM: KVM: Add TLB invalidation code Marc Zyngier
2016-03-09 7:30 ` [PATCH 10/95] ARM: KVM: Add CP15 save/restore code Marc Zyngier
2016-03-09 7:30 ` [PATCH 11/95] ARM: KVM: Add timer save/restore Marc Zyngier
2016-03-09 7:30 ` [PATCH 12/95] ARM: KVM: Add vgic v2 save/restore Marc Zyngier
2016-03-09 7:30 ` [PATCH 13/95] ARM: KVM: Add VFP save/restore Marc Zyngier
2016-03-09 7:30 ` [PATCH 14/95] ARM: KVM: Add banked registers save/restore Marc Zyngier
2016-03-09 7:30 ` [PATCH 15/95] ARM: KVM: Add guest entry code Marc Zyngier
2016-03-09 7:30 ` [PATCH 16/95] ARM: KVM: Add VFP lazy save/restore handler Marc Zyngier
2016-03-09 7:30 ` [PATCH 17/95] ARM: KVM: Add the new world switch implementation Marc Zyngier
2016-03-09 7:30 ` [PATCH 18/95] ARM: KVM: Add populating of fault data structure Marc Zyngier
2016-03-09 7:30 ` [PATCH 19/95] ARM: KVM: Add HYP mode entry code Marc Zyngier
2016-03-09 7:30 ` [PATCH 20/95] ARM: KVM: Add panic handling code Marc Zyngier
2016-03-09 7:30 ` [PATCH 21/95] ARM: KVM: Change kvm_call_hyp return type to unsigned long Marc Zyngier
2016-03-09 7:30 ` [PATCH 22/95] ARM: KVM: Remove the old world switch Marc Zyngier
2016-03-09 7:30 ` [PATCH 23/95] ARM: KVM: Switch to C-based stage2 init Marc Zyngier
2016-03-09 7:30 ` [PATCH 24/95] ARM: KVM: Remove __weak attributes Marc Zyngier
2016-03-09 7:30 ` [PATCH 25/95] ARM: KVM: Turn CP15 defines to an enum Marc Zyngier
2016-03-09 7:30 ` [PATCH 26/95] ARM: KVM: Cleanup asm-offsets.c Marc Zyngier
2016-03-09 7:30 ` [PATCH 27/95] ARM: KVM: Remove unused hyp_pc field Marc Zyngier
2016-03-09 7:30 ` [PATCH 28/95] ARM: KVM: Remove handling of ARM_EXCEPTION_DATA/PREF_ABORT Marc Zyngier
2016-03-09 7:30 ` [PATCH 29/95] ARM: KVM: Remove __kvm_hyp_exit/__kvm_hyp_exit_end Marc Zyngier
2016-03-09 7:30 ` [PATCH 30/95] arm/arm64: KVM: Handle out-of-RAM cache maintenance as a NOP Marc Zyngier
2016-03-09 7:30 ` [PATCH 31/95] arm64: KVM: Switch to C-based stage2 init Marc Zyngier
2016-03-09 7:30 ` [PATCH 32/95] arm/arm64: Add new is_kernel_in_hyp_mode predicate Marc Zyngier
2016-03-09 7:30 ` [PATCH 33/95] arm64: Allow the arch timer to use the HYP timer Marc Zyngier
2016-03-09 7:30 ` [PATCH 34/95] arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature Marc Zyngier
2016-03-09 7:30 ` [PATCH 35/95] arm64: KVM: Skip HYP setup when already running in HYP Marc Zyngier
2016-03-09 7:30 ` [PATCH 36/95] arm64: KVM: VHE: Patch out use of HVC Marc Zyngier
2016-03-09 7:30 ` [PATCH 37/95] arm64: KVM: VHE: Patch out kern_hyp_va Marc Zyngier
2016-03-09 7:30 ` [PATCH 38/95] arm64: KVM: VHE: Introduce unified system register accessors Marc Zyngier
2016-03-09 7:30 ` [PATCH 39/95] arm64: KVM: VHE: Differenciate host/guest sysreg save/restore Marc Zyngier
2016-03-09 7:30 ` [PATCH 40/95] arm64: KVM: VHE: Split save/restore of registers shared between guest and host Marc Zyngier
2016-03-09 7:30 ` [PATCH 41/95] arm64: KVM: VHE: Use unified system register accessors Marc Zyngier
2016-03-09 7:30 ` [PATCH 42/95] arm64: KVM: VHE: Enable minimal sysreg save/restore Marc Zyngier
2016-03-09 7:30 ` [PATCH 43/95] arm64: KVM: VHE: Make __fpsimd_enabled VHE aware Marc Zyngier
2016-03-09 7:30 ` [PATCH 44/95] arm64: KVM: VHE: Implement VHE activate/deactivate_traps Marc Zyngier
2016-03-09 7:30 ` [PATCH 45/95] arm64: KVM: VHE: Use unified sysreg accessors for timer Marc Zyngier
2016-03-09 7:30 ` [PATCH 46/95] arm64: KVM: VHE: Add fpsimd enabling on guest access Marc Zyngier
2016-03-09 7:30 ` [PATCH 47/95] arm64: KVM: VHE: Add alternative panic handling Marc Zyngier
2016-03-09 7:30 ` [PATCH 48/95] arm64: KVM: Move most of the fault decoding to C Marc Zyngier
2016-03-09 7:30 ` [PATCH 49/95] arm64: perf: Count EL2 events if the kernel is running in HYP Marc Zyngier
2016-03-09 7:30 ` [PATCH 50/95] arm64: hw_breakpoint: Allow EL2 breakpoints if " Marc Zyngier
2016-03-09 7:30 ` [PATCH 51/95] arm64: VHE: Add support for running Linux in EL2 mode Marc Zyngier
2016-03-09 7:30 ` [PATCH 52/95] arm64: KVM: Move kvm/hyp/hyp.h to include/asm/kvm_hyp.h Marc Zyngier
2016-03-09 7:30 ` [PATCH 53/95] arm64: KVM: Move vgic-v2 and timer save/restore to virt/kvm/arm/hyp Marc Zyngier
2016-03-09 7:30 ` [PATCH 54/95] ARM: KVM: Move kvm/hyp/hyp.h to include/asm/kvm_hyp.h Marc Zyngier
2016-03-09 7:30 ` [PATCH 55/95] ARM: KVM: Use common version of vgic-v2-sr.c Marc Zyngier
2016-03-09 7:30 ` [PATCH 56/95] ARM: KVM: Use common version of timer-sr.c Marc Zyngier
2016-03-09 7:30 ` [PATCH 57/95] arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp Marc Zyngier
2016-03-09 7:30 ` [PATCH 58/95] arm64: KVM: Add temporary kvm_perf_event.h Marc Zyngier
2016-03-09 7:30 ` [PATCH 59/95] arm64: KVM: Define PMU data structure for each vcpu Marc Zyngier
2016-03-09 7:30 ` [PATCH 60/95] arm64: KVM: Add access handler for PMCR register Marc Zyngier
2016-03-09 7:30 ` [PATCH 61/95] arm64: KVM: Add access handler for PMSELR register Marc Zyngier
2016-03-09 7:30 ` [PATCH 62/95] arm64: KVM: Add access handler for PMCEID0 and PMCEID1 register Marc Zyngier
2016-03-09 7:30 ` [PATCH 63/95] arm64: KVM: Add access handler for event counter register Marc Zyngier
2016-03-09 7:30 ` [PATCH 64/95] arm64: KVM: Add access handler for PMCNTENSET and PMCNTENCLR register Marc Zyngier
2016-03-09 7:30 ` [PATCH 65/95] arm64: KVM: PMU: Add perf event map and introduce perf event creating function Marc Zyngier
2016-03-09 7:31 ` [PATCH 66/95] arm64: KVM: Add access handler for event type register Marc Zyngier
2016-03-09 7:31 ` [PATCH 67/95] arm64: KVM: Add access handler for PMINTENSET and PMINTENCLR register Marc Zyngier
2016-03-09 7:31 ` [PATCH 68/95] arm64: KVM: Add access handler for PMOVSSET and PMOVSCLR register Marc Zyngier
2016-03-09 7:31 ` [PATCH 69/95] arm64: KVM: Add access handler for PMSWINC register Marc Zyngier
2016-03-09 7:31 ` [PATCH 70/95] arm64: KVM: Add helper to handle PMCR register bits Marc Zyngier
2016-03-09 7:31 ` [PATCH 71/95] arm64: KVM: Add access handler for PMUSERENR register Marc Zyngier
2016-03-09 7:31 ` [PATCH 72/95] arm64: KVM: Add PMU overflow interrupt routing Marc Zyngier
2016-03-09 7:31 ` [PATCH 73/95] arm64: KVM: Reset PMU state when resetting vcpu Marc Zyngier
2016-03-09 7:31 ` Marc Zyngier [this message]
2016-03-09 7:31 ` [PATCH 75/95] arm64: KVM: Add a new feature bit for PMUv3 Marc Zyngier
2016-03-09 7:31 ` [PATCH 76/95] arm64: KVM: Introduce per-vcpu kvm device controls Marc Zyngier
2016-03-09 7:31 ` [PATCH 77/95] arm64: KVM: Add a new vcpu device control group for PMUv3 Marc Zyngier
2016-03-09 7:31 ` [PATCH 78/95] arm64: KVM: Switch the sys_reg search to be a binary search Marc Zyngier
2016-03-09 7:31 ` [PATCH 79/95] ARM: KVM: Properly sort the invariant table Marc Zyngier
2016-03-09 7:31 ` [PATCH 80/95] ARM: KVM: Enforce sorting of all CP tables Marc Zyngier
2016-03-09 7:31 ` [PATCH 81/95] ARM: KVM: Rename struct coproc_reg::is_64 to is_64bit Marc Zyngier
2016-03-09 7:31 ` [PATCH 82/95] ARM: KVM: Switch the CP reg search to be a binary search Marc Zyngier
2016-03-09 7:31 ` [PATCH 83/95] KVM: arm/arm64: timer: Add active state caching Marc Zyngier
2016-03-09 7:31 ` [PATCH 84/95] KVM: arm/arm64: vgic-v2: Avoid accessing GICH registers Marc Zyngier
2016-03-09 7:31 ` [PATCH 85/95] KVM: arm/arm64: vgic-v2: Save maintenance interrupt state only if required Marc Zyngier
2016-03-09 7:31 ` [PATCH 86/95] KVM: arm/arm64: vgic-v2: Move GICH_ELRSR saving to its own function Marc Zyngier
2016-03-09 7:31 ` [PATCH 87/95] KVM: arm/arm64: vgic-v2: Do not save an LR known to be empty Marc Zyngier
2016-03-09 7:31 ` [PATCH 88/95] KVM: arm/arm64: vgic-v2: Reset LRs at boot time Marc Zyngier
2016-03-09 7:31 ` [PATCH 89/95] KVM: arm/arm64: vgic-v2: Only wipe LRs on vcpu exit Marc Zyngier
2016-03-09 7:31 ` [PATCH 90/95] KVM: arm/arm64: vgic-v2: Make GICD_SGIR quicker to hit Marc Zyngier
2016-03-09 7:31 ` [PATCH 91/95] arm64: KVM: vgic-v3: Avoid accessing ICH registers Marc Zyngier
2016-03-09 7:31 ` [PATCH 92/95] arm64: KVM: vgic-v3: Save maintenance interrupt state only if required Marc Zyngier
2016-03-09 7:31 ` [PATCH 93/95] arm64: KVM: vgic-v3: Do not save an LR known to be empty Marc Zyngier
2016-03-09 7:31 ` [PATCH 94/95] arm64: KVM: vgic-v3: Reset LRs at boot time Marc Zyngier
2016-03-09 7:31 ` [PATCH 95/95] arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit Marc Zyngier
2016-03-09 10:50 ` [PULL] KVM/ARM updates for 4.6 Paolo Bonzini
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=1457508689-19672-75-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=pbonzini@redhat.com \
--cc=shannon.zhao@linaro.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