From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 6 Jan 2017 14:04:22 +0000 (+0100)
Subject: x86emul: support fencing insns
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3046
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7507ab8e7fec22f56bc374f280cda6f9b0388880;p=xen.git

x86emul: support fencing insns

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c
index 5b5c2544d7..5694d09c49 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -5343,8 +5343,27 @@ x86_emulate(
     case X86EMUL_OPC(0x0f, 0xae): case X86EMUL_OPC_66(0x0f, 0xae): /* Grp15 */
         switch ( modrm_reg & 7 )
         {
-        case 7: /* clflush{,opt} */
-            fail_if(modrm_mod == 3);
+        case 5: /* lfence */
+            fail_if(modrm_mod != 3);
+            generate_exception_if(vex.pfx, EXC_UD);
+            vcpu_must_have(sse2);
+            asm volatile ( "lfence" ::: "memory" );
+            break;
+        case 6: /* mfence */
+            fail_if(modrm_mod != 3);
+            generate_exception_if(vex.pfx, EXC_UD);
+            vcpu_must_have(sse2);
+            asm volatile ( "mfence" ::: "memory" );
+            break;
+        case 7:
+            if ( modrm_mod == 3 ) /* sfence */
+            {
+                generate_exception_if(vex.pfx, EXC_UD);
+                vcpu_must_have(sse);
+                asm volatile ( "sfence" ::: "memory" );
+                break;
+            }
+            /* else clflush{,opt} */
             if ( !vex.pfx )
                 vcpu_must_have(clflush);
             else