Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de30a2b3 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: irqtrace subsystem, core 



Accurate hard-IRQ-flags and softirq-flags state tracing.

This allows us to attach extra functionality to IRQ flags on/off
events (such as trace-on/off).

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5bdc9b44

arch/powerpc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ void do_softirq(void) 
		local_bh_disable();

		do_softirq_onstack();

		account_system_vtime(current);

		__local_bh_enable();

		_local_bh_enable();

	}



	local_irq_restore(flags);

include/asm-powerpc/irqflags.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * include/asm-powerpc/irqflags.h

 *

 * IRQ flags handling

 *

 * This file gets included from lowlevel asm headers too, to provide

 * wrapped versions of the local_irq_*() APIs, based on the

 * raw_local_irq_*() macros from the lowlevel headers.

 */

#ifndef _ASM_IRQFLAGS_H

#define _ASM_IRQFLAGS_H



/*

 * Get definitions for raw_local_save_flags(x), etc.

 */

#include <asm-powerpc/hw_irq.h>



/*

 * Do the CPU's IRQ-state tracing from assembly code. We call a

 * C function, so save all the C-clobbered registers:

 */

#ifdef CONFIG_TRACE_IRQFLAGS



#error No support on PowerPC yet for CONFIG_TRACE_IRQFLAGS



#else

# define TRACE_IRQS_ON

# define TRACE_IRQS_OFF

#endif



#endif

include/linux/hardirq.h

+23 −3
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ extern void synchronize_irq(unsigned int irq); 
# define synchronize_irq(irq)	barrier()

#endif



#define nmi_enter()		irq_enter()

#define nmi_exit()		sub_preempt_count(HARDIRQ_OFFSET)



struct task_struct;



#ifndef CONFIG_VIRT_CPU_ACCOUNTING
@@ -97,12 +94,35 @@ static inline void account_system_vtime(struct task_struct *tsk) 
}

#endif



/*

 * It is safe to do non-atomic ops on ->hardirq_context,

 * because NMI handlers may not preempt and the ops are

 * always balanced, so the interrupted value of ->hardirq_context

 * will always be restored.

 */

#define irq_enter()					\

	do {						\

		account_system_vtime(current);		\

		add_preempt_count(HARDIRQ_OFFSET);	\

		trace_hardirq_enter();			\

	} while (0)



/*

 * Exit irq context without processing softirqs:

 */

#define __irq_exit()					\

	do {						\

		trace_hardirq_exit();			\

		account_system_vtime(current);		\

		sub_preempt_count(HARDIRQ_OFFSET);	\

	} while (0)



/*

 * Exit irq context and process softirqs if needed:

 */

extern void irq_exit(void);



#define nmi_enter()		irq_enter()

#define nmi_exit()		__irq_exit()



#endif /* LINUX_HARDIRQ_H */

include/linux/init_task.h

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/file.h>

#include <linux/rcupdate.h>

#include <linux/irqflags.h>



#define INIT_FDTABLE \

{							\
@@ -124,6 +125,7 @@ extern struct group_info init_groups; 
	.cpu_timers	= INIT_CPU_TIMERS(tsk.cpu_timers),		\

	.fs_excl	= ATOMIC_INIT(0),				\

	.pi_lock	= SPIN_LOCK_UNLOCKED,				\

	INIT_TRACE_IRQFLAGS						\

}

include/linux/interrupt.h

+5 −6
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/irqreturn.h>

#include <linux/hardirq.h>

#include <linux/sched.h>

#include <linux/irqflags.h>

#include <asm/atomic.h>

#include <asm/ptrace.h>

#include <asm/system.h>
@@ -199,13 +200,11 @@ static inline void __deprecated save_and_cli(unsigned long *x) 
#define save_and_cli(x)	save_and_cli(&x)

#endif /* CONFIG_SMP */



/* SoftIRQ primitives.  */

#define local_bh_disable() \

		do { add_preempt_count(SOFTIRQ_OFFSET); barrier(); } while (0)

#define __local_bh_enable() \

		do { barrier(); sub_preempt_count(SOFTIRQ_OFFSET); } while (0)



extern void local_bh_disable(void);

extern void __local_bh_enable(void);

extern void _local_bh_enable(void);

extern void local_bh_enable(void);

extern void local_bh_enable_ip(unsigned long ip);



/* PLEASE, avoid to allocate new softirqs, if you need not _really_ high

   frequency threaded job scheduling. For almost all the purposes