From: Marc Zyngier <marc.zyngier@arm.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Christoffer Dall <christoffer.dall@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
kvmarm@lists.cs.columbia.edu
Subject: [PATCH v4 14/23] arm64: KVM: VHE: Make __fpsimd_enabled VHE aware
Date: Thu, 11 Feb 2016 18:39:55 +0000 [thread overview]
Message-ID: <1455216004-19499-15-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1455216004-19499-1-git-send-email-marc.zyngier@arm.com>
As non-VHE and VHE have different ways to express the trapping of
FPSIMD registers to EL2, make __fpsimd_enabled a patchable predicate
and provide a VHE implementation.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm64/include/asm/kvm_arm.h | 3 +++
arch/arm64/kvm/hyp/hyp.h | 5 +----
arch/arm64/kvm/hyp/switch.c | 19 +++++++++++++++++++
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index bef6e92..f416714 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -218,4 +218,7 @@
ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \
ECN(BKPT32), ECN(VECTOR32), ECN(BRK64)
+#define CPACR_EL1_FPEN (3 << 20)
+#define CPACR_EL1_TTA (1 << 28)
+
#endif /* __ARM64_KVM_ARM_H__ */
diff --git a/arch/arm64/kvm/hyp/hyp.h b/arch/arm64/kvm/hyp/hyp.h
index 5dfa883..44eaff7 100644
--- a/arch/arm64/kvm/hyp/hyp.h
+++ b/arch/arm64/kvm/hyp/hyp.h
@@ -171,10 +171,7 @@ void __debug_cond_restore_host_state(struct kvm_vcpu *vcpu);
void __fpsimd_save_state(struct user_fpsimd_state *fp_regs);
void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs);
-static inline bool __fpsimd_enabled(void)
-{
- return !(read_sysreg(cptr_el2) & CPTR_EL2_TFP);
-}
+bool __fpsimd_enabled(void);
u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt);
void __noreturn __hyp_do_panic(unsigned long, ...);
diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
index 68f3cba..0d82ae9 100644
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -17,6 +17,25 @@
#include "hyp.h"
+static bool __hyp_text __fpsimd_enabled_nvhe(void)
+{
+ return !(read_sysreg(cptr_el2) & CPTR_EL2_TFP);
+}
+
+static bool __hyp_text __fpsimd_enabled_vhe(void)
+{
+ return !!(read_sysreg(cpacr_el1) & CPACR_EL1_FPEN);
+}
+
+static hyp_alternate_select(__fpsimd_is_enabled,
+ __fpsimd_enabled_nvhe, __fpsimd_enabled_vhe,
+ ARM64_HAS_VIRT_HOST_EXTN);
+
+bool __hyp_text __fpsimd_enabled(void)
+{
+ return __fpsimd_is_enabled()();
+}
+
static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)
{
u64 val;
--
2.1.4
next prev parent reply other threads:[~2016-02-11 18:44 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 18:39 [PATCH v4 00/23] arm64: Virtualization Host Extension support Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 01/23] arm/arm64: KVM: Add hook for C-based stage2 init Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 02/23] arm64: KVM: Switch to " Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 03/23] arm/arm64: Add new is_kernel_in_hyp_mode predicate Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 04/23] arm64: Allow the arch timer to use the HYP timer Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 05/23] arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature Marc Zyngier
2016-02-15 16:10 ` Will Deacon
2016-02-11 18:39 ` [PATCH v4 06/23] arm64: KVM: Skip HYP setup when already running in HYP Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 07/23] arm64: KVM: VHE: Patch out use of HVC Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 08/23] arm64: KVM: VHE: Patch out kern_hyp_va Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 09/23] arm64: KVM: VHE: Introduce unified system register accessors Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 10/23] arm64: KVM: VHE: Differenciate host/guest sysreg save/restore Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 11/23] arm64: KVM: VHE: Split save/restore of registers shared between guest and host Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 12/23] arm64: KVM: VHE: Use unified system register accessors Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 13/23] arm64: KVM: VHE: Enable minimal sysreg save/restore Marc Zyngier
2016-02-11 18:39 ` Marc Zyngier [this message]
2016-02-11 18:39 ` [PATCH v4 15/23] arm64: KVM: VHE: Implement VHE activate/deactivate_traps Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 16/23] arm64: KVM: VHE: Use unified sysreg accessors for timer Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 17/23] arm64: KVM: VHE: Add fpsimd enabling on guest access Marc Zyngier
2016-02-11 18:39 ` [PATCH v4 18/23] arm64: KVM: VHE: Add alternative panic handling Marc Zyngier
2016-02-11 18:40 ` [PATCH v4 19/23] arm64: KVM: Move most of the fault decoding to C Marc Zyngier
2016-02-11 18:40 ` [PATCH v4 20/23] arm64: perf: Count EL2 events if the kernel is running in HYP Marc Zyngier
2016-02-15 17:22 ` Will Deacon
2016-02-15 18:23 ` Marc Zyngier
2016-02-15 18:27 ` Will Deacon
2016-02-11 18:40 ` [PATCH v4 21/23] arm64: hw_breakpoint: Allow EL2 breakpoints if " Marc Zyngier
2016-02-15 10:22 ` Catalin Marinas
2016-02-15 17:46 ` Will Deacon
2016-02-15 19:07 ` Will Deacon
2016-02-16 9:55 ` Marc Zyngier
2016-02-17 17:57 ` [PATCH v4.1] arm64: perf: Count EL2 events if the kernel is " Marc Zyngier
2016-02-19 14:30 ` Will Deacon
2016-02-11 18:40 ` [PATCH v4 22/23] arm64: VHE: Add support for running Linux in EL2 mode Marc Zyngier
2016-02-17 17:58 ` [PATCH v4.1] arm64: hw_breakpoint: Allow EL2 breakpoints if running in HYP Marc Zyngier
2016-02-19 14:30 ` Will Deacon
2016-02-11 18:40 ` [PATCH v4 23/23] arm64: Panic when VHE and non VHE CPUs coexist Marc Zyngier
2016-02-15 17:26 ` Will Deacon
2016-02-15 18:14 ` Marc Zyngier
2016-02-11 19:07 ` [PATCH v4 00/23] arm64: Virtualization Host Extension support Christoffer Dall
2016-02-11 19:10 ` Marc Zyngier
2016-02-15 10:23 ` Catalin Marinas
2016-02-15 10:34 ` Marc Zyngier
2016-02-29 17:43 ` Alex Bennée
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=1455216004-19499-15-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=will.deacon@arm.com \
/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
all inboxes | Powered by JetHome®