[xen stable-4.7] x86: re-enable XPTI/PCID as needed in switch_native()

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen stable-4.7] x86: re-enable XPTI/PCID as needed in switch_native()

patchbot
commit 0d44ee0bc0442df80766aaed490dc874a7088157
Author:     Jan Beulich <[hidden email]>
AuthorDate: Wed May 30 08:37:19 2018 +0200
Commit:     Jan Beulich <[hidden email]>
CommitDate: Wed May 30 08:37:19 2018 +0200

    x86: re-enable XPTI/PCID as needed in switch_native()
   
    Additionally avoid accessing d->arch.pv_domain for PVH domains (running
    in a HVM container).
   
    Reported-by: Sergey Dyasli <[hidden email]>
    Signed-off-by: Jan Beulich <[hidden email]>
    Reviewed-by: Andrew Cooper <[hidden email]>
---
 xen/arch/x86/domain.c | 70 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index ece329714a..3ef7a84892 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -375,6 +375,43 @@ static void release_compat_l4(struct vcpu *v)
     v->arch.guest_table_user = pagetable_null();
 }
 
+static void set_domain_xpti(struct domain *d)
+{
+    if ( is_pv_32bit_domain(d) )
+    {
+        d->arch.pv_domain.xpti = 0;
+        d->arch.pv_domain.pcid = 0;
+    }
+    else
+    {
+        d->arch.pv_domain.xpti = opt_xpti & (is_hardware_domain(d)
+                                             ? OPT_XPTI_DOM0 : OPT_XPTI_DOMU);
+
+        if ( use_invpcid && cpu_has_pcid )
+            switch ( opt_pcid )
+            {
+            case PCID_OFF:
+                break;
+
+            case PCID_ALL:
+                d->arch.pv_domain.pcid = 1;
+                break;
+
+            case PCID_XPTI:
+                d->arch.pv_domain.pcid = d->arch.pv_domain.xpti;
+                break;
+
+            case PCID_NOXPTI:
+                d->arch.pv_domain.pcid = !d->arch.pv_domain.xpti;
+                break;
+
+            default:
+                ASSERT_UNREACHABLE();
+                break;
+            }
+    }
+}
+
 static inline int may_switch_mode(struct domain *d)
 {
     return (!is_hvm_domain(d) && (d->tot_pages == 0));
@@ -403,6 +440,9 @@ int switch_native(struct domain *d)
 
     d->arch.x87_fip_width = cpu_has_fpu_sel ? 0 : 8;
 
+    if ( is_pv_domain(d) )
+        set_domain_xpti(d);
+
     return 0;
 }
 
@@ -439,8 +479,8 @@ int switch_compat(struct domain *d)
 
     d->arch.x87_fip_width = 4;
 
-    d->arch.pv_domain.xpti = 0;
-    d->arch.pv_domain.pcid = 0;
+    if ( is_pv_domain(d) )
+        set_domain_xpti(d);
 
     return 0;
 
@@ -719,31 +759,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags,
         /* 64-bit PV guest by default. */
         d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0;
 
-        d->arch.pv_domain.xpti = opt_xpti & (is_hardware_domain(d)
-                                             ? OPT_XPTI_DOM0 : OPT_XPTI_DOMU);
-
-        if ( !is_pv_32bit_domain(d) && use_invpcid && cpu_has_pcid )
-            switch ( opt_pcid )
-            {
-            case PCID_OFF:
-                break;
-
-            case PCID_ALL:
-                d->arch.pv_domain.pcid = 1;
-                break;
-
-            case PCID_XPTI:
-                d->arch.pv_domain.pcid = d->arch.pv_domain.xpti;
-                break;
-
-            case PCID_NOXPTI:
-                d->arch.pv_domain.pcid = !d->arch.pv_domain.xpti;
-                break;
-
-            default:
-                ASSERT_UNREACHABLE();
-                break;
-            }
+        set_domain_xpti(d);
     }
 
     /* initialize default tsc behavior in case tools don't */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.7

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog