lockdep: Rename trace_hardirq_{enter,exit}()

Continue what commit:

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

started, rename these to avoid confusing them with tracepoints.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200320115859.060481361@infradead.org

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index da0af63..7c8b82f 100644 (file)
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -37,7 +37,7 @@ extern void rcu_nmi_exit(void);
        do {                                            \
                account_irq_enter_time(current);        \
                preempt_count_add(HARDIRQ_OFFSET);      \
-               trace_hardirq_enter();                  \
+               lockdep_hardirq_enter();                \
        } while (0)
 
 /*
@@ -50,7 +50,7 @@ extern void irq_enter(void);
  */
 #define __irq_exit()                                   \
        do {                                            \
-               trace_hardirq_exit();                   \
+               lockdep_hardirq_exit();                 \
                account_irq_exit_time(current);         \
                preempt_count_sub(HARDIRQ_OFFSET);      \
        } while (0)
@@ -74,12 +74,12 @@ extern void irq_exit(void);
                BUG_ON(in_nmi());                               \
                preempt_count_add(NMI_OFFSET + HARDIRQ_OFFSET); \
                rcu_nmi_enter();                                \
-               trace_hardirq_enter();                          \
+               lockdep_hardirq_enter();                        \
        } while (0)
 
 #define nmi_exit()                                             \
        do {                                                    \
-               trace_hardirq_exit();                           \
+               lockdep_hardirq_exit();                         \
                rcu_nmi_exit();                                 \
                BUG_ON(!in_nmi());                              \
                preempt_count_sub(NMI_OFFSET + HARDIRQ_OFFSET); \

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 21619c9..7c4e645 100644 (file)
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -35,11 +35,11 @@
 # 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 trace_hardirq_enter()                 \
+# define lockdep_hardirq_enter()               \
 do {                                           \
        current->hardirq_context++;             \
 } while (0)
-# define trace_hardirq_exit()                  \
+# define lockdep_hardirq_exit()                        \
 do {                                           \
        current->hardirq_context--;             \
 } while (0)
@@ -58,8 +58,8 @@ do {                                          \
 # define trace_softirq_context(p)      0
 # define trace_hardirqs_enabled(p)     0
 # define trace_softirqs_enabled(p)     0
-# define trace_hardirq_enter()         do { } while (0)
-# define trace_hardirq_exit()          do { } while (0)
+# define lockdep_hardirq_enter()       do { } while (0)
+# define lockdep_hardirq_exit()                do { } while (0)
 # define lockdep_softirq_enter()       do { } while (0)
 # define lockdep_softirq_exit()                do { } while (0)
 #endif

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 0427a86..b328689 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -226,7 +226,7 @@ static inline bool lockdep_softirq_start(void)
 
        if (trace_hardirq_context(current)) {
                in_hardirq = true;
-               trace_hardirq_exit();
+               lockdep_hardirq_exit();
        }
 
        lockdep_softirq_enter();
@@ -239,7 +239,7 @@ static inline void lockdep_softirq_end(bool in_hardirq)
        lockdep_softirq_exit();
 
        if (in_hardirq)
-               trace_hardirq_enter();
+               lockdep_hardirq_enter();
 }
 #else
 static inline bool lockdep_softirq_start(void) { return false; }
@@ -414,7 +414,8 @@ void irq_exit(void)
 
        tick_irq_exit();
        rcu_irq_exit();
-       trace_hardirq_exit(); /* must be last! */
+        /* must be last! */
+       lockdep_hardirq_exit();
 }
 
 /*

diff --git a/tools/include/linux/irqflags.h b/tools/include/linux/irqflags.h
index e734da3..ced6f64 100644 (file)
--- a/tools/include/linux/irqflags.h
+++ b/tools/include/linux/irqflags.h
@@ -6,8 +6,8 @@
 # define trace_softirq_context(p)      0
 # define trace_hardirqs_enabled(p)     0
 # define trace_softirqs_enabled(p)     0
-# define trace_hardirq_enter()         do { } while (0)
-# define trace_hardirq_exit()          do { } while (0)
+# define lockdep_hardirq_enter()       do { } while (0)
+# define lockdep_hardirq_exit()                do { } while (0)
 # define lockdep_softirq_enter()       do { } while (0)
 # define lockdep_softirq_exit()                do { } while (0)
 # define INIT_TRACE_IRQFLAGS