From: Shuai Ruan <shuai.ruan@linux.intel.com>
To: xen-devel@lists.xen.org
Cc: andrew.cooper3@citrix.com, keir@xen.org, jbeulich@suse.com
Subject: [PATCH V7 2/3] x86/xsaves: fix two remained issues
Date: Thu, 31 Mar 2016 16:57:36 +0800 [thread overview]
Message-ID: <1459414657-7558-3-git-send-email-shuai.ruan@linux.intel.com> (raw)
In-Reply-To: <1459414657-7558-1-git-send-email-shuai.ruan@linux.intel.com>
From: Shuai Ruan <shuai.ruan@intel.com>
1. get_xsave_addr() will only be called when
xsave_area_compressed(xsave) is true. So drop the
conditional expression.
2. expand_xsave_states() will memset the area when
get NULL from get_xsave_addr().
Signed-off-by: Shuai Ruan <shuai.ruan@intel.com>
---
xen/arch/x86/xstate.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c
index 8c652bc..f4ea54d 100644
--- a/xen/arch/x86/xstate.c
+++ b/xen/arch/x86/xstate.c
@@ -164,12 +164,8 @@ static void *get_xsave_addr(struct xsave_struct *xsave,
const uint16_t *comp_offsets,
unsigned int xfeature_idx)
{
- if ( !((1ul << xfeature_idx) & xsave->xsave_hdr.xstate_bv) )
- return NULL;
-
- return (void *)xsave + (xsave_area_compressed(xsave) ?
- comp_offsets[xfeature_idx] :
- xstate_offsets[xfeature_idx]);
+ return (1ul << xfeature_idx) & xsave->xsave_hdr.xstate_bv ?
+ (void *)xsave + comp_offsets[xfeature_idx] : NULL;
}
void expand_xsave_states(struct vcpu *v, void *dest, unsigned int size)
@@ -211,6 +207,8 @@ void expand_xsave_states(struct vcpu *v, void *dest, unsigned int size)
ASSERT((xstate_offsets[index] + xstate_sizes[index]) <= size);
memcpy(dest + xstate_offsets[index], src, xstate_sizes[index]);
}
+ else
+ memset(dest + xstate_offsets[index], 0, xstate_sizes[index]);
valid &= ~feature;
}
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-31 8:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 8:57 [PATCH V7 0/3] xsaves bug fix Shuai Ruan
2016-03-31 8:57 ` [PATCH V7 1/3] x86/xsaves: fix overwriting between non-lazy/lazy xsaves Shuai Ruan
2016-04-04 15:51 ` Jan Beulich
2016-04-05 5:30 ` Shuai Ruan
[not found] ` <20160405053023.GA16876@shuai.ruan@linux.intel.com>
2016-04-05 7:17 ` Jan Beulich
2016-04-05 7:29 ` Shuai Ruan
2016-04-25 6:51 ` Jan Beulich
2016-04-29 1:36 ` Shuai Ruan
[not found] ` <20160429013616.GB4359@shuai.ruan@linux.intel.com>
2016-04-29 7:05 ` Jan Beulich
2016-03-31 8:57 ` Shuai Ruan [this message]
2016-04-04 16:03 ` [PATCH V7 2/3] x86/xsaves: fix two remained issues Jan Beulich
2016-03-31 8:57 ` [PATCH V7 3/3] x86/xsaves: ebx may return wrong value using CPUID eax=0xdh, ecx =1 Shuai Ruan
2016-04-05 8:31 ` Jan Beulich
2016-04-06 7:01 ` Shuai Ruan
[not found] ` <20160406070034.GA26357@shuai.ruan@linux.intel.com>
2016-04-07 0:29 ` Jan Beulich
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=1459414657-7558-3-git-send-email-shuai.ruan@linux.intel.com \
--to=shuai.ruan@linux.intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--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).