Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / arch / x86 / kernel / step.c

diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index cf4b9dac4a0538d15f47a3c1c41974d2c81a551d..92c20fee6781b5f5d419335e68eee8361b7f960d 100644 (file)
--- a/arch/x86/kernel/step.c
+++ b/arch/x86/kernel/step.c
@@ -5,24 +5,16 @@
 #include <linux/mm.h>
 #include <linux/ptrace.h>
 
-#ifdef CONFIG_X86_32
-static
-#endif
-unsigned long convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs)
+unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs)
 {
        unsigned long addr, seg;
 
-#ifdef CONFIG_X86_64
-       addr = regs->rip;
+       addr = regs->ip;
        seg = regs->cs & 0xffff;
-#else
-       addr = regs->eip;
-       seg = regs->xcs & 0xffff;
-       if (regs->eflags & X86_EFLAGS_VM) {
+       if (v8086_mode(regs)) {
                addr = (addr & 0xffff) + (seg << 4);
                return addr;
        }
-#endif
 
        /*
         * We'll assume that the code segments in the GDT
@@ -60,7 +52,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
 {
        int i, copied;
        unsigned char opcode[15];
-       unsigned long addr = convert_rip_to_linear(child, regs);
+       unsigned long addr = convert_ip_to_linear(child, regs);
 
        copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
        for (i = 0; i < copied; i++) {
@@ -124,11 +116,11 @@ static int enable_single_step(struct task_struct *child)
        /*
         * If TF was already set, don't do anything else
         */
-       if (regs->eflags & X86_EFLAGS_TF)
+       if (regs->flags & X86_EFLAGS_TF)
                return 0;
 
        /* Set TF on the kernel stack.. */
-       regs->eflags |= X86_EFLAGS_TF;
+       regs->flags |= X86_EFLAGS_TF;
 
        /*
         * ..but if TF is changed by the instruction we will trace,
@@ -148,16 +140,15 @@ static int enable_single_step(struct task_struct *child)
  */
 static void write_debugctlmsr(struct task_struct *child, unsigned long val)
 {
+       if (child->thread.debugctlmsr == val)
+               return;
+
        child->thread.debugctlmsr = val;
 
        if (child != current)
                return;
 
-#ifdef CONFIG_X86_64
-       wrmsrl(MSR_IA32_DEBUGCTLMSR, val);
-#else
-       wrmsr(MSR_IA32_DEBUGCTLMSR, val, 0);
-#endif
+       update_debugctlmsr(val);
 }
 
 /*
@@ -174,9 +165,14 @@ static void enable_step(struct task_struct *child, bool block)
         */
        if (enable_single_step(child) && block) {
                set_tsk_thread_flag(child, TIF_DEBUGCTLMSR);
-               write_debugctlmsr(child, DEBUGCTLMSR_BTF);
-       } else if (test_and_clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR)) {
-               write_debugctlmsr(child, 0);
+               write_debugctlmsr(child,
+                                 child->thread.debugctlmsr | DEBUGCTLMSR_BTF);
+       } else {
+               write_debugctlmsr(child,
+                                 child->thread.debugctlmsr & ~DEBUGCTLMSR_BTF);
+
+               if (!child->thread.debugctlmsr)
+                       clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);
        }
 }
 
@@ -195,13 +191,16 @@ void user_disable_single_step(struct task_struct *child)
        /*
         * Make sure block stepping (BTF) is disabled.
         */
-       if (test_and_clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR))
-               write_debugctlmsr(child, 0);
+       write_debugctlmsr(child,
+                         child->thread.debugctlmsr & ~DEBUGCTLMSR_BTF);
+
+       if (!child->thread.debugctlmsr)
+               clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);
 
        /* Always clear TIF_SINGLESTEP... */
        clear_tsk_thread_flag(child, TIF_SINGLESTEP);
 
        /* But touch TF only if it was set by us.. */
        if (test_and_clear_tsk_thread_flag(child, TIF_FORCED_TF))
-               task_pt_regs(child)->eflags &= ~X86_EFLAGS_TF;
+               task_pt_regs(child)->flags &= ~X86_EFLAGS_TF;
 }