* [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
@ 2015-06-19 18:41 ` Mario Smarduch
0 siblings, 0 replies; 8+ messages in thread
From: Mario Smarduch @ 2015-06-19 18:41 UTC (permalink / raw)
To: kvmarm, marc.zyngier, christoffer.dall; +Cc: linux-arm-kernel
After enhancing arm64 FP/SIMD exit handling, 32-bit VFP exit branch is moved
to guest trap handling, keeping exit handling flow for both architectures
consistent.
Also replaced an unused label with a comment.
Signed-off-by: Mario Smarduch <m.smarduch@samsung.com>
---
arch/arm/kvm/interrupts.S | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index 79caf79..16f00f1 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -363,10 +363,6 @@ hyp_hvc:
@ Check syndrome register
mrc p15, 4, r1, c5, c2, 0 @ HSR
lsr r0, r1, #HSR_EC_SHIFT
-#ifdef CONFIG_VFPv3
- cmp r0, #HSR_EC_CP_0_13
- beq switch_to_guest_vfp
-#endif
cmp r0, #HSR_EC_HVC
bne guest_trap @ Not HVC instr.
@@ -380,7 +376,7 @@ hyp_hvc:
cmp r2, #0
bne guest_trap @ Guest called HVC
-host_switch_to_hyp:
+ /* Guest is calling a hyp function, save minimum context branch to it */
pop {r0, r1, r2}
/* Check for __hyp_get_vectors */
@@ -411,6 +407,10 @@ guest_trap:
@ Check if we need the fault information
lsr r1, r1, #HSR_EC_SHIFT
+#ifdef CONFIG_VFPv3
+ cmp r1, #HSR_EC_CP_0_13
+ beq switch_to_guest_vfp
+#endif
cmp r1, #HSR_EC_IABT
mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
beq 2f
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
@ 2015-06-19 18:41 ` Mario Smarduch
0 siblings, 0 replies; 8+ messages in thread
From: Mario Smarduch @ 2015-06-19 18:41 UTC (permalink / raw)
To: linux-arm-kernel
After enhancing arm64 FP/SIMD exit handling, 32-bit VFP exit branch is moved
to guest trap handling, keeping exit handling flow for both architectures
consistent.
Also replaced an unused label with a comment.
Signed-off-by: Mario Smarduch <m.smarduch@samsung.com>
---
arch/arm/kvm/interrupts.S | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index 79caf79..16f00f1 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -363,10 +363,6 @@ hyp_hvc:
@ Check syndrome register
mrc p15, 4, r1, c5, c2, 0 @ HSR
lsr r0, r1, #HSR_EC_SHIFT
-#ifdef CONFIG_VFPv3
- cmp r0, #HSR_EC_CP_0_13
- beq switch_to_guest_vfp
-#endif
cmp r0, #HSR_EC_HVC
bne guest_trap @ Not HVC instr.
@@ -380,7 +376,7 @@ hyp_hvc:
cmp r2, #0
bne guest_trap @ Guest called HVC
-host_switch_to_hyp:
+ /* Guest is calling a hyp function, save minimum context branch to it */
pop {r0, r1, r2}
/* Check for __hyp_get_vectors */
@@ -411,6 +407,10 @@ guest_trap:
@ Check if we need the fault information
lsr r1, r1, #HSR_EC_SHIFT
+#ifdef CONFIG_VFPv3
+ cmp r1, #HSR_EC_CP_0_13
+ beq switch_to_guest_vfp
+#endif
cmp r1, #HSR_EC_IABT
mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
beq 2f
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
2015-06-19 18:41 ` Mario Smarduch
@ 2015-06-22 3:17 ` Mario Smarduch
-1 siblings, 0 replies; 8+ messages in thread
From: Mario Smarduch @ 2015-06-22 3:17 UTC (permalink / raw)
To: Mario Smarduch; +Cc: marc.zyngier, kvmarm, linux-arm-kernel
On 06/19/2015 11:41 AM, Mario Smarduch wrote:
[...]
>
>
> -host_switch_to_hyp:
> + /* Guest is calling a hyp function, save minimum context branch to it */
Hi Marc,
please correct Guest to Host (or word this to your preference).
Somehow wondered off on Friday :)
Thanks,
- Mario
> pop {r0, r1, r2}
>
> /* Check for __hyp_get_vectors */
> @@ -411,6 +407,10 @@ guest_trap:
>
> @ Check if we need the fault information
> lsr r1, r1, #HSR_EC_SHIFT
> +#ifdef CONFIG_VFPv3
> + cmp r1, #HSR_EC_CP_0_13
> + beq switch_to_guest_vfp
> +#endif
> cmp r1, #HSR_EC_IABT
> mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
> beq 2f
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
@ 2015-06-22 3:17 ` Mario Smarduch
0 siblings, 0 replies; 8+ messages in thread
From: Mario Smarduch @ 2015-06-22 3:17 UTC (permalink / raw)
To: linux-arm-kernel
On 06/19/2015 11:41 AM, Mario Smarduch wrote:
[...]
>
>
> -host_switch_to_hyp:
> + /* Guest is calling a hyp function, save minimum context branch to it */
Hi Marc,
please correct Guest to Host (or word this to your preference).
Somehow wondered off on Friday :)
Thanks,
- Mario
> pop {r0, r1, r2}
>
> /* Check for __hyp_get_vectors */
> @@ -411,6 +407,10 @@ guest_trap:
>
> @ Check if we need the fault information
> lsr r1, r1, #HSR_EC_SHIFT
> +#ifdef CONFIG_VFPv3
> + cmp r1, #HSR_EC_CP_0_13
> + beq switch_to_guest_vfp
> +#endif
> cmp r1, #HSR_EC_IABT
> mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
> beq 2f
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
2015-06-19 18:41 ` Mario Smarduch
@ 2015-06-24 15:44 ` Marc Zyngier
-1 siblings, 0 replies; 8+ messages in thread
From: Marc Zyngier @ 2015-06-24 15:44 UTC (permalink / raw)
To: Mario Smarduch, kvmarm, christoffer.dall; +Cc: linux-arm-kernel
Hi Mario,
On 19/06/15 19:41, Mario Smarduch wrote:
> After enhancing arm64 FP/SIMD exit handling, 32-bit VFP exit branch is moved
> to guest trap handling, keeping exit handling flow for both architectures
> consistent.
>
> Also replaced an unused label with a comment.
>
> Signed-off-by: Mario Smarduch <m.smarduch@samsung.com>
> ---
> arch/arm/kvm/interrupts.S | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
> index 79caf79..16f00f1 100644
> --- a/arch/arm/kvm/interrupts.S
> +++ b/arch/arm/kvm/interrupts.S
> @@ -363,10 +363,6 @@ hyp_hvc:
> @ Check syndrome register
> mrc p15, 4, r1, c5, c2, 0 @ HSR
> lsr r0, r1, #HSR_EC_SHIFT
> -#ifdef CONFIG_VFPv3
> - cmp r0, #HSR_EC_CP_0_13
> - beq switch_to_guest_vfp
> -#endif
> cmp r0, #HSR_EC_HVC
> bne guest_trap @ Not HVC instr.
>
> @@ -380,7 +376,7 @@ hyp_hvc:
> cmp r2, #0
> bne guest_trap @ Guest called HVC
>
> -host_switch_to_hyp:
> + /* Guest is calling a hyp function, save minimum context branch to it */
> pop {r0, r1, r2}
>
> /* Check for __hyp_get_vectors */
> @@ -411,6 +407,10 @@ guest_trap:
>
> @ Check if we need the fault information
> lsr r1, r1, #HSR_EC_SHIFT
> +#ifdef CONFIG_VFPv3
> + cmp r1, #HSR_EC_CP_0_13
> + beq switch_to_guest_vfp
> +#endif
> cmp r1, #HSR_EC_IABT
> mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
> beq 2f
>
Two things: I think you can now drop the load_vcpu that is in
switch_to_guest_vfp (you just executed it in guest_trap). You also have
an extra store to VCPU_HSR, but I don't think that's a big deal.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
@ 2015-06-24 15:44 ` Marc Zyngier
0 siblings, 0 replies; 8+ messages in thread
From: Marc Zyngier @ 2015-06-24 15:44 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mario,
On 19/06/15 19:41, Mario Smarduch wrote:
> After enhancing arm64 FP/SIMD exit handling, 32-bit VFP exit branch is moved
> to guest trap handling, keeping exit handling flow for both architectures
> consistent.
>
> Also replaced an unused label with a comment.
>
> Signed-off-by: Mario Smarduch <m.smarduch@samsung.com>
> ---
> arch/arm/kvm/interrupts.S | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
> index 79caf79..16f00f1 100644
> --- a/arch/arm/kvm/interrupts.S
> +++ b/arch/arm/kvm/interrupts.S
> @@ -363,10 +363,6 @@ hyp_hvc:
> @ Check syndrome register
> mrc p15, 4, r1, c5, c2, 0 @ HSR
> lsr r0, r1, #HSR_EC_SHIFT
> -#ifdef CONFIG_VFPv3
> - cmp r0, #HSR_EC_CP_0_13
> - beq switch_to_guest_vfp
> -#endif
> cmp r0, #HSR_EC_HVC
> bne guest_trap @ Not HVC instr.
>
> @@ -380,7 +376,7 @@ hyp_hvc:
> cmp r2, #0
> bne guest_trap @ Guest called HVC
>
> -host_switch_to_hyp:
> + /* Guest is calling a hyp function, save minimum context branch to it */
> pop {r0, r1, r2}
>
> /* Check for __hyp_get_vectors */
> @@ -411,6 +407,10 @@ guest_trap:
>
> @ Check if we need the fault information
> lsr r1, r1, #HSR_EC_SHIFT
> +#ifdef CONFIG_VFPv3
> + cmp r1, #HSR_EC_CP_0_13
> + beq switch_to_guest_vfp
> +#endif
> cmp r1, #HSR_EC_IABT
> mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
> beq 2f
>
Two things: I think you can now drop the load_vcpu that is in
switch_to_guest_vfp (you just executed it in guest_trap). You also have
an extra store to VCPU_HSR, but I don't think that's a big deal.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
2015-06-24 15:44 ` Marc Zyngier
@ 2015-06-25 3:33 ` Mario Smarduch
-1 siblings, 0 replies; 8+ messages in thread
From: Mario Smarduch @ 2015-06-25 3:33 UTC (permalink / raw)
To: Marc Zyngier; +Cc: linux-arm-kernel, kvmarm
On 06/24/2015 08:44 AM, Marc Zyngier wrote:
> Hi Mario,
>
> On 19/06/15 19:41, Mario Smarduch wrote:
>> After enhancing arm64 FP/SIMD exit handling, 32-bit VFP exit branch is moved
>> to guest trap handling, keeping exit handling flow for both architectures
>> consistent.
>>
>> Also replaced an unused label with a comment.
>>
>> Signed-off-by: Mario Smarduch <m.smarduch@samsung.com>
>> ---
>> arch/arm/kvm/interrupts.S | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
>> index 79caf79..16f00f1 100644
>> --- a/arch/arm/kvm/interrupts.S
>> +++ b/arch/arm/kvm/interrupts.S
>> @@ -363,10 +363,6 @@ hyp_hvc:
>> @ Check syndrome register
>> mrc p15, 4, r1, c5, c2, 0 @ HSR
>> lsr r0, r1, #HSR_EC_SHIFT
>> -#ifdef CONFIG_VFPv3
>> - cmp r0, #HSR_EC_CP_0_13
>> - beq switch_to_guest_vfp
>> -#endif
>> cmp r0, #HSR_EC_HVC
>> bne guest_trap @ Not HVC instr.
>>
>> @@ -380,7 +376,7 @@ hyp_hvc:
>> cmp r2, #0
>> bne guest_trap @ Guest called HVC
>>
>> -host_switch_to_hyp:
>> + /* Guest is calling a hyp function, save minimum context branch to it */
>> pop {r0, r1, r2}
>>
>> /* Check for __hyp_get_vectors */
>> @@ -411,6 +407,10 @@ guest_trap:
>>
>> @ Check if we need the fault information
>> lsr r1, r1, #HSR_EC_SHIFT
>> +#ifdef CONFIG_VFPv3
>> + cmp r1, #HSR_EC_CP_0_13
>> + beq switch_to_guest_vfp
>> +#endif
>> cmp r1, #HSR_EC_IABT
>> mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
>> beq 2f
>>
>
> Two things: I think you can now drop the load_vcpu that is in
> switch_to_guest_vfp (you just executed it in guest_trap). You also have
> an extra store to VCPU_HSR, but I don't think that's a big deal.
I left VCPU_HSR as is.
- Mario
>
> Thanks,
>
> M.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64
@ 2015-06-25 3:33 ` Mario Smarduch
0 siblings, 0 replies; 8+ messages in thread
From: Mario Smarduch @ 2015-06-25 3:33 UTC (permalink / raw)
To: linux-arm-kernel
On 06/24/2015 08:44 AM, Marc Zyngier wrote:
> Hi Mario,
>
> On 19/06/15 19:41, Mario Smarduch wrote:
>> After enhancing arm64 FP/SIMD exit handling, 32-bit VFP exit branch is moved
>> to guest trap handling, keeping exit handling flow for both architectures
>> consistent.
>>
>> Also replaced an unused label with a comment.
>>
>> Signed-off-by: Mario Smarduch <m.smarduch@samsung.com>
>> ---
>> arch/arm/kvm/interrupts.S | 10 +++++-----
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
>> index 79caf79..16f00f1 100644
>> --- a/arch/arm/kvm/interrupts.S
>> +++ b/arch/arm/kvm/interrupts.S
>> @@ -363,10 +363,6 @@ hyp_hvc:
>> @ Check syndrome register
>> mrc p15, 4, r1, c5, c2, 0 @ HSR
>> lsr r0, r1, #HSR_EC_SHIFT
>> -#ifdef CONFIG_VFPv3
>> - cmp r0, #HSR_EC_CP_0_13
>> - beq switch_to_guest_vfp
>> -#endif
>> cmp r0, #HSR_EC_HVC
>> bne guest_trap @ Not HVC instr.
>>
>> @@ -380,7 +376,7 @@ hyp_hvc:
>> cmp r2, #0
>> bne guest_trap @ Guest called HVC
>>
>> -host_switch_to_hyp:
>> + /* Guest is calling a hyp function, save minimum context branch to it */
>> pop {r0, r1, r2}
>>
>> /* Check for __hyp_get_vectors */
>> @@ -411,6 +407,10 @@ guest_trap:
>>
>> @ Check if we need the fault information
>> lsr r1, r1, #HSR_EC_SHIFT
>> +#ifdef CONFIG_VFPv3
>> + cmp r1, #HSR_EC_CP_0_13
>> + beq switch_to_guest_vfp
>> +#endif
>> cmp r1, #HSR_EC_IABT
>> mrceq p15, 4, r2, c6, c0, 2 @ HIFAR
>> beq 2f
>>
>
> Two things: I think you can now drop the load_vcpu that is in
> switch_to_guest_vfp (you just executed it in guest_trap). You also have
> an extra store to VCPU_HSR, but I don't think that's a big deal.
I left VCPU_HSR as is.
- Mario
>
> Thanks,
>
> M.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-25 3:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-19 18:41 [RESEND PATCH v2 2/2] arm: KVM: keep arm vfp/simd exit handling consistent with arm64 Mario Smarduch
2015-06-19 18:41 ` Mario Smarduch
2015-06-22 3:17 ` Mario Smarduch
2015-06-22 3:17 ` Mario Smarduch
2015-06-24 15:44 ` Marc Zyngier
2015-06-24 15:44 ` Marc Zyngier
2015-06-25 3:33 ` Mario Smarduch
2015-06-25 3:33 ` Mario Smarduch
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.