c9e3853c04
24448-x86-pt-irq-leak.patch - Upstream patches from Jan 24261-x86-cpuidle-Westmere-EX.patch 24417-amd-erratum-573.patch 24429-mceinj-tool.patch 24447-x86-TXT-INIT-SIPI-delay.patch ioemu-9868-MSI-X.patch - bnc#732884 - remove private runlevel 4 from init scripts xen.no-default-runlevel-4.patch - bnc#727515 - Fragmented packets hang network boot of HVM guest ipxe-gcc45-warnings.patch ipxe-ipv4-fragment.patch ipxe-enable-nics.patch - fate#310510 - fix xenpaging update xenpaging.autostart.patch, make changes with mem-swap-target permanent update xenpaging.doc.patch, mention issues with live migration - fate#310510 - fix xenpaging add xenpaging.evict_mmap_readonly.patch update xenpaging.error-handling.patch, reduce debug output - bnc#736824 - Microcode patches for AMD's 15h processors panic the system 24189-x86-p2m-pod-locking.patch 24412-x86-AMD-errata-model-shift.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=164
108 lines
3.3 KiB
Diff
108 lines
3.3 KiB
Diff
# HG changeset patch
|
|
# User Jan Beulich <jbeulich@suse.com>
|
|
# Date 1321459471 0
|
|
# Node ID 644ca5d3ec435f3372ce88a4de86909bd4033819
|
|
# Parent 1cbb3c1dfb3203f5344a6c1c52507b9e75af6742
|
|
x86/emulator: add feature checks for newer instructions
|
|
|
|
Certain instructions were introduced only after the i686 or original
|
|
x86-64 architecture, so we should not try to emulate them if the guest
|
|
is not seeing the respective feature enabled (or, worse, if the
|
|
underlying hardware doesn't support them). This affects fisttp,
|
|
movnti, and cmpxchg16b.
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Signed-off-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
|
|
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
|
|
@@ -955,6 +955,47 @@ in_protmode(
|
|
return !(in_realmode(ctxt, ops) || (ctxt->regs->eflags & EFLG_VM));
|
|
}
|
|
|
|
+#define EAX 0
|
|
+#define ECX 1
|
|
+#define EDX 2
|
|
+#define EBX 3
|
|
+
|
|
+static bool_t vcpu_has(
|
|
+ unsigned int eax,
|
|
+ unsigned int reg,
|
|
+ unsigned int bit,
|
|
+ struct x86_emulate_ctxt *ctxt,
|
|
+ const struct x86_emulate_ops *ops)
|
|
+{
|
|
+ unsigned int ebx = 0, ecx = 0, edx = 0;
|
|
+ int rc;
|
|
+
|
|
+ fail_if(!ops->cpuid);
|
|
+ rc = ops->cpuid(&eax, &ebx, &ecx, &edx, ctxt);
|
|
+ if ( rc == X86EMUL_OKAY )
|
|
+ {
|
|
+ switch ( reg )
|
|
+ {
|
|
+ case EAX: reg = eax; break;
|
|
+ case EBX: reg = ebx; break;
|
|
+ case ECX: reg = ecx; break;
|
|
+ case EDX: reg = edx; break;
|
|
+ default: BUG();
|
|
+ }
|
|
+ if ( !(reg & (1U << bit)) )
|
|
+ rc = ~X86EMUL_OKAY;
|
|
+ }
|
|
+
|
|
+ done:
|
|
+ return rc == X86EMUL_OKAY;
|
|
+}
|
|
+
|
|
+#define vcpu_must_have(leaf, reg, bit) \
|
|
+ generate_exception_if(!vcpu_has(leaf, reg, bit, ctxt, ops), EXC_UD, -1)
|
|
+#define vcpu_must_have_sse2() vcpu_must_have(0x00000001, EDX, 26)
|
|
+#define vcpu_must_have_sse3() vcpu_must_have(0x00000001, ECX, 0)
|
|
+#define vcpu_must_have_cx16() vcpu_must_have(0x00000001, ECX, 13)
|
|
+
|
|
static int
|
|
in_longmode(
|
|
struct x86_emulate_ctxt *ctxt,
|
|
@@ -2738,6 +2779,7 @@ x86_emulate(
|
|
emulate_fpu_insn_memsrc("fildl", src.val);
|
|
break;
|
|
case 1: /* fisttp m32i */
|
|
+ vcpu_must_have_sse3();
|
|
ea.bytes = 4;
|
|
dst = ea;
|
|
dst.type = OP_MEM;
|
|
@@ -2846,6 +2888,7 @@ x86_emulate(
|
|
emulate_fpu_insn_memsrc("fldl", src.val);
|
|
break;
|
|
case 1: /* fisttp m64i */
|
|
+ vcpu_must_have_sse3();
|
|
ea.bytes = 8;
|
|
dst = ea;
|
|
dst.type = OP_MEM;
|
|
@@ -2953,6 +2996,7 @@ x86_emulate(
|
|
emulate_fpu_insn_memsrc("fild", src.val);
|
|
break;
|
|
case 1: /* fisttp m16i */
|
|
+ vcpu_must_have_sse3();
|
|
ea.bytes = 2;
|
|
dst = ea;
|
|
dst.type = OP_MEM;
|
|
@@ -4141,6 +4185,7 @@ x86_emulate(
|
|
|
|
case 0xc3: /* movnti */
|
|
/* Ignore the non-temporal hint for now. */
|
|
+ vcpu_must_have_sse2();
|
|
generate_exception_if(dst.bytes <= 2, EXC_UD, -1);
|
|
dst.val = src.val;
|
|
break;
|
|
@@ -4151,6 +4196,8 @@ x86_emulate(
|
|
|
|
generate_exception_if((modrm_reg & 7) != 1, EXC_UD, -1);
|
|
generate_exception_if(ea.type != OP_MEM, EXC_UD, -1);
|
|
+ if ( op_bytes == 8 )
|
|
+ vcpu_must_have_cx16();
|
|
op_bytes *= 2;
|
|
|
|
/* Get actual old value. */
|