A bunch of renames
Subsystems (3)
Peter Zijlstra
maintainercover A bunch of renames
While going over a lot of code, we ran into a bunch of confusingly named functions. These 4 patches try and fix some of that.
Peter Zijlstra
maintainerPATCH 1/4 Rename ___preempt_schedule
Because moar '_' isn't always moar readable.
git grep -l "___preempt_schedule\(_notrace\)*" | while read file; do
sed -ie 's/___preempt_schedule\(_notrace\)*/preempt_schedule\1_thunk/g' $file;
done
--- arch/x86/entry/thunk_32.S | 8 ++++---- arch/x86/entry/thunk_64.S | 8 ++++---- arch/x86/include/asm/preempt.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)
arch/x86/entry/thunk_32.S +4 -4
@@ -35,9 +35,9 @@ SYM_CODE_END(\name) #endif #ifdef CONFIG_PREEMPTION - THUNK ___preempt_schedule, preempt_schedule - THUNK ___preempt_schedule_notrace, preempt_schedule_notrace - EXPORT_SYMBOL(___preempt_schedule) - EXPORT_SYMBOL(___preempt_schedule_notrace) + THUNK preempt_schedule_thunk, preempt_schedule + THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace + EXPORT_SYMBOL(preempt_schedule_thunk) + EXPORT_SYMBOL(preempt_schedule_notrace_thunk) #endif
arch/x86/entry/thunk_64.S +4 -4
@@ -47,10 +47,10 @@ SYM_FUNC_END(\name) #endif #ifdef CONFIG_PREEMPTION - THUNK ___preempt_schedule, preempt_schedule - THUNK ___preempt_schedule_notrace, preempt_schedule_notrace - EXPORT_SYMBOL(___preempt_schedule) - EXPORT_SYMBOL(___preempt_schedule_notrace) + THUNK preempt_schedule_thunk, preempt_schedule + THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace + EXPORT_SYMBOL(preempt_schedule_thunk) + EXPORT_SYMBOL(preempt_schedule_notrace_thunk) #endif #if defined(CONFIG_TRACE_IRQFLAGS) \
arch/x86/include/asm/preempt.h +4 -4
@@ -103,14 +103,14 @@ static __always_inline bool should_resch }#ifdef CONFIG_PREEMPTION - extern asmlinkage void ___preempt_schedule(void); + extern asmlinkage void preempt_schedule_thunk(void);# define __preempt_schedule () \ - asm volatile ("call ___preempt_schedule" : ASM_CALL_CONSTRAINT) + asm volatile ("call preempt_schedule_thunk" : ASM_CALL_CONSTRAINT) extern asmlinkage void preempt_schedule(void); - extern asmlinkage void ___preempt_schedule_notrace(void); + extern asmlinkage void preempt_schedule_notrace_thunk(void);# define __preempt_schedule_notrace () \ - asm volatile ("call ___preempt_schedule_notrace" : ASM_CALL_CONSTRAINT) + asm volatile ("call preempt_schedule_notrace_thunk" : ASM_CALL_CONSTRAINT) extern asmlinkage void preempt_schedule_notrace(void);#endif
[tip: x86/entry] x86/entry: Rename ___preempt_schedule
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 46db36abc32dfd18041c57d571fe4945fc0057fe Gitweb: https://git.kernel.org/tip/46db36abc32dfd18041c57d571fe4945fc0057fe Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 20 Mar 2020 12:56:39 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:53 +01:00
x86/entry: Rename ___preempt_schedule
Because moar '_' isn't always moar readable.
git grep -l "___preempt_schedule\(_notrace\)*" | while read file; do
sed -ie 's/___preempt_schedule\(_notrace\)*/preempt_schedule\1_thunk/g' $file;
done
--- arch/x86/entry/thunk_32.S | 8 ++++---- arch/x86/entry/thunk_64.S | 8 ++++---- arch/x86/include/asm/preempt.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)
arch/x86/entry/thunk_32.S +4 -4
@@ -35,9 +35,9 @@ SYM_CODE_END(\name) #endif #ifdef CONFIG_PREEMPTION - THUNK ___preempt_schedule, preempt_schedule - THUNK ___preempt_schedule_notrace, preempt_schedule_notrace - EXPORT_SYMBOL(___preempt_schedule) - EXPORT_SYMBOL(___preempt_schedule_notrace) + THUNK preempt_schedule_thunk, preempt_schedule + THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace + EXPORT_SYMBOL(preempt_schedule_thunk) + EXPORT_SYMBOL(preempt_schedule_notrace_thunk) #endif
arch/x86/entry/thunk_64.S +4 -4
@@ -47,10 +47,10 @@ SYM_FUNC_END(\name) #endif #ifdef CONFIG_PREEMPTION - THUNK ___preempt_schedule, preempt_schedule - THUNK ___preempt_schedule_notrace, preempt_schedule_notrace - EXPORT_SYMBOL(___preempt_schedule) - EXPORT_SYMBOL(___preempt_schedule_notrace) + THUNK preempt_schedule_thunk, preempt_schedule + THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace + EXPORT_SYMBOL(preempt_schedule_thunk) + EXPORT_SYMBOL(preempt_schedule_notrace_thunk) #endif #if defined(CONFIG_TRACE_IRQFLAGS) \
arch/x86/include/asm/preempt.h +4 -4
@@ -103,14 +103,14 @@ static __always_inline bool should_resched(int preempt_offset) }#ifdef CONFIG_PREEMPTION - extern asmlinkage void ___preempt_schedule(void); + extern asmlinkage void preempt_schedule_thunk(void);# define __preempt_schedule () \ - asm volatile ("call ___preempt_schedule" : ASM_CALL_CONSTRAINT) + asm volatile ("call preempt_schedule_thunk" : ASM_CALL_CONSTRAINT) extern asmlinkage void preempt_schedule(void); - extern asmlinkage void ___preempt_schedule_notrace(void); + extern asmlinkage void preempt_schedule_notrace_thunk(void);# define __preempt_schedule_notrace () \ - asm volatile ("call ___preempt_schedule_notrace" : ASM_CALL_CONSTRAINT) + asm volatile ("call preempt_schedule_notrace_thunk" : ASM_CALL_CONSTRAINT) extern asmlinkage void preempt_schedule_notrace(void);#endif
Peter Zijlstra
maintainerPATCH 2/4 lockdep: Rename trace_hardirq_{enter,exit}()
In reply to Peter ZijlstraFrom: Thomas Gleixner <[email protected]>
Continue what commit:
d820ac4c2fa8 ("locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]")
started, rename these to avoid confusing them with tracepoints.
--- include/linux/hardirq.h | 8 ++++---- include/linux/irqflags.h | 8 ++++---- kernel/softirq.c | 7 ++++--- tools/include/linux/irqflags.h | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-)
include/linux/hardirq.h +4 -4
@@ -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); \
include/linux/irqflags.h +4 -4
@@ -37,11 +37,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)
@@ -62,8 +62,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
kernel/softirq.c +4 -3
@@ -226,7 +226,7 @@ static inline bool lockdep_softirq_startif (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(blockdep_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 (); }/*
tools/include/linux/irqflags.h +2 -2
@@ -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
[tip: x86/entry] lockdep: Rename trace_hardirq_{enter,exit}()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 2502ec37a7b228b34c1e2e89480f98b92f53046a Gitweb: https://git.kernel.org/tip/2502ec37a7b228b34c1e2e89480f98b92f53046a Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 20 Mar 2020 12:56:40 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:53 +01:00
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.
--- include/linux/hardirq.h | 8 ++++---- include/linux/irqflags.h | 8 ++++---- kernel/softirq.c | 7 ++++--- tools/include/linux/irqflags.h | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-)
include/linux/hardirq.h +4 -4
@@ -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); \
include/linux/irqflags.h +4 -4
@@ -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
kernel/softirq.c +4 -3
@@ -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 (); }/*
tools/include/linux/irqflags.h +2 -2
@@ -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
Peter Zijlstra
maintainerPATCH 3/4 lockdep: Rename trace_softirqs_{on,off}()
In reply to Peter ZijlstraContinue what commit:
d820ac4c2fa8 ("locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]")
started, rename these to avoid confusing them with tracepoints.
git grep -l "trace_softirqs_\(on\|off\)" | while read file; do
sed -ie 's/trace_softirqs_\(on\|off\)/lockdep_softirqs_\1/g' $file;
done
--- include/linux/irqflags.h | 10 +++++----- kernel/locking/lockdep.c | 4 ++-- kernel/softirq.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-)
include/linux/irqflags.h +5 -5
@@ -15,15 +15,15 @@#include <linux/typecheck.h> #include <asm/irqflags.h> -/* Currently trace_softirqs_on/off is used only by lockdep */ +/* Currently lockdep_softirqs_on/off is used only by lockdep */ #ifdef CONFIG_PROVE_LOCKING -extern void trace_softirqs_on (unsigned long ip); -extern void trace_softirqs_off (unsigned long ip); +extern void lockdep_softirqs_on (unsigned long ip); +extern void lockdep_softirqs_off (unsigned long ip);extern void lockdep_hardirqs_on (unsigned long ip);extern void lockdep_hardirqs_off (unsigned long ip);#else -static inline void trace_softirqs_on (unsigned long ip) { } -static inline void trace_softirqs_off (unsigned long ip) { } +static inline void lockdep_softirqs_on (unsigned long ip) { } +static inline void lockdep_softirqs_off (unsigned long ip) { }static inline void lockdep_hardirqs_on (unsigned long ip) { }static inline void lockdep_hardirqs_off (unsigned long ip) { }#endif
kernel/locking/lockdep.c +2 -2
@@ -3703,7 +3703,7 @@ NOKPROBE_SYMBOL(lockdep_hardirqs_off);/* * Softirqs will be enabled: */ -void trace_softirqs_on (unsigned long ip) +void lockdep_softirqs_on (unsigned long ip) {struct task_struct *curr = current;
@@ -3743,7 +3743,7 @@ void trace_softirqs_on(unsigned long ip)/* * Softirqs were disabled: */ -void trace_softirqs_off (unsigned long ip) +void lockdep_softirqs_off (unsigned long ip) {struct task_struct *curr = current;
kernel/softirq.c +3 -3
@@ -126,7 +126,7 @@ void __local_bh_disable_ip(unsigned long* Were softirqs turned off above: */ if (softirq_count () == (cnt &SOFTIRQ_MASK )) -trace_softirqs_off (ip); +lockdep_softirqs_off (ip);raw_local_irq_restore (flags);if (preempt_count () == cnt) {
@@ -147,7 +147,7 @@ static void __local_bh_enable(unsigned itrace_preempt_on (CALLER_ADDR0 ,get_lock_parent_ip ());if (softirq_count () == (cnt &SOFTIRQ_MASK )) -trace_softirqs_on (_RET_IP_); +lockdep_softirqs_on (_RET_IP_);__preempt_count_sub (cnt); }
@@ -174,7 +174,7 @@ void __local_bh_enable_ip(unsigned long* Are softirqs going to be turned on now: */ if (softirq_count () ==SOFTIRQ_DISABLE_OFFSET ) -trace_softirqs_on (ip); +lockdep_softirqs_on (ip);/* * Keep preemption disabled until we are done with * softirq processing:
[tip: x86/entry] lockdep: Rename trace_softirqs_{on,off}()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 0d38453c85b426e47375346812d2271680c47988 Gitweb: https://git.kernel.org/tip/0d38453c85b426e47375346812d2271680c47988 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 20 Mar 2020 12:56:41 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:54 +01:00
lockdep: Rename trace_softirqs_{on,off}()
Continue what commit:
d820ac4c2fa8 ("locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]")
started, rename these to avoid confusing them with tracepoints.
git grep -l "trace_softirqs_\(on\|off\)" | while read file; do
sed -ie 's/trace_softirqs_\(on\|off\)/lockdep_softirqs_\1/g' $file;
done
--- include/linux/irqflags.h | 10 +++++----- kernel/locking/lockdep.c | 4 ++-- kernel/softirq.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-)
include/linux/irqflags.h +5 -5
@@ -15,15 +15,15 @@#include <linux/typecheck.h> #include <asm/irqflags.h> -/* Currently trace_softirqs_on/off is used only by lockdep */ +/* Currently lockdep_softirqs_on/off is used only by lockdep */ #ifdef CONFIG_PROVE_LOCKING -extern void trace_softirqs_on (unsigned long ip); -extern void trace_softirqs_off (unsigned long ip); +extern void lockdep_softirqs_on (unsigned long ip); +extern void lockdep_softirqs_off (unsigned long ip);extern void lockdep_hardirqs_on (unsigned long ip);extern void lockdep_hardirqs_off (unsigned long ip);#else -static inline void trace_softirqs_on (unsigned long ip) { } -static inline void trace_softirqs_off (unsigned long ip) { } +static inline void lockdep_softirqs_on (unsigned long ip) { } +static inline void lockdep_softirqs_off (unsigned long ip) { }static inline void lockdep_hardirqs_on (unsigned long ip) { }static inline void lockdep_hardirqs_off (unsigned long ip) { }#endif
kernel/locking/lockdep.c +2 -2
@@ -3468,7 +3468,7 @@ NOKPROBE_SYMBOL(lockdep_hardirqs_off);/* * Softirqs will be enabled: */ -void trace_softirqs_on (unsigned long ip) +void lockdep_softirqs_on (unsigned long ip) {struct task_struct *curr = current;
@@ -3508,7 +3508,7 @@ void trace_softirqs_on(unsigned long ip)/* * Softirqs were disabled: */ -void trace_softirqs_off (unsigned long ip) +void lockdep_softirqs_off (unsigned long ip) {struct task_struct *curr = current;
kernel/softirq.c +3 -3
@@ -126,7 +126,7 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)* Were softirqs turned off above: */ if (softirq_count () == (cnt &SOFTIRQ_MASK )) -trace_softirqs_off (ip); +lockdep_softirqs_off (ip);raw_local_irq_restore (flags);if (preempt_count () == cnt) {
@@ -147,7 +147,7 @@ static void __local_bh_enable(unsigned int cnt)trace_preempt_on (CALLER_ADDR0 ,get_lock_parent_ip ());if (softirq_count () == (cnt &SOFTIRQ_MASK )) -trace_softirqs_on (_RET_IP_); +lockdep_softirqs_on (_RET_IP_);__preempt_count_sub (cnt); }
@@ -174,7 +174,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)* Are softirqs going to be turned on now: */ if (softirq_count () ==SOFTIRQ_DISABLE_OFFSET ) -trace_softirqs_on (ip); +lockdep_softirqs_on (ip);/* * Keep preemption disabled until we are done with * softirq processing:
Peter Zijlstra
maintainerPATCH 4/4 lockdep: Rename trace_{hard,soft}{irq_context,irqs_enabled}()
In reply to Peter ZijlstraContinue what commit:
d820ac4c2fa8 ("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
--- include/linux/irqflags.h | 16 ++++++++-------- kernel/locking/lockdep.c | 8 ++++---- kernel/softirq.c | 2 +- tools/include/linux/irqflags.h | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-)
include/linux/irqflags.h +8 -8
@@ -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
@@ -3081,10 +3081,10 @@ print_usage_bug(struct task_struct *currpr_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
@@ -224,7 +224,7 @@ static inline bool lockdep_softirq_start {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
@@ -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)
[tip: x86/entry] lockdep: Rename trace_{hard,soft}{irq_context,irqs_enabled}()
The following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: ef996916e78e03d25e56c2d372e5e21fdb471882 Gitweb: https://git.kernel.org/tip/ef996916e78e03d25e56c2d372e5e21fdb471882 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 20 Mar 2020 12:56:42 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 21 Mar 2020 16:03:54 +01:00
lockdep: Rename trace_{hard,soft}{irq_context,irqs_enabled}()
Continue what commit:
d820ac4c2fa8 ("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
--- include/linux/irqflags.h | 16 ++++++++-------- kernel/locking/lockdep.c | 8 ++++---- kernel/softirq.c | 2 +- tools/include/linux/irqflags.h | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-)
include/linux/irqflags.h +8 -8
@@ -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
@@ -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
@@ -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
@@ -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)
Quoted 2 lines · Peter Zijlstra
While going over a lot of code, we ran into a bunch of confusingly named functions. These 4 patches try and fix some of that.
For the lot:
I hadn't realised quite how confusing these were until I read this series!
Will
Quoted 2 lines · Peter Zijlstra
While going over a lot of code, we ran into a bunch of confusingly named functions. These 4 patches try and fix some of that.