From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 21/22] arm/arm64: KVM: Use HVC_RESET_VECTORS to reinit HYP mode
Date: Thu, 23 Feb 2017 10:26:56 +0000 [thread overview]
Message-ID: <20170223102657.23100-22-marc.zyngier@arm.com> (raw)
In-Reply-To: <20170223102657.23100-1-marc.zyngier@arm.com>
Instead of trying to compare the value given by __hyp_get_vectors(),
which doesn't offer any real guarantee to be the stub's address, use
HVC_RESET_VECTORS to make sure we're in a sane state to reinstall
KVM across PM events.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/kvm/arm.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 7c3abeb49554..c4be9e0400f2 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -53,7 +53,6 @@ __asm__(".arch_extension virt");
static DEFINE_PER_CPU(unsigned long, kvm_arm_hyp_stack_page);
static kvm_cpu_context_t __percpu *kvm_host_cpu_state;
-static unsigned long hyp_default_vectors;
/* Per-CPU variable containing the currently running vcpu. */
static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
@@ -1105,8 +1104,16 @@ static void cpu_init_hyp_mode(void *dummy)
kvm_arm_init_debug();
}
+static void cpu_hyp_reset(void)
+{
+ if (!is_kernel_in_hyp_mode())
+ __hyp_reset_vectors();
+}
+
static void cpu_hyp_reinit(void)
{
+ cpu_hyp_reset();
+
if (is_kernel_in_hyp_mode()) {
/*
* __cpu_init_stage2() is safe to call even if the PM
@@ -1114,17 +1121,10 @@ static void cpu_hyp_reinit(void)
*/
__cpu_init_stage2();
} else {
- if (__hyp_get_vectors() == hyp_default_vectors)
- cpu_init_hyp_mode(NULL);
+ cpu_init_hyp_mode(NULL);
}
}
-static void cpu_hyp_reset(void)
-{
- if (!is_kernel_in_hyp_mode())
- __hyp_reset_vectors();
-}
-
static void _kvm_arch_hardware_enable(void *discard)
{
if (!__this_cpu_read(kvm_arm_hardware_enabled)) {
@@ -1308,12 +1308,6 @@ static int init_hyp_mode(void)
goto out_err;
/*
- * It is probably enough to obtain the default on one
- * CPU. It's unlikely to be different on the others.
- */
- hyp_default_vectors = __hyp_get_vectors();
-
- /*
* Allocate stack pages for Hypervisor-mode
*/
for_each_possible_cpu(cpu) {
--
2.11.0
next prev parent reply other threads:[~2017-02-23 10:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 10:26 [PATCH v2 00/22] arm/arm64: KVM: Rework the hyp-stub API Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 01/22] arm64: hyp-stub: Implement HVC_RESET_VECTORS stub hypercall Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 02/22] arm64: KVM: " Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 03/22] arm64: KVM: Implement HVC_GET_VECTORS in the init code Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 04/22] arm64: KVM: Allow the main HYP code to use the init hyp stub implementation Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 05/22] arm64: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 06/22] arm64: KVM: Implement HVC_SOFT_RESTART in the init code Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 07/22] ARM: hyp-stub: improve ABI Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 08/22] ARM: soft-reboot into same mode that we entered the kernel Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 09/22] ARM: KVM: Convert KVM to use HVC_GET_VECTORS Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 10/22] ARM: Update cpu_v7_reset documentation Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 11/22] ARM: hyp-stub: Use r1 for the soft-restart address Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 12/22] ARM: Expose the VA/IDMAP offset Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 13/22] ARM: hyp-stub: Implement HVC_RESET_VECTORS stub hypercall Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 14/22] ARM: KVM: " Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 15/22] ARM: KVM: Implement HVC_GET_VECTORS in the init code Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 16/22] ARM: KVM: Allow the main HYP code to use the init hyp stub implementation Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 17/22] ARM: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 18/22] ARM: KVM: Implement HVC_SOFT_RESTART in the init code Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 19/22] arm/arm64: KVM: Use __hyp_reset_vectors() directly Marc Zyngier
2017-02-23 10:26 ` [PATCH v2 20/22] arm/arm64: KVM: Remove kvm_get_idmap_start Marc Zyngier
2017-02-23 10:26 ` Marc Zyngier [this message]
2017-02-23 10:26 ` [PATCH v2 22/22] arm/arm64: Add hyp-stub API documentation Marc Zyngier
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=20170223102657.23100-22-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).