diff mbox

[Xen-devel] xen/arm64: Correctly align VFP regs

Message ID 1397130237-2328-1-git-send-email-julien.grall@linaro.org
State Accepted, archived
Headers show

Commit Message

Julien Grall April 10, 2014, 11:43 a.m. UTC
On arm64, VFP instructions requires vfpregs to be 128-byte aligned.

By chance, the field is already correctly aligned. In the case if someone
decides to add a new field before, Xen will receive a data abort as soon as
it saves/restores VFP.

We are safe on arm32 as the only constraint is to be 32-byte aligned.

Reported-by: Chen Baozi <baozich@gmail.com>
Signed-off-by: Julien Grall <julien.grall@linaro.org>

---
    I think this patch is a good candidate for backporting to Xen 4.4
---
 xen/include/asm-arm/arm64/vfp.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ian Campbell April 16, 2014, 4:29 p.m. UTC | #1
On Thu, 2014-04-10 at 12:43 +0100, Julien Grall wrote:
> On arm64, VFP instructions requires vfpregs to be 128-byte aligned.
> 
> By chance, the field is already correctly aligned. In the case if someone
> decides to add a new field before, Xen will receive a data abort as soon as
> it saves/restores VFP.
> 
> We are safe on arm32 as the only constraint is to be 32-byte aligned.
> 
> Reported-by: Chen Baozi <baozich@gmail.com>
> Signed-off-by: Julien Grall <julien.grall@linaro.org>

Acked + applied.

> ---
>     I think this patch is a good candidate for backporting to Xen 4.4

noted
diff mbox

Patch

diff --git a/xen/include/asm-arm/arm64/vfp.h b/xen/include/asm-arm/arm64/vfp.h
index 373f156..6ab5d36 100644
--- a/xen/include/asm-arm/arm64/vfp.h
+++ b/xen/include/asm-arm/arm64/vfp.h
@@ -1,9 +1,12 @@ 
 #ifndef _ARM_ARM64_VFP_H
 #define _ARM_ARM64_VFP_H
 
+/* ARM64 VFP instruction requires fpregs address to be 128-byte aligned */
+#define __vfp_aligned __attribute__((aligned(16)))
+
 struct vfp_state
 {
-    uint64_t fpregs[64];
+    uint64_t fpregs[64] __vfp_aligned;
     uint32_t fpcr;
     uint32_t fpexc32_el2;
     uint32_t fpsr;