From: Andrew Jones <drjones@redhat.com> To: Shannon Zhao <zhaoshenglong@huawei.com> Cc: kvmarm@lists.cs.columbia.edu, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, will.deacon@arm.com, wei@redhat.com, cov@codeaurora.org, shannon.zhao@linaro.org, peter.huangpeng@huawei.com, hangaohuai@huawei.com Subject: Re: [PATCH v10 14/21] KVM: ARM64: Add helper to handle PMCR register bits Date: Thu, 28 Jan 2016 20:15:40 +0100 [thread overview] Message-ID: <20160128191540.GE16453@hawk.localdomain> (raw) In-Reply-To: <1453866709-20324-15-git-send-email-zhaoshenglong@huawei.com> On Wed, Jan 27, 2016 at 11:51:42AM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > According to ARMv8 spec, when writing 1 to PMCR.E, all counters are > enabled by PMCNTENSET, while writing 0 to PMCR.E, all counters are > disabled. When writing 1 to PMCR.P, reset all event counters, not > including PMCCNTR, to zero. When writing 1 to PMCR.C, reset PMCCNTR to > zero. > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> > --- > arch/arm64/kvm/sys_regs.c | 1 + > include/kvm/arm_pmu.h | 2 ++ > virt/kvm/arm/pmu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 45 insertions(+) > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index f45c227..eefc60a 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -467,6 +467,7 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, > val &= ~ARMV8_PMCR_MASK; > val |= p->regval & ARMV8_PMCR_MASK; > vcpu_sys_reg(vcpu, PMCR_EL0) = val; > + kvm_pmu_handle_pmcr(vcpu, val); > } else { > /* PMCR.P & PMCR.C are RAZ */ > val = vcpu_sys_reg(vcpu, PMCR_EL0) > diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h > index caa706e..5bed00c 100644 > --- a/include/kvm/arm_pmu.h > +++ b/include/kvm/arm_pmu.h > @@ -42,6 +42,7 @@ 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); > void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val); > +void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val); > void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data, > u64 select_idx); > #else > @@ -62,6 +63,7 @@ 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) {} > static inline void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val) {} > +static inline void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) {} > static inline void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, > u64 data, u64 select_idx) {} > #endif > diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c > index 706c935..d411f3f 100644 > --- a/virt/kvm/arm/pmu.c > +++ b/virt/kvm/arm/pmu.c > @@ -190,6 +190,48 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val) > } > } > > +/** > + * kvm_pmu_handle_pmcr - handle PMCR register > + * @vcpu: The vcpu pointer > + * @val: the value guest writes to PMCR register > + */ > +void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) > +{ > + struct kvm_pmu *pmu = &vcpu->arch.pmu; > + struct kvm_pmc *pmc; > + u64 mask; > + int i; > + > + mask = kvm_pmu_valid_counter_mask(vcpu); > + if (val & ARMV8_PMCR_E) { > + kvm_pmu_enable_counter(vcpu, > + vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask); nit: sort of an ugly indentation. I don't think the vcpu_sys_reg needs to line up with the vcpu. > + } else { > + kvm_pmu_disable_counter(vcpu, mask); > + } > + > + if (val & ARMV8_PMCR_C) { > + pmc = &pmu->pmc[ARMV8_CYCLE_IDX]; > + if (pmc->perf_event) > + local64_set(&pmc->perf_event->count, 0); > + vcpu_sys_reg(vcpu, PMCCNTR_EL0) = 0; > + } > + > + if (val & ARMV8_PMCR_P) { > + for (i = 0; i < ARMV8_CYCLE_IDX; i++) { > + pmc = &pmu->pmc[i]; > + if (pmc->perf_event) > + local64_set(&pmc->perf_event->count, 0); > + vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = 0; > + } > + } The local64_set's surprise me. Patch 9/21 seems to go out of its way to allow the perf_event count to be whatever it happens to be, but then calculate the appropriate base to modify it with when the register is written by the guest. Here we're just simply setting both the perf_event counter and the register to zero. Shouldn't we be going through some perf API for the zeroing of its counter, and then do the same thing as patch 9/21 does to set the register? > + > + if (val & ARMV8_PMCR_LC) { > + pmc = &pmu->pmc[ARMV8_CYCLE_IDX]; > + pmc->bitmask = 0xffffffffffffffffUL; > + } > +} > + > static bool kvm_pmu_counter_is_enabled(struct kvm_vcpu *vcpu, u64 select_idx) > { > return (vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMCR_E) && > -- > 2.0.4 > > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: drjones@redhat.com (Andrew Jones) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v10 14/21] KVM: ARM64: Add helper to handle PMCR register bits Date: Thu, 28 Jan 2016 20:15:40 +0100 [thread overview] Message-ID: <20160128191540.GE16453@hawk.localdomain> (raw) In-Reply-To: <1453866709-20324-15-git-send-email-zhaoshenglong@huawei.com> On Wed, Jan 27, 2016 at 11:51:42AM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > According to ARMv8 spec, when writing 1 to PMCR.E, all counters are > enabled by PMCNTENSET, while writing 0 to PMCR.E, all counters are > disabled. When writing 1 to PMCR.P, reset all event counters, not > including PMCCNTR, to zero. When writing 1 to PMCR.C, reset PMCCNTR to > zero. > > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> > --- > arch/arm64/kvm/sys_regs.c | 1 + > include/kvm/arm_pmu.h | 2 ++ > virt/kvm/arm/pmu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 45 insertions(+) > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index f45c227..eefc60a 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -467,6 +467,7 @@ static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, > val &= ~ARMV8_PMCR_MASK; > val |= p->regval & ARMV8_PMCR_MASK; > vcpu_sys_reg(vcpu, PMCR_EL0) = val; > + kvm_pmu_handle_pmcr(vcpu, val); > } else { > /* PMCR.P & PMCR.C are RAZ */ > val = vcpu_sys_reg(vcpu, PMCR_EL0) > diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h > index caa706e..5bed00c 100644 > --- a/include/kvm/arm_pmu.h > +++ b/include/kvm/arm_pmu.h > @@ -42,6 +42,7 @@ 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); > void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val); > +void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val); > void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data, > u64 select_idx); > #else > @@ -62,6 +63,7 @@ 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) {} > static inline void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val) {} > +static inline void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) {} > static inline void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, > u64 data, u64 select_idx) {} > #endif > diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c > index 706c935..d411f3f 100644 > --- a/virt/kvm/arm/pmu.c > +++ b/virt/kvm/arm/pmu.c > @@ -190,6 +190,48 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val) > } > } > > +/** > + * kvm_pmu_handle_pmcr - handle PMCR register > + * @vcpu: The vcpu pointer > + * @val: the value guest writes to PMCR register > + */ > +void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) > +{ > + struct kvm_pmu *pmu = &vcpu->arch.pmu; > + struct kvm_pmc *pmc; > + u64 mask; > + int i; > + > + mask = kvm_pmu_valid_counter_mask(vcpu); > + if (val & ARMV8_PMCR_E) { > + kvm_pmu_enable_counter(vcpu, > + vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask); nit: sort of an ugly indentation. I don't think the vcpu_sys_reg needs to line up with the vcpu. > + } else { > + kvm_pmu_disable_counter(vcpu, mask); > + } > + > + if (val & ARMV8_PMCR_C) { > + pmc = &pmu->pmc[ARMV8_CYCLE_IDX]; > + if (pmc->perf_event) > + local64_set(&pmc->perf_event->count, 0); > + vcpu_sys_reg(vcpu, PMCCNTR_EL0) = 0; > + } > + > + if (val & ARMV8_PMCR_P) { > + for (i = 0; i < ARMV8_CYCLE_IDX; i++) { > + pmc = &pmu->pmc[i]; > + if (pmc->perf_event) > + local64_set(&pmc->perf_event->count, 0); > + vcpu_sys_reg(vcpu, PMEVCNTR0_EL0 + i) = 0; > + } > + } The local64_set's surprise me. Patch 9/21 seems to go out of its way to allow the perf_event count to be whatever it happens to be, but then calculate the appropriate base to modify it with when the register is written by the guest. Here we're just simply setting both the perf_event counter and the register to zero. Shouldn't we be going through some perf API for the zeroing of its counter, and then do the same thing as patch 9/21 does to set the register? > + > + if (val & ARMV8_PMCR_LC) { > + pmc = &pmu->pmc[ARMV8_CYCLE_IDX]; > + pmc->bitmask = 0xffffffffffffffffUL; > + } > +} > + > static bool kvm_pmu_counter_is_enabled(struct kvm_vcpu *vcpu, u64 select_idx) > { > return (vcpu_sys_reg(vcpu, PMCR_EL0) & ARMV8_PMCR_E) && > -- > 2.0.4 > > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-01-28 19:15 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-27 3:51 [PATCH v10 00/21] KVM: ARM64: Add guest PMU support Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 01/21] ARM64: Move PMU register related defines to asm/pmu.h Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-02-10 10:36 ` Will Deacon 2016-02-10 10:36 ` Will Deacon 2016-01-27 3:51 ` [PATCH v10 02/21] KVM: ARM64: Define PMU data structure for each vcpu Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 03/21] KVM: ARM64: Add offset defines for PMU registers Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 04/21] KVM: ARM64: Add access handler for PMCR register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 15:36 ` Andrew Jones 2016-01-28 15:36 ` Andrew Jones 2016-01-28 20:43 ` Andrew Jones 2016-01-28 20:43 ` Andrew Jones 2016-01-29 2:07 ` Shannon Zhao 2016-01-29 2:07 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 05/21] KVM: ARM64: Add access handler for PMSELR register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 20:10 ` Andrew Jones 2016-01-28 20:10 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 06/21] KVM: ARM64: Add access handler for PMCEID0 and PMCEID1 register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 20:34 ` Andrew Jones 2016-01-28 20:34 ` Andrew Jones 2016-01-29 3:47 ` Shannon Zhao 2016-01-29 3:47 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 07/21] KVM: ARM64: PMU: Add perf event map and introduce perf event creating function Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 16:31 ` Andrew Jones 2016-01-28 16:31 ` Andrew Jones 2016-01-28 16:45 ` Marc Zyngier 2016-01-28 16:45 ` Marc Zyngier 2016-01-28 18:06 ` Will Deacon 2016-01-28 18:06 ` Will Deacon 2016-01-29 6:14 ` Shannon Zhao 2016-01-29 6:14 ` Shannon Zhao 2016-01-29 6:14 ` Shannon Zhao 2016-01-29 6:26 ` Shannon Zhao 2016-01-29 6:26 ` Shannon Zhao 2016-01-29 6:26 ` Shannon Zhao 2016-01-29 10:18 ` Will Deacon 2016-01-29 10:18 ` Will Deacon 2016-01-29 13:11 ` Shannon Zhao 2016-01-29 13:11 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 08/21] KVM: ARM64: Add access handler for event type register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 20:11 ` Andrew Jones 2016-01-28 20:11 ` Andrew Jones 2016-01-29 1:42 ` Shannon Zhao 2016-01-29 1:42 ` Shannon Zhao 2016-01-29 1:42 ` Shannon Zhao 2016-01-29 11:25 ` Andrew Jones 2016-01-29 11:25 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 09/21] KVM: ARM64: Add access handler for event counter register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 10/21] KVM: ARM64: Add access handler for PMCNTENSET and PMCNTENCLR register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 18:08 ` Andrew Jones 2016-01-28 18:08 ` Andrew Jones 2016-01-28 18:12 ` Andrew Jones 2016-01-28 18:12 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 11/21] KVM: ARM64: Add access handler for PMINTENSET and PMINTENCLR register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 18:18 ` Andrew Jones 2016-01-28 18:18 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 12/21] KVM: ARM64: Add access handler for PMOVSSET and PMOVSCLR register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 13/21] KVM: ARM64: Add access handler for PMSWINC register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 18:37 ` Andrew Jones 2016-01-28 18:37 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 14/21] KVM: ARM64: Add helper to handle PMCR register bits Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 19:15 ` Andrew Jones [this message] 2016-01-28 19:15 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 15/21] KVM: ARM64: Add access handler for PMUSERENR register Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 19:58 ` Andrew Jones 2016-01-28 19:58 ` Andrew Jones 2016-01-29 7:37 ` Shannon Zhao 2016-01-29 7:37 ` Shannon Zhao 2016-01-29 11:08 ` Andrew Jones 2016-01-29 11:08 ` Andrew Jones 2016-01-29 13:17 ` Shannon Zhao 2016-01-29 13:17 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 16/21] KVM: ARM64: Add PMU overflow interrupt routing Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 17/21] KVM: ARM64: Reset PMU state when resetting vcpu Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 18/21] KVM: ARM64: Free perf event of PMU when destroying vcpu Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 19/21] KVM: ARM64: Add a new feature bit for PMUv3 Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 20:54 ` Andrew Jones 2016-01-28 20:54 ` Andrew Jones 2016-01-27 3:51 ` [PATCH v10 20/21] KVM: ARM: Introduce per-vcpu kvm device controls Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` [PATCH v10 21/21] KVM: ARM64: Add a new vcpu device control group for PMUv3 Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-27 3:51 ` Shannon Zhao 2016-01-28 21:12 ` Andrew Jones 2016-01-28 21:12 ` Andrew Jones 2016-01-28 21:30 ` [PATCH v10 00/21] KVM: ARM64: Add guest PMU support Andrew Jones 2016-01-28 21:30 ` Andrew Jones
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=20160128191540.GE16453@hawk.localdomain \ --to=drjones@redhat.com \ --cc=christoffer.dall@linaro.org \ --cc=cov@codeaurora.org \ --cc=hangaohuai@huawei.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=peter.huangpeng@huawei.com \ --cc=shannon.zhao@linaro.org \ --cc=wei@redhat.com \ --cc=will.deacon@arm.com \ --cc=zhaoshenglong@huawei.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.