From: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
To: xen-devel@lists.xen.org
Cc: ian.campbell@citrix.com, Anup Patel <anup.patel@linaro.org>,
patches@linaro.org, julien.grall@linaro.org, patches@apm.com,
stefano.stabellini@citrix.com,
Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
Subject: [PATCH V2] xen: arm: arm64: Fix memory cloberring issues during VFP save restore.
Date: Fri, 7 Feb 2014 18:27:16 +0530 [thread overview]
Message-ID: <1391777836-12260-1-git-send-email-pranavkumar@linaro.org> (raw)
This patch addresses memory cloberring issue mentioed by Julien Grall
with my earlier patch -
Commit Id: 712eb2e04da2cbcd9908f74ebd47c6df60d6d12f
Discussion related to this fix -
http://www.gossamer-threads.com/lists/xen/devel/316247
V2: Incorporating comments received on V1.
V1: Initial Patch
Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org>
Signed-off-by: Anup Patel <anup.patel@linaro.org>
---
xen/arch/arm/arm64/vfp.c | 68 +++++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c
index c09cf0c..3cd2b1b 100644
--- a/xen/arch/arm/arm64/vfp.c
+++ b/xen/arch/arm/arm64/vfp.c
@@ -8,23 +8,23 @@ void vfp_save_state(struct vcpu *v)
if ( !cpu_has_fp )
return;
- asm volatile("stp q0, q1, [%0, #16 * 0]\n\t"
- "stp q2, q3, [%0, #16 * 2]\n\t"
- "stp q4, q5, [%0, #16 * 4]\n\t"
- "stp q6, q7, [%0, #16 * 6]\n\t"
- "stp q8, q9, [%0, #16 * 8]\n\t"
- "stp q10, q11, [%0, #16 * 10]\n\t"
- "stp q12, q13, [%0, #16 * 12]\n\t"
- "stp q14, q15, [%0, #16 * 14]\n\t"
- "stp q16, q17, [%0, #16 * 16]\n\t"
- "stp q18, q19, [%0, #16 * 18]\n\t"
- "stp q20, q21, [%0, #16 * 20]\n\t"
- "stp q22, q23, [%0, #16 * 22]\n\t"
- "stp q24, q25, [%0, #16 * 24]\n\t"
- "stp q26, q27, [%0, #16 * 26]\n\t"
- "stp q28, q29, [%0, #16 * 28]\n\t"
- "stp q30, q31, [%0, #16 * 30]\n\t"
- :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory");
+ asm volatile("stp q0, q1, [%1, #16 * 0]\n\t"
+ "stp q2, q3, [%1, #16 * 2]\n\t"
+ "stp q4, q5, [%1, #16 * 4]\n\t"
+ "stp q6, q7, [%1, #16 * 6]\n\t"
+ "stp q8, q9, [%1, #16 * 8]\n\t"
+ "stp q10, q11, [%1, #16 * 10]\n\t"
+ "stp q12, q13, [%1, #16 * 12]\n\t"
+ "stp q14, q15, [%1, #16 * 14]\n\t"
+ "stp q16, q17, [%1, #16 * 16]\n\t"
+ "stp q18, q19, [%1, #16 * 18]\n\t"
+ "stp q20, q21, [%1, #16 * 20]\n\t"
+ "stp q22, q23, [%1, #16 * 22]\n\t"
+ "stp q24, q25, [%1, #16 * 24]\n\t"
+ "stp q26, q27, [%1, #16 * 26]\n\t"
+ "stp q28, q29, [%1, #16 * 28]\n\t"
+ "stp q30, q31, [%1, #16 * 30]\n\t"
+ : "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs));
v->arch.vfp.fpsr = READ_SYSREG32(FPSR);
v->arch.vfp.fpcr = READ_SYSREG32(FPCR);
@@ -36,23 +36,23 @@ void vfp_restore_state(struct vcpu *v)
if ( !cpu_has_fp )
return;
- asm volatile("ldp q0, q1, [%0, #16 * 0]\n\t"
- "ldp q2, q3, [%0, #16 * 2]\n\t"
- "ldp q4, q5, [%0, #16 * 4]\n\t"
- "ldp q6, q7, [%0, #16 * 6]\n\t"
- "ldp q8, q9, [%0, #16 * 8]\n\t"
- "ldp q10, q11, [%0, #16 * 10]\n\t"
- "ldp q12, q13, [%0, #16 * 12]\n\t"
- "ldp q14, q15, [%0, #16 * 14]\n\t"
- "ldp q16, q17, [%0, #16 * 16]\n\t"
- "ldp q18, q19, [%0, #16 * 18]\n\t"
- "ldp q20, q21, [%0, #16 * 20]\n\t"
- "ldp q22, q23, [%0, #16 * 22]\n\t"
- "ldp q24, q25, [%0, #16 * 24]\n\t"
- "ldp q26, q27, [%0, #16 * 26]\n\t"
- "ldp q28, q29, [%0, #16 * 28]\n\t"
- "ldp q30, q31, [%0, #16 * 30]\n\t"
- :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory");
+ asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t"
+ "ldp q2, q3, [%1, #16 * 2]\n\t"
+ "ldp q4, q5, [%1, #16 * 4]\n\t"
+ "ldp q6, q7, [%1, #16 * 6]\n\t"
+ "ldp q8, q9, [%1, #16 * 8]\n\t"
+ "ldp q10, q11, [%1, #16 * 10]\n\t"
+ "ldp q12, q13, [%1, #16 * 12]\n\t"
+ "ldp q14, q15, [%1, #16 * 14]\n\t"
+ "ldp q16, q17, [%1, #16 * 16]\n\t"
+ "ldp q18, q19, [%1, #16 * 18]\n\t"
+ "ldp q20, q21, [%1, #16 * 20]\n\t"
+ "ldp q22, q23, [%1, #16 * 22]\n\t"
+ "ldp q24, q25, [%1, #16 * 24]\n\t"
+ "ldp q26, q27, [%1, #16 * 26]\n\t"
+ "ldp q28, q29, [%1, #16 * 28]\n\t"
+ "ldp q30, q31, [%1, #16 * 30]\n\t"
+ : : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs));
WRITE_SYSREG32(v->arch.vfp.fpsr, FPSR);
WRITE_SYSREG32(v->arch.vfp.fpcr, FPCR);
--
1.7.9.5
next reply other threads:[~2014-02-07 12:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-07 12:57 Pranavkumar Sawargaonkar [this message]
2014-02-07 13:25 ` [PATCH V2] xen: arm: arm64: Fix memory cloberring issues during VFP save restore Julien Grall
2014-02-11 13:08 ` Ian Campbell
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=1391777836-12260-1-git-send-email-pranavkumar@linaro.org \
--to=pranavkumar@linaro.org \
--cc=anup.patel@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=julien.grall@linaro.org \
--cc=patches@apm.com \
--cc=patches@linaro.org \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
/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;
as well as URLs for NNTP newsgroup(s).