[Xen-changelog] [xen stable-4.12] xen/spec-ctrl: Speculative mitigation facilities report wrong status

[patchbot@xxxxxxx]

commit d04466fae19281d35ffcf06f1d7cdd7bb561d902
Author:     James Wang <jnwang@xxxxxxxx>
AuthorDate: Mon Sep 23 14:16:35 2019 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Sep 23 14:16:35 2019 +0200

    xen/spec-ctrl: Speculative mitigation facilities report wrong status
    
    Booting with spec-ctrl=0 results in Xen printing "None MD_CLEAR".
    
      (XEN)   Support for HVM VMs: None MD_CLEAR
      (XEN)   Support for PV VMs: None MD_CLEAR
    
    Add a check about X86_FEATURE_MD_CLEAR to avoid to print "None".
    
    Signed-off-by: James Wang <jnwang@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 2adc580bd59f5c3034fd6ecacd5748678373f17a
    master date: 2019-07-31 14:53:13 +0100
---
 xen/arch/x86/spec_ctrl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
index 49f355cf91..b37d40e643 100644
--- a/xen/arch/x86/spec_ctrl.c
+++ b/xen/arch/x86/spec_ctrl.c
@@ -360,6 +360,7 @@ static void __init print_details(enum ind_thunk thunk, 
uint64_t caps)
     printk("  Support for HVM VMs:%s%s%s%s%s\n",
            (boot_cpu_has(X86_FEATURE_SC_MSR_HVM) ||
             boot_cpu_has(X86_FEATURE_SC_RSB_HVM) ||
+            boot_cpu_has(X86_FEATURE_MD_CLEAR)   ||
             opt_eager_fpu)                           ? ""               : " 
None",
            boot_cpu_has(X86_FEATURE_SC_MSR_HVM)      ? " MSR_SPEC_CTRL" : "",
            boot_cpu_has(X86_FEATURE_SC_RSB_HVM)      ? " RSB"           : "",
@@ -371,6 +372,7 @@ static void __init print_details(enum ind_thunk thunk, 
uint64_t caps)
     printk("  Support for PV VMs:%s%s%s%s%s\n",
            (boot_cpu_has(X86_FEATURE_SC_MSR_PV) ||
             boot_cpu_has(X86_FEATURE_SC_RSB_PV) ||
+            boot_cpu_has(X86_FEATURE_MD_CLEAR)  ||
             opt_eager_fpu)                           ? ""               : " 
None",
            boot_cpu_has(X86_FEATURE_SC_MSR_PV)       ? " MSR_SPEC_CTRL" : "",
            boot_cpu_has(X86_FEATURE_SC_RSB_PV)       ? " RSB"           : "",
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.12

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog