From: Marc Zyngier <marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Cc: Russell King <linux@arm.linux.org.uk>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Catalin Marinas <catalin.marinas@arm.com>, Keerthy <j-keerthy@ti.com> Subject: [PATCH v4 24/28] arm/arm64: KVM: Use HVC_RESET_VECTORS to reinit HYP mode Date: Tue, 21 Mar 2017 19:20:54 +0000 [thread overview] Message-ID: <20170321192058.9300-25-marc.zyngier@arm.com> (raw) In-Reply-To: <20170321192058.9300-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 57dd48d61796..cbd3a3150090 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); @@ -1112,8 +1111,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 @@ -1121,17 +1128,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)) { @@ -1315,12 +1315,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
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 24/28] arm/arm64: KVM: Use HVC_RESET_VECTORS to reinit HYP mode Date: Tue, 21 Mar 2017 19:20:54 +0000 [thread overview] Message-ID: <20170321192058.9300-25-marc.zyngier@arm.com> (raw) In-Reply-To: <20170321192058.9300-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 57dd48d61796..cbd3a3150090 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); @@ -1112,8 +1111,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 @@ -1121,17 +1128,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)) { @@ -1315,12 +1315,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-03-21 19:20 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-21 19:20 [PATCH v4 00/28] arm/arm64: KVM: Rework the hyp-stub API Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 01/28] arm64: hyp-stub: Stop pointlessly clobbering lr Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 02/28] arm64: KVM: Move lr save/restore to do_el2_call Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-23 11:57 ` Marc Zyngier 2017-03-23 11:57 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 03/28] arm64: hyp-stub: Don't save lr in the EL1 code Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 04/28] arm64: hyp-stub: Implement HVC_RESET_VECTORS stub hypercall Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 05/28] arm64: KVM: Implement HVC_RESET_VECTORS stub hypercall in the init code Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-24 14:33 ` Christoffer Dall 2017-03-24 14:33 ` Christoffer Dall 2017-03-24 14:45 ` Marc Zyngier 2017-03-24 14:45 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 06/28] arm64: KVM: Implement HVC_GET_VECTORS " Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 07/28] arm64: KVM: Allow the main HYP code to use the init hyp stub implementation Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-24 14:33 ` Christoffer Dall 2017-03-24 14:33 ` Christoffer Dall 2017-03-24 14:56 ` Marc Zyngier 2017-03-24 14:56 ` Marc Zyngier 2017-04-03 17:28 ` Christoffer Dall 2017-04-03 17:28 ` Christoffer Dall 2017-03-21 19:20 ` [PATCH v4 08/28] arm64: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 09/28] arm64: KVM: Implement HVC_SOFT_RESTART in the init code Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 10/28] ARM: hyp-stub: improve ABI Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 11/28] ARM: soft-reboot into same mode that we entered the kernel Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 12/28] ARM: KVM: Convert KVM to use HVC_GET_VECTORS Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 13/28] ARM: Update cpu_v7_reset documentation Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 14/28] ARM: hyp-stub: Use r1 for the soft-restart address Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 15/28] ARM: Expose the VA/IDMAP offset Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 16/28] ARM: hyp-stub: Implement HVC_RESET_VECTORS stub hypercall Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 17/28] ARM: KVM: Implement HVC_RESET_VECTORS stub hypercall in the init code Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 18/28] ARM: KVM: Implement HVC_GET_VECTORS " Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 19/28] ARM: KVM: Allow the main HYP code to use the init hyp stub implementation Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-24 14:34 ` Christoffer Dall 2017-03-24 14:34 ` Christoffer Dall 2017-03-24 15:01 ` Marc Zyngier 2017-03-24 15:01 ` Marc Zyngier 2017-04-03 17:32 ` Christoffer Dall 2017-04-03 17:32 ` Christoffer Dall 2017-04-03 17:51 ` Marc Zyngier 2017-04-03 17:51 ` Marc Zyngier 2017-04-04 7:36 ` Christoffer Dall 2017-04-04 7:36 ` Christoffer Dall 2017-03-21 19:20 ` [PATCH v4 20/28] ARM: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 21/28] ARM: KVM: Implement HVC_SOFT_RESTART in the init code Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 22/28] arm/arm64: KVM: Use __hyp_reset_vectors() directly Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 23/28] arm/arm64: KVM: Remove kvm_get_idmap_start Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier [this message] 2017-03-21 19:20 ` [PATCH v4 24/28] arm/arm64: KVM: Use HVC_RESET_VECTORS to reinit HYP mode Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 25/28] ARM: decompressor: Remove __hyp_get_vectors usage Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-24 14:34 ` Christoffer Dall 2017-03-24 14:34 ` Christoffer Dall 2017-03-24 15:26 ` Marc Zyngier 2017-03-24 15:26 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 26/28] ARM: hyp-stub/KVM: Kill __hyp_get_vectors Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 27/28] arm64: " Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-21 19:20 ` [PATCH v4 28/28] arm/arm64: Add hyp-stub API documentation Marc Zyngier 2017-03-21 19:20 ` Marc Zyngier 2017-03-24 14:33 ` Christoffer Dall 2017-03-24 14:33 ` Christoffer Dall 2017-03-24 14:42 ` Marc Zyngier 2017-03-24 14:42 ` Marc Zyngier 2017-03-24 15:23 ` Christoffer Dall 2017-03-24 15:23 ` Christoffer Dall 2017-03-24 15:57 ` Marc Zyngier 2017-03-24 15:57 ` Marc Zyngier 2017-03-24 16:03 ` Christoffer Dall 2017-03-24 16:03 ` Christoffer Dall 2017-03-22 13:37 ` [PATCH v4 00/28] arm/arm64: KVM: Rework the hyp-stub API Christoffer Dall 2017-03-22 13:37 ` Christoffer Dall 2017-03-22 16:14 ` Marc Zyngier 2017-03-22 16:14 ` Marc Zyngier 2017-03-22 17:27 ` Christoffer Dall 2017-03-22 17:27 ` Christoffer Dall 2017-03-23 10:53 ` Marc Zyngier 2017-03-23 10:53 ` Marc Zyngier 2017-03-23 14:39 ` Christoffer Dall 2017-03-23 14:39 ` Christoffer Dall 2017-03-23 15:16 ` Marc Zyngier 2017-03-23 15:16 ` Marc Zyngier 2017-03-23 15:45 ` Christoffer Dall 2017-03-23 15:45 ` Christoffer Dall 2017-03-22 16:20 ` Catalin Marinas 2017-03-22 16:20 ` Catalin Marinas 2017-03-24 14:36 ` Christoffer Dall 2017-03-24 14:36 ` 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=20170321192058.9300-25-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=j-keerthy@ti.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux@arm.linux.org.uk \ /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.