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 9/9] arm: KVM: Treat CP15 accessors returning false as successful
Date: Mon, 27 Mar 2017 17:03:45 +0100	[thread overview]
Message-ID: <20170327160345.12402-10-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170327160345.12402-1-marc.zyngier@arm.com>

Instead of considering that a CP15 accessor has failed when
returning false, let's consider that it is *always* successful
(after all, we won't stand for an incomplete emulation).

The return value now simply indicates whether we should skip
the instruction (because it has now been emulated), or if we
should leave the PC alone if the emulation has injected an
exception.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm/kvm/coproc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 519aac12b365..2c14b69511e9 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -520,15 +520,15 @@ static int emulate_cp15(struct kvm_vcpu *vcpu,
 		if (likely(r->access(vcpu, params, r))) {
 			/* Skip instruction, since it was emulated */
 			kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
-			return 1;
 		}
-		/* If access function fails, it should complain. */
 	} else {
+		/* If access function fails, it should complain. */
 		kvm_err("Unsupported guest CP15 access at: %08lx\n",
 			*vcpu_pc(vcpu));
 		print_cp_instr(params);
+		kvm_inject_undefined(vcpu);
 	}
-	kvm_inject_undefined(vcpu);
+
 	return 1;
 }
 
-- 
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 9/9] arm: KVM: Treat CP15 accessors returning false as successful
Date: Mon, 27 Mar 2017 17:03:45 +0100	[thread overview]
Message-ID: <20170327160345.12402-10-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170327160345.12402-1-marc.zyngier@arm.com>

Instead of considering that a CP15 accessor has failed when
returning false, let's consider that it is *always* successful
(after all, we won't stand for an incomplete emulation).

The return value now simply indicates whether we should skip
the instruction (because it has now been emulated), or if we
should leave the PC alone if the emulation has injected an
exception.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/arm/kvm/coproc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 519aac12b365..2c14b69511e9 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -520,15 +520,15 @@ static int emulate_cp15(struct kvm_vcpu *vcpu,
 		if (likely(r->access(vcpu, params, r))) {
 			/* Skip instruction, since it was emulated */
 			kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
-			return 1;
 		}
-		/* If access function fails, it should complain. */
 	} else {
+		/* If access function fails, it should complain. */
 		kvm_err("Unsupported guest CP15 access at: %08lx\n",
 			*vcpu_pc(vcpu));
 		print_cp_instr(params);
+		kvm_inject_undefined(vcpu);
 	}
-	kvm_inject_undefined(vcpu);
+
 	return 1;
 }
 
-- 
2.11.0

  parent 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 ` [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
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 ` Marc Zyngier [this message]
2017-03-27 16:03   ` [PATCH v2 9/9] arm: KVM: Treat CP15 accessors returning false as successful 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-10-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.