From: James Wang Date: Mon, 23 Sep 2019 12:33:31 +0000 (+0200) Subject: xen/spec-ctrl: Speculative mitigation facilities report wrong status X-Git-Tag: archive/raspbian/4.11.3+24-g14b62ab3e5-1+rpi1^2~55^2~116 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5fd47c57db388d1be961e3282f132bda12e58c1a;p=xen.git 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 Reviewed-by: Andrew Cooper master commit: 2adc580bd59f5c3034fd6ecacd5748678373f17a master date: 2019-07-31 14:53:13 +0100 --- diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index ba1f058f9d..2fe16b423d 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -415,6 +415,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) printk(" Support for VMs: PV:%s%s%s%s%s, HVM:%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" : "", @@ -422,6 +423,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) boot_cpu_has(X86_FEATURE_MD_CLEAR) ? " MD_CLEAR" : "", (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" : "",