lockdep for v2.6.24-rc1
Peter Zijlstra
maintainerThe following changes since commit 2a397e82c7db18019e408f953dd58dc1963a328c:
Linus Torvalds (1):
Merge git://git.kernel.org/.../bart/ide-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git v2.6.24-rc1-lockdep
Gautham R Shenoy (1):
lockdep: fix a typo in the __lock_acquire comment
Peter Zijlstra (2):
lockdep: fixup irq tracing
sched: fix unconditional irq lock
arch/x86/kernel/kprobes_32.c | 7 +------ arch/x86/kernel/kprobes_64.c | 7 +------ arch/x86/kernel/traps_32.c | 2 ++ arch/x86/kernel/traps_64.c | 2 ++ arch/x86/mm/fault_32.c | 5 +++++ arch/x86/mm/fault_64.c | 5 +++++ include/asm-x86/irqflags_32.h | 21 +++++++++++++++++++++ include/asm-x86/irqflags_64.h | 20 ++++++++++++++++++++ kernel/lockdep.c | 2 +- kernel/sched_debug.c | 5 +++-- 10 files changed, 61 insertions(+), 15 deletions(-)
arch/x86/kernel/kprobes_32.c +1 -6
@@ -564,12 +564,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs)resume_execution (cur, regs, kcb); regs->eflags |= kcb->kprobe_saved_eflags; -#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -if (raw_irqs_disabled_flags (regs->eflags)) -trace_hardirqs_off (); -else -trace_hardirqs_on (); -#endif +trace_hardirqs_fixup_flags (regs->eflags);/*Restore back the original saved kprobes variables and continue. */ if (kcb->kprobe_status ==KPROBE_REENTER ) {
arch/x86/kernel/kprobes_64.c +1 -6
@@ -551,12 +551,7 @@ int __kprobes post_kprobe_handler(struct pt_regs *regs)resume_execution (cur, regs, kcb); regs->eflags |= kcb->kprobe_saved_rflags; -#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -if (raw_irqs_disabled_flags (regs->eflags)) -trace_hardirqs_off (); -else -trace_hardirqs_on (); -#endif +trace_hardirqs_fixup_flags (regs->eflags);/* Restore the original saved kprobes variables and continue. */ if (kcb->kprobe_status ==KPROBE_REENTER ) {
arch/x86/kernel/traps_32.c +2 -0
@@ -789,6 +789,8 @@ void restart_nmi(void)#ifdef CONFIG_KPROBES fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code) { +trace_hardirqs_fixup (); +if (notify_die (DIE_INT3 ,"int3" , regs, error_code,3 ,SIGTRAP ) ==NOTIFY_STOP )return ;
arch/x86/kernel/traps_64.c +2 -0
@@ -807,6 +807,8 @@ asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs)/* runs on IST stack. */ asmlinkage void __kprobes do_int3(struct pt_regs * regs, long error_code) { +trace_hardirqs_fixup (); +if (notify_die (DIE_INT3 ,"int3" , regs, error_code,3 ,SIGTRAP ) ==NOTIFY_STOP ) {return ; }
arch/x86/mm/fault_32.c +5 -0
@@ -303,6 +303,11 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,int write, si_code;int fault; +/* +* We can fault from pretty much anywhere, with unknown IRQ state. +*/ +trace_hardirqs_fixup (); +/* get the address */ address =read_cr2 ();
arch/x86/mm/fault_64.c +5 -0
@@ -304,6 +304,11 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,unsigned long flags;siginfo_t info; +/* +* We can fault from pretty much anywhere, with unknown IRQ state. +*/ +trace_hardirqs_fixup (); + tsk = current; mm = tsk->mm;prefetchw (&mm->mmap_sem);
include/asm-x86/irqflags_32.h +21 -0
@@ -129,6 +129,27 @@ static inline int raw_irqs_disabled(void) return raw_irqs_disabled_flags(flags); } + +/* +* makes the traced hardirq state match with the machine state +* +* should be a rarely used function, only in places where its +* otherwise impossible to know the irq state, like in traps. +*/ +static inline void trace_hardirqs_fixup_flags (unsigned long flags) +{ +if (raw_irqs_disabled_flags (flags)) +trace_hardirqs_off (); +else +trace_hardirqs_on (); +} + +static inline void trace_hardirqs_fixup (void ) +{ +unsigned long flags =__raw_local_save_flags (); + +trace_hardirqs_fixup_flags (flags); +}#endif /* __ASSEMBLY__ */ /*
include/asm-x86/irqflags_64.h +20 -0
@@ -112,6 +112,26 @@ static inline int raw_irqs_disabled(void) }/* +* makes the traced hardirq state match with the machine state +* +* should be a rarely used function, only in places where its +* otherwise impossible to know the irq state, like in traps. +*/ +static inline void trace_hardirqs_fixup_flags (unsigned long flags) +{ +if (raw_irqs_disabled_flags (flags)) +trace_hardirqs_off (); +else +trace_hardirqs_on (); +} + +static inline void trace_hardirqs_fixup (void ) +{ +unsigned long flags =__raw_local_save_flags (); + +trace_hardirqs_fixup_flags (flags); +} +/* * Used in the idle loop; sti takes one instruction cycle * to complete: */
kernel/lockdep.c +1 -1
@@ -2424,7 +2424,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,return 0 ;/* -* Calculate the chain hash: it's the combined has of all the +* Calculate the chain hash: it's the combined hash of all the * lock keys along the dependency chain. We save the hash value * at every step so that we can get the current hash easily * after unlock. The chain hash is then used to cache dependency
kernel/sched_debug.c +3 -2
@@ -80,6 +80,7 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)static void print_rq (struct seq_file *m,struct rq *rq,int rq_cpu) {struct task_struct *g, *p; +unsigned long flags;SEQ_printf (m, "\nrunnable tasks:\n"
@@ -88,7 +89,7 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)"------------------------------------------------------" "----------------------------------------------------\n"); -read_lock_irq (&tasklist_lock); +read_lock_irqsave (&tasklist_lock, flags); do_each_thread(g, p) {if (!p->se.on_rq ||task_cpu (p) != rq_cpu)
@@ -97,7 +98,7 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)print_task (m, rq, p); }while_each_thread (g, p); -read_unlock_irq (&tasklist_lock); +read_unlock_irqrestore (&tasklist_lock, flags); }void print_cfs_rq (struct seq_file *m,int cpu,struct cfs_rq *cfs_rq)