All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu
Cc: Shannon Zhao <shannon.zhao@linaro.org>
Subject: [PATCH v2 1/9] arm64: KVM: PMU: Refactor pmu_*_el0_disabled
Date: Mon, 27 Mar 2017 17:03:37 +0100	[thread overview]
Message-ID: <20170327160345.12402-2-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170327160345.12402-1-marc.zyngier@arm.com>

There is a lot of duplication in the pmu_*_el0_disabled helpers,
and as we're going to modify them shortly, let's move all the
common stuff in a single function.

No functionnal change.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/kvm/sys_regs.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 0e26f8c2b56f..7e1d673304d5 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -460,35 +460,32 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
 	vcpu_sys_reg(vcpu, PMCR_EL0) = val;
 }
 
-static bool pmu_access_el0_disabled(struct kvm_vcpu *vcpu)
+static bool check_disabled(struct kvm_vcpu *vcpu, u64 flags)
 {
 	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
+	bool cond = (reg & flags) || vcpu_mode_priv(vcpu);
 
-	return !((reg & ARMV8_PMU_USERENR_EN) || vcpu_mode_priv(vcpu));
+	return !cond;
 }
 
-static bool pmu_write_swinc_el0_disabled(struct kvm_vcpu *vcpu)
+static bool pmu_access_el0_disabled(struct kvm_vcpu *vcpu)
 {
-	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_EN);
+}
 
-	return !((reg & (ARMV8_PMU_USERENR_SW | ARMV8_PMU_USERENR_EN))
-		 || vcpu_mode_priv(vcpu));
+static bool pmu_write_swinc_el0_disabled(struct kvm_vcpu *vcpu)
+{
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_SW | ARMV8_PMU_USERENR_EN);
 }
 
 static bool pmu_access_cycle_counter_el0_disabled(struct kvm_vcpu *vcpu)
 {
-	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
-
-	return !((reg & (ARMV8_PMU_USERENR_CR | ARMV8_PMU_USERENR_EN))
-		 || vcpu_mode_priv(vcpu));
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_CR | ARMV8_PMU_USERENR_EN);
 }
 
 static bool pmu_access_event_counter_el0_disabled(struct kvm_vcpu *vcpu)
 {
-	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
-
-	return !((reg & (ARMV8_PMU_USERENR_ER | ARMV8_PMU_USERENR_EN))
-		 || vcpu_mode_priv(vcpu));
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_ER | ARMV8_PMU_USERENR_EN);
 }
 
 static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/9] arm64: KVM: PMU: Refactor pmu_*_el0_disabled
Date: Mon, 27 Mar 2017 17:03:37 +0100	[thread overview]
Message-ID: <20170327160345.12402-2-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170327160345.12402-1-marc.zyngier@arm.com>

There is a lot of duplication in the pmu_*_el0_disabled helpers,
and as we're going to modify them shortly, let's move all the
common stuff in a single function.

No functionnal change.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm64/kvm/sys_regs.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 0e26f8c2b56f..7e1d673304d5 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -460,35 +460,32 @@ static void reset_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
 	vcpu_sys_reg(vcpu, PMCR_EL0) = val;
 }
 
-static bool pmu_access_el0_disabled(struct kvm_vcpu *vcpu)
+static bool check_disabled(struct kvm_vcpu *vcpu, u64 flags)
 {
 	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
+	bool cond = (reg & flags) || vcpu_mode_priv(vcpu);
 
-	return !((reg & ARMV8_PMU_USERENR_EN) || vcpu_mode_priv(vcpu));
+	return !cond;
 }
 
-static bool pmu_write_swinc_el0_disabled(struct kvm_vcpu *vcpu)
+static bool pmu_access_el0_disabled(struct kvm_vcpu *vcpu)
 {
-	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_EN);
+}
 
-	return !((reg & (ARMV8_PMU_USERENR_SW | ARMV8_PMU_USERENR_EN))
-		 || vcpu_mode_priv(vcpu));
+static bool pmu_write_swinc_el0_disabled(struct kvm_vcpu *vcpu)
+{
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_SW | ARMV8_PMU_USERENR_EN);
 }
 
 static bool pmu_access_cycle_counter_el0_disabled(struct kvm_vcpu *vcpu)
 {
-	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
-
-	return !((reg & (ARMV8_PMU_USERENR_CR | ARMV8_PMU_USERENR_EN))
-		 || vcpu_mode_priv(vcpu));
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_CR | ARMV8_PMU_USERENR_EN);
 }
 
 static bool pmu_access_event_counter_el0_disabled(struct kvm_vcpu *vcpu)
 {
-	u64 reg = vcpu_sys_reg(vcpu, PMUSERENR_EL0);
-
-	return !((reg & (ARMV8_PMU_USERENR_ER | ARMV8_PMU_USERENR_EN))
-		 || vcpu_mode_priv(vcpu));
+	return check_disabled(vcpu, ARMV8_PMU_USERENR_ER | ARMV8_PMU_USERENR_EN);
 }
 
 static bool access_pmcr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
-- 
2.11.0

  reply	other threads:[~2017-03-27 16:03 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-27 16:03 [PATCH v2 0/9] arm64: KVM: Fix PMU exception generation Marc Zyngier
2017-03-27 16:03 ` Marc Zyngier
2017-03-27 16:03 ` Marc Zyngier [this message]
2017-03-27 16:03   ` [PATCH v2 1/9] arm64: KVM: PMU: Refactor pmu_*_el0_disabled Marc Zyngier
2017-03-27 17:03   ` Suzuki K Poulose
2017-03-27 17:03     ` Suzuki K Poulose
2017-03-27 17:11     ` Marc Zyngier
2017-03-27 17:11       ` Marc Zyngier
2017-03-28 12:46   ` Christoffer Dall
2017-03-28 12:46     ` Christoffer Dall
2017-03-28 13:21     ` Marc Zyngier
2017-03-28 13:21       ` Marc Zyngier
2017-03-27 16:03 ` [PATCH v2 2/9] arm64: KVM: PMU: Inject UNDEF exception on illegal register access Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:44   ` Christoffer Dall
2017-03-28 12:44     ` Christoffer Dall
2017-03-27 16:03 ` [PATCH v2 3/9] arm64: KVM: PMU: Inject UNDEF on non-privileged accesses Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:45   ` Christoffer Dall
2017-03-28 12:45     ` Christoffer Dall
2017-03-27 16:03 ` [PATCH v2 4/9] arm64: KVM: Make unexpected reads from WO registers inject an undef Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:45   ` Christoffer Dall
2017-03-28 12:45     ` Christoffer Dall
2017-03-27 16:03 ` [PATCH v2 5/9] arm64: KVM: PMU: Inject UNDEF on read access to PMSWINC_EL0 Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:45   ` Christoffer Dall
2017-03-28 12:45     ` Christoffer Dall
2017-03-27 16:03 ` [PATCH v2 6/9] arm64: KVM: Treat sysreg accessors returning false as successful Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:45   ` Christoffer Dall
2017-03-28 12:45     ` Christoffer Dall
2017-03-27 16:03 ` [PATCH v2 7/9] arm64: KVM: Do not corrupt registers on failed 64bit CP read Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:46   ` Christoffer Dall
2017-03-28 12:46     ` Christoffer Dall
2017-03-28 13:24     ` Marc Zyngier
2017-03-28 13:24       ` Marc Zyngier
2017-03-27 16:03 ` [PATCH v2 8/9] arm: KVM: Make unexpected register accesses inject an undef Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:46   ` Christoffer Dall
2017-03-28 12:46     ` Christoffer Dall
2017-03-27 16:03 ` [PATCH v2 9/9] arm: KVM: Treat CP15 accessors returning false as successful Marc Zyngier
2017-03-27 16:03   ` Marc Zyngier
2017-03-28 12:46   ` Christoffer Dall
2017-03-28 12:46     ` Christoffer Dall
2017-03-28 13:37 ` [PATCH v2 0/9] arm64: KVM: Fix PMU exception generation Christoffer Dall
2017-03-28 13:37   ` Christoffer Dall

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=20170327160345.12402-2-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --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 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.