| From d3fe959f81024072068e9ed86b39c2acfd7462a9 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <rkrcmar@redhat.com> |
| Date: Tue, 8 Nov 2016 20:54:16 +0100 |
| Subject: KVM: x86: add Align16 instruction flag |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Radim Krčmář <rkrcmar@redhat.com> |
| |
| commit d3fe959f81024072068e9ed86b39c2acfd7462a9 upstream. |
| |
| Needed for FXSAVE and FXRSTOR. |
| |
| Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kvm/emulate.c | 20 ++++++++++++-------- |
| 1 file changed, 12 insertions(+), 8 deletions(-) |
| |
| --- a/arch/x86/kvm/emulate.c |
| +++ b/arch/x86/kvm/emulate.c |
| @@ -172,6 +172,7 @@ |
| #define NearBranch ((u64)1 << 52) /* Near branches */ |
| #define No16 ((u64)1 << 53) /* No 16 bit operand */ |
| #define IncSP ((u64)1 << 54) /* SP is incremented before ModRM calc */ |
| +#define Aligned16 ((u64)1 << 55) /* Aligned to 16 byte boundary (e.g. FXSAVE) */ |
| |
| #define DstXacc (DstAccLo | SrcAccHi | SrcWrite) |
| |
| @@ -620,21 +621,24 @@ static void set_segment_selector(struct |
| * depending on whether they're AVX encoded or not. |
| * |
| * Also included is CMPXCHG16B which is not a vector instruction, yet it is |
| - * subject to the same check. |
| + * subject to the same check. FXSAVE and FXRSTOR are checked here too as their |
| + * 512 bytes of data must be aligned to a 16 byte boundary. |
| */ |
| -static bool insn_aligned(struct x86_emulate_ctxt *ctxt, unsigned size) |
| +static unsigned insn_alignment(struct x86_emulate_ctxt *ctxt, unsigned size) |
| { |
| if (likely(size < 16)) |
| - return false; |
| + return 1; |
| |
| if (ctxt->d & Aligned) |
| - return true; |
| + return size; |
| else if (ctxt->d & Unaligned) |
| - return false; |
| + return 1; |
| else if (ctxt->d & Avx) |
| - return false; |
| + return 1; |
| + else if (ctxt->d & Aligned16) |
| + return 16; |
| else |
| - return true; |
| + return size; |
| } |
| |
| static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt, |
| @@ -692,7 +696,7 @@ static __always_inline int __linearize(s |
| } |
| break; |
| } |
| - if (insn_aligned(ctxt, size) && ((la & (size - 1)) != 0)) |
| + if (la & (insn_alignment(ctxt, size) - 1)) |
| return emulate_gp(ctxt, 0); |
| return X86EMUL_CONTINUE; |
| bad: |
