x86/bugs: Unify x86_spec_ctrl_{set_guest,restore_host}

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / bugs.c

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 5010f8c769beb4a2762d1809247b4d7ec05b7472..b26ea5a60aaf6764da57ba12d0f37b384a7ccefe 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -150,45 +150,33 @@ u64 x86_spec_ctrl_get_default(void)
 }
 EXPORT_SYMBOL_GPL(x86_spec_ctrl_get_default);
 
-void x86_spec_ctrl_set_guest(u64 guest_spec_ctrl)
+void
+x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest)
 {
-       u64 host = x86_spec_ctrl_base;
+       struct thread_info *ti = current_thread_info();
+       u64 msr, host = x86_spec_ctrl_base;
 
        /* Is MSR_SPEC_CTRL implemented ? */
-       if (!static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL))
-               return;
-
-       /* Intel controls SSB in MSR_SPEC_CTRL */
-       if (static_cpu_has(X86_FEATURE_SPEC_CTRL))
-               host |= ssbd_tif_to_spec_ctrl(current_thread_info()->flags);
-
-       if (host != guest_spec_ctrl)
-               wrmsrl(MSR_IA32_SPEC_CTRL, guest_spec_ctrl);
-}
-EXPORT_SYMBOL_GPL(x86_spec_ctrl_set_guest);
-
-void x86_spec_ctrl_restore_host(u64 guest_spec_ctrl)
-{
-       u64 host = x86_spec_ctrl_base;
-
-       /* Is MSR_SPEC_CTRL implemented ? */
-       if (!static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL))
-               return;
-
-       /* Intel controls SSB in MSR_SPEC_CTRL */
-       if (static_cpu_has(X86_FEATURE_SPEC_CTRL))
-               host |= ssbd_tif_to_spec_ctrl(current_thread_info()->flags);
-
-       if (host != guest_spec_ctrl)
-               wrmsrl(MSR_IA32_SPEC_CTRL, host);
+       if (static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL)) {
+               /* SSBD controlled in MSR_SPEC_CTRL */
+               if (static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD))
+                       host |= ssbd_tif_to_spec_ctrl(ti->flags);
+
+               if (host != guest_spec_ctrl) {
+                       msr = setguest ? guest_spec_ctrl : host;
+                       wrmsrl(MSR_IA32_SPEC_CTRL, msr);
+               }
+       }
 }
-EXPORT_SYMBOL_GPL(x86_spec_ctrl_restore_host);
+EXPORT_SYMBOL_GPL(x86_virt_spec_ctrl);
 
 static void x86_amd_ssb_disable(void)
 {
        u64 msrval = x86_amd_ls_cfg_base | x86_amd_ls_cfg_ssbd_mask;
 
-       if (boot_cpu_has(X86_FEATURE_AMD_SSBD))
+       if (boot_cpu_has(X86_FEATURE_VIRT_SSBD))
+               wrmsrl(MSR_AMD64_VIRT_SPEC_CTRL, SPEC_CTRL_SSBD);
+       else if (boot_cpu_has(X86_FEATURE_LS_CFG_SSBD))
                wrmsrl(MSR_AMD64_LS_CFG, msrval);
 }
 
@@ -539,7 +527,7 @@ static int ssb_prctl_set(struct task_struct *task, unsigned long ctrl)
         * mitigation until it is next scheduled.
         */
        if (task == current && update)
-               speculative_store_bypass_update();
+               speculative_store_bypass_update_current();
 
        return 0;
 }