From: Christoffer Dall <cdall@linaro.org>
To: Marc Zyngier <marc.zyngier@arm.com>
Cc: Shannon Zhao <shannon.zhao@linaro.org>,
kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH v2 3/9] arm64: KVM: PMU: Inject UNDEF on non-privileged accesses
Date: Tue, 28 Mar 2017 14:45:01 +0200 [thread overview]
Message-ID: <20170328124501.GC31156@cbox> (raw)
In-Reply-To: <20170327160345.12402-4-marc.zyngier@arm.com>
On Mon, Mar 27, 2017 at 05:03:39PM +0100, Marc Zyngier wrote:
> access_pminten() and access_pmuserenr() can only be accessed when
> the CPU is in a priviledged mode. If it is not, let's inject an
> UNDEF exception.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
> ---
> arch/arm64/kvm/sys_regs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index d98ce9a52291..5e3ce7890b35 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -709,8 +709,10 @@ static bool access_pminten(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> if (!kvm_arm_pmu_v3_ready(vcpu))
> return trap_raz_wi(vcpu, p, r);
>
> - if (!vcpu_mode_priv(vcpu))
> + if (!vcpu_mode_priv(vcpu)) {
> + kvm_inject_undefined(vcpu);
> return false;
> + }
>
> if (p->is_write) {
> u64 val = p->regval & mask;
> @@ -780,8 +782,10 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> return trap_raz_wi(vcpu, p, r);
>
> if (p->is_write) {
> - if (!vcpu_mode_priv(vcpu))
> + if (!vcpu_mode_priv(vcpu)) {
> + kvm_inject_undefined(vcpu);
> return false;
> + }
>
> vcpu_sys_reg(vcpu, PMUSERENR_EL0) = p->regval
> & ARMV8_PMU_USERENR_MASK;
> --
> 2.11.0
>
WARNING: multiple messages have this Message-ID (diff)
From: cdall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/9] arm64: KVM: PMU: Inject UNDEF on non-privileged accesses
Date: Tue, 28 Mar 2017 14:45:01 +0200 [thread overview]
Message-ID: <20170328124501.GC31156@cbox> (raw)
In-Reply-To: <20170327160345.12402-4-marc.zyngier@arm.com>
On Mon, Mar 27, 2017 at 05:03:39PM +0100, Marc Zyngier wrote:
> access_pminten() and access_pmuserenr() can only be accessed when
> the CPU is in a priviledged mode. If it is not, let's inject an
> UNDEF exception.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
> ---
> arch/arm64/kvm/sys_regs.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index d98ce9a52291..5e3ce7890b35 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -709,8 +709,10 @@ static bool access_pminten(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> if (!kvm_arm_pmu_v3_ready(vcpu))
> return trap_raz_wi(vcpu, p, r);
>
> - if (!vcpu_mode_priv(vcpu))
> + if (!vcpu_mode_priv(vcpu)) {
> + kvm_inject_undefined(vcpu);
> return false;
> + }
>
> if (p->is_write) {
> u64 val = p->regval & mask;
> @@ -780,8 +782,10 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
> return trap_raz_wi(vcpu, p, r);
>
> if (p->is_write) {
> - if (!vcpu_mode_priv(vcpu))
> + if (!vcpu_mode_priv(vcpu)) {
> + kvm_inject_undefined(vcpu);
> return false;
> + }
>
> vcpu_sys_reg(vcpu, PMUSERENR_EL0) = p->regval
> & ARMV8_PMU_USERENR_MASK;
> --
> 2.11.0
>
next prev parent reply other threads:[~2017-03-28 12:43 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 ` [PATCH v2 1/9] arm64: KVM: PMU: Refactor pmu_*_el0_disabled Marc Zyngier
2017-03-27 16:03 ` 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 [this message]
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=20170328124501.GC31156@cbox \
--to=cdall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.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 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.