From e6ca7afcf2ddeb72beade853ccd6fa3332210014 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 20 Feb 2020 11:37:01 +0100 Subject: [PATCH] x86: "spec-ctrl=no-xen" should also disable branch hardening This is controlling Xen behavior alone, after all. Reported-by: Jin Nan Wang Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/spec_ctrl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 20f562902b..aed2c6613a 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -98,8 +98,6 @@ static int __init parse_spec_ctrl(const char *s) if ( opt_pv_l1tf_domu < 0 ) opt_pv_l1tf_domu = 0; - opt_branch_harden = false; - if ( opt_tsx == -1 ) opt_tsx = -3; @@ -114,6 +112,7 @@ static int __init parse_spec_ctrl(const char *s) opt_ibpb = false; opt_ssbd = false; opt_l1d_flush = 0; + opt_branch_harden = false; } else if ( val > 0 ) rc = -EINVAL; -- 2.39.5