From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mario Smarduch Subject: [PATCH v6 1/6] arm/arm64: KVM: Introduce armv7 fp/simd vcpu fields and helpers Date: Sat, 26 Dec 2015 13:54:55 -0800 Message-ID: <1451166900-3711-2-git-send-email-m.smarduch@samsung.com> References: <1451166900-3711-1-git-send-email-m.smarduch@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Return-path: In-reply-to: <1451166900-3711-1-git-send-email-m.smarduch@samsung.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org Add helper functions to enable access to fp/smid on guest entry and save host fpexc on vcpu put, check if fp/simd registers are dirty and add new vcpu fields. Signed-off-by: Mario Smarduch --- arch/arm/include/asm/kvm_emulate.h | 42 ++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/kvm_host.h | 6 ++++++ arch/arm64/include/asm/kvm_emulate.h | 8 +++++++ 3 files changed, 56 insertions(+) diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h index 3095df0..d4d9da1 100644 --- a/arch/arm/include/asm/kvm_emulate.h +++ b/arch/arm/include/asm/kvm_emulate.h @@ -24,6 +24,8 @@ #include #include #include +#include +#include "../vfp/vfpinstr.h" unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num); unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu); @@ -255,4 +257,44 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, } } +#ifdef CONFIG_VFPv3 +/* Called from vcpu_load - save fpexc and enable guest access to fp/simd unit */ +static inline void vcpu_trap_vfp_enable(struct kvm_vcpu *vcpu) +{ + u32 fpexc; + + /* Save host fpexc, and enable guest access to fp unit */ + fpexc = fmrx(FPEXC); + vcpu->arch.host_fpexc = fpexc; + fpexc |= FPEXC_EN; + fmxr(FPEXC, fpexc); + + /* Configure HCPTR to trap on tracing and fp/simd access */ + vcpu->arch.hcptr = HCPTR_TTA | HCPTR_TCP(10) | HCPTR_TCP(11); +} + +/* Called from vcpu_put - restore host fpexc */ +static inline void vcpu_restore_host_fpexc(struct kvm_vcpu *vcpu) +{ + fmxr(FPEXC, vcpu->arch.host_fpexc); +} + +/* If trap bits are reset then fp/simd registers are dirty */ +static inline bool vcpu_vfp_isdirty(struct kvm_vcpu *vcpu) +{ + return !(vcpu->arch.hcptr & (HCPTR_TCP(10) | HCPTR_TCP(11))); +} +#else +static inline void vcpu_trap_vfp_enable(struct kvm_vcpu *vcpu) +{ + vcpu->arch.hcptr = HCPTR_TTA; +} + +static inline void vcpu_restore_host_fpexc(struct kvm_vcpu *vcpu) {} +static inline bool vcpu_vfp_isdirty(struct kvm_vcpu *vcpu) +{ + return false; +} +#endif + #endif /* __ARM_KVM_EMULATE_H__ */ diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index f9f2779..d3ef58a 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -105,6 +105,12 @@ struct kvm_vcpu_arch { /* HYP trapping configuration */ u32 hcr; + /* HYP Co-processor fp/simd and trace trapping configuration */ + u32 hcptr; + + /* Save host FPEXC register to later restore on vcpu put */ + u32 host_fpexc; + /* Interrupt related fields */ u32 irq_lines; /* IRQ and FIQ levels */ diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 3066328..ffe8ccf 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -299,4 +299,12 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, return data; /* Leave LE untouched */ } +static inline void vcpu_trap_vfp_enable(struct kvm_vcpu *vcpu) {} +static inline void vcpu_restore_host_fpexc(struct kvm_vcpu *vcpu) {} + +static inline bool vcpu_vfp_isdirty(struct kvm_vcpu *vcpu) +{ + return false; +} + #endif /* __ARM64_KVM_EMULATE_H__ */ -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: m.smarduch@samsung.com (Mario Smarduch) Date: Sat, 26 Dec 2015 13:54:55 -0800 Subject: [PATCH v6 1/6] arm/arm64: KVM: Introduce armv7 fp/simd vcpu fields and helpers In-Reply-To: <1451166900-3711-1-git-send-email-m.smarduch@samsung.com> References: <1451166900-3711-1-git-send-email-m.smarduch@samsung.com> Message-ID: <1451166900-3711-2-git-send-email-m.smarduch@samsung.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Add helper functions to enable access to fp/smid on guest entry and save host fpexc on vcpu put, check if fp/simd registers are dirty and add new vcpu fields. Signed-off-by: Mario Smarduch --- arch/arm/include/asm/kvm_emulate.h | 42 ++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/kvm_host.h | 6 ++++++ arch/arm64/include/asm/kvm_emulate.h | 8 +++++++ 3 files changed, 56 insertions(+) diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h index 3095df0..d4d9da1 100644 --- a/arch/arm/include/asm/kvm_emulate.h +++ b/arch/arm/include/asm/kvm_emulate.h @@ -24,6 +24,8 @@ #include #include #include +#include +#include "../vfp/vfpinstr.h" unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num); unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu); @@ -255,4 +257,44 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, } } +#ifdef CONFIG_VFPv3 +/* Called from vcpu_load - save fpexc and enable guest access to fp/simd unit */ +static inline void vcpu_trap_vfp_enable(struct kvm_vcpu *vcpu) +{ + u32 fpexc; + + /* Save host fpexc, and enable guest access to fp unit */ + fpexc = fmrx(FPEXC); + vcpu->arch.host_fpexc = fpexc; + fpexc |= FPEXC_EN; + fmxr(FPEXC, fpexc); + + /* Configure HCPTR to trap on tracing and fp/simd access */ + vcpu->arch.hcptr = HCPTR_TTA | HCPTR_TCP(10) | HCPTR_TCP(11); +} + +/* Called from vcpu_put - restore host fpexc */ +static inline void vcpu_restore_host_fpexc(struct kvm_vcpu *vcpu) +{ + fmxr(FPEXC, vcpu->arch.host_fpexc); +} + +/* If trap bits are reset then fp/simd registers are dirty */ +static inline bool vcpu_vfp_isdirty(struct kvm_vcpu *vcpu) +{ + return !(vcpu->arch.hcptr & (HCPTR_TCP(10) | HCPTR_TCP(11))); +} +#else +static inline void vcpu_trap_vfp_enable(struct kvm_vcpu *vcpu) +{ + vcpu->arch.hcptr = HCPTR_TTA; +} + +static inline void vcpu_restore_host_fpexc(struct kvm_vcpu *vcpu) {} +static inline bool vcpu_vfp_isdirty(struct kvm_vcpu *vcpu) +{ + return false; +} +#endif + #endif /* __ARM_KVM_EMULATE_H__ */ diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index f9f2779..d3ef58a 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -105,6 +105,12 @@ struct kvm_vcpu_arch { /* HYP trapping configuration */ u32 hcr; + /* HYP Co-processor fp/simd and trace trapping configuration */ + u32 hcptr; + + /* Save host FPEXC register to later restore on vcpu put */ + u32 host_fpexc; + /* Interrupt related fields */ u32 irq_lines; /* IRQ and FIQ levels */ diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 3066328..ffe8ccf 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -299,4 +299,12 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, return data; /* Leave LE untouched */ } +static inline void vcpu_trap_vfp_enable(struct kvm_vcpu *vcpu) {} +static inline void vcpu_restore_host_fpexc(struct kvm_vcpu *vcpu) {} + +static inline bool vcpu_vfp_isdirty(struct kvm_vcpu *vcpu) +{ + return false; +} + #endif /* __ARM64_KVM_EMULATE_H__ */ -- 1.9.1