Commit ef996916 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

lockdep: Rename trace_{hard,soft}{irq_context,irqs_enabled}() 



Continue what commit:

  d820ac4c ("locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]")

started, rename these to avoid confusing them with tracepoints.

git grep -l "trace_\(soft\|hard\)\(irq_context\|irqs_enabled\)" | while read file;
do
	sed -ie 's/trace_\(soft\|hard\)\(irq_context\|irqs_enabled\)/lockdep_\1\2/g' $file;
done

Reported-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200320115859.178626842@infradead.org
parent 0d38453c

include/linux/irqflags.h

+8 −8
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ 
#ifdef CONFIG_TRACE_IRQFLAGS

  extern void trace_hardirqs_on(void);

  extern void trace_hardirqs_off(void);

# define trace_hardirq_context(p)	((p)->hardirq_context)

# define trace_softirq_context(p)	((p)->softirq_context)

# define trace_hardirqs_enabled(p)	((p)->hardirqs_enabled)

# define trace_softirqs_enabled(p)	((p)->softirqs_enabled)

# define lockdep_hardirq_context(p)	((p)->hardirq_context)

# define lockdep_softirq_context(p)	((p)->softirq_context)

# define lockdep_hardirqs_enabled(p)	((p)->hardirqs_enabled)

# define lockdep_softirqs_enabled(p)	((p)->softirqs_enabled)

# define lockdep_hardirq_enter()		\

do {						\

	current->hardirq_context++;		\
@@ -54,10 +54,10 @@ do { \ 
#else

# define trace_hardirqs_on()		do { } while (0)

# define trace_hardirqs_off()		do { } while (0)

# define trace_hardirq_context(p)	0

# define trace_softirq_context(p)	0

# define trace_hardirqs_enabled(p)	0

# define trace_softirqs_enabled(p)	0

# define lockdep_hardirq_context(p)	0

# define lockdep_softirq_context(p)	0

# define lockdep_hardirqs_enabled(p)	0

# define lockdep_softirqs_enabled(p)	0

# define lockdep_hardirq_enter()	do { } while (0)

# define lockdep_hardirq_exit()		do { } while (0)

# define lockdep_softirq_enter()	do { } while (0)

kernel/locking/lockdep.c

+4 −4
Original line number Diff line number Diff line
@@ -3081,10 +3081,10 @@ print_usage_bug(struct task_struct *curr, struct held_lock *this, 


	pr_warn("%s/%d [HC%u[%lu]:SC%u[%lu]:HE%u:SE%u] takes:\n",

		curr->comm, task_pid_nr(curr),

		trace_hardirq_context(curr), hardirq_count() >> HARDIRQ_SHIFT,

		trace_softirq_context(curr), softirq_count() >> SOFTIRQ_SHIFT,

		trace_hardirqs_enabled(curr),

		trace_softirqs_enabled(curr));

		lockdep_hardirq_context(curr), hardirq_count() >> HARDIRQ_SHIFT,

		lockdep_softirq_context(curr), softirq_count() >> SOFTIRQ_SHIFT,

		lockdep_hardirqs_enabled(curr),

		lockdep_softirqs_enabled(curr));

	print_lock(this);



	pr_warn("{%s} state was registered at:\n", usage_str[prev_bit]);

kernel/softirq.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static inline bool lockdep_softirq_start(void) 
{

	bool in_hardirq = false;



	if (trace_hardirq_context(current)) {

	if (lockdep_hardirq_context(current)) {

		in_hardirq = true;

		lockdep_hardirq_exit();

	}

tools/include/linux/irqflags.h

+4 −4
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
#ifndef _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_

#define _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_



# define trace_hardirq_context(p)	0

# define trace_softirq_context(p)	0

# define trace_hardirqs_enabled(p)	0

# define trace_softirqs_enabled(p)	0

# define lockdep_hardirq_context(p)	0

# define lockdep_softirq_context(p)	0

# define lockdep_hardirqs_enabled(p)	0

# define lockdep_softirqs_enabled(p)	0

# define lockdep_hardirq_enter()	do { } while (0)

# define lockdep_hardirq_exit()		do { } while (0)

# define lockdep_softirq_enter()	do { } while (0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE