x86/split_lock: Provide handle_guest_split_lock()

[tomoyo/tomoyo-test1.git] / arch / x86 / kernel / cpu / intel.c

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 9a26e97..bf08d45 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -21,6 +21,7 @@
 #include <asm/elf.h>
 #include <asm/cpu_device_id.h>
 #include <asm/cmdline.h>
+#include <asm/traps.h>
 
 #ifdef CONFIG_X86_64
 #include <linux/topology.h>
@@ -1066,13 +1067,10 @@ static void split_lock_init(void)
        split_lock_verify_msr(sld_state != sld_off);
 }
 
-bool handle_user_split_lock(struct pt_regs *regs, long error_code)
+static void split_lock_warn(unsigned long ip)
 {
-       if ((regs->flags & X86_EFLAGS_AC) || sld_state == sld_fatal)
-               return false;
-
        pr_warn_ratelimited("#AC: %s/%d took a split_lock trap at address: 0x%lx\n",
-                           current->comm, current->pid, regs->ip);
+                           current->comm, current->pid, ip);
 
        /*
         * Disable the split lock detection for this task so it can make
@@ -1081,6 +1079,31 @@ bool handle_user_split_lock(struct pt_regs *regs, long error_code)
         */
        sld_update_msr(false);
        set_tsk_thread_flag(current, TIF_SLD);
+}
+
+bool handle_guest_split_lock(unsigned long ip)
+{
+       if (sld_state == sld_warn) {
+               split_lock_warn(ip);
+               return true;
+       }
+
+       pr_warn_once("#AC: %s/%d %s split_lock trap at address: 0x%lx\n",
+                    current->comm, current->pid,
+                    sld_state == sld_fatal ? "fatal" : "bogus", ip);
+
+       current->thread.error_code = 0;
+       current->thread.trap_nr = X86_TRAP_AC;
+       force_sig_fault(SIGBUS, BUS_ADRALN, NULL);
+       return false;
+}
+EXPORT_SYMBOL_GPL(handle_guest_split_lock);
+
+bool handle_user_split_lock(struct pt_regs *regs, long error_code)
+{
+       if ((regs->flags & X86_EFLAGS_AC) || sld_state == sld_fatal)
+               return false;
+       split_lock_warn(regs->ip);
        return true;
 }