LinuxLists.cc - [patch V4 part 1 10/36] x86/entry: Remove the unused LOCKDEP

2020-05-05 14:28:05

Subject: [patch V4 part 1 10/36] x86/entry: Remove the unused LOCKDEP_SYSEXIT cruft

No users left since two years due to commit 21d375b6b34f ("x86/entry/64:
Remove the SYSCALL64 fast path")

Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/x86/entry/thunk_64.S | 5 -----
arch/x86/include/asm/irqflags.h | 24 ------------------------
2 files changed, 29 deletions(-)

--- a/arch/x86/entry/thunk_64.S
+++ b/arch/x86/entry/thunk_64.S
@@ -42,10 +42,6 @@ SYM_FUNC_END(\name)
THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
#endif

-#ifdef CONFIG_DEBUG_LOCK_ALLOC
- THUNK lockdep_sys_exit_thunk,lockdep_sys_exit
-#endif
-
#ifdef CONFIG_PREEMPTION
THUNK preempt_schedule_thunk, preempt_schedule
THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
@@ -54,7 +50,6 @@ SYM_FUNC_END(\name)
#endif

#if defined(CONFIG_TRACE_IRQFLAGS) \
- || defined(CONFIG_DEBUG_LOCK_ALLOC) \
|| defined(CONFIG_PREEMPTION)
SYM_CODE_START_LOCAL_NOALIGN(.L_restore)
popq %r11
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -180,30 +180,6 @@ static inline int arch_irqs_disabled(voi
# define TRACE_IRQS_ON
# define TRACE_IRQS_OFF
#endif
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_X86_64
-# define LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk
-# define LOCKDEP_SYS_EXIT_IRQ \
- TRACE_IRQS_ON; \
- sti; \
- call lockdep_sys_exit_thunk; \
- cli; \
- TRACE_IRQS_OFF;
-# else
-# define LOCKDEP_SYS_EXIT \
- pushl %eax; \
- pushl %ecx; \
- pushl %edx; \
- call lockdep_sys_exit; \
- popl %edx; \
- popl %ecx; \
- popl %eax;
-# define LOCKDEP_SYS_EXIT_IRQ
-# endif
-#else
-# define LOCKDEP_SYS_EXIT
-# define LOCKDEP_SYS_EXIT_IRQ
-#endif
#endif /* __ASSEMBLY__ */

#endif

2020-05-06 13:57:37

by Alexandre Chartre

[permalink] [raw]

Subject: Re: [patch V4 part 1 10/36] x86/entry: Remove the unused LOCKDEP_SYSEXIT cruft

On 5/5/20 3:16 PM, Thomas Gleixner wrote:
> No users left since two years due to commit 21d375b6b34f ("x86/entry/64:
> Remove the SYSCALL64 fast path")
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> ---
> arch/x86/entry/thunk_64.S | 5 -----
> arch/x86/include/asm/irqflags.h | 24 ------------------------
> 2 files changed, 29 deletions(-)

Reviewed-by: Alexandre Chartre <[email protected]>

alex.

> --- a/arch/x86/entry/thunk_64.S
> +++ b/arch/x86/entry/thunk_64.S
> @@ -42,10 +42,6 @@ SYM_FUNC_END(\name)
> THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
> #endif
>
> -#ifdef CONFIG_DEBUG_LOCK_ALLOC
> - THUNK lockdep_sys_exit_thunk,lockdep_sys_exit
> -#endif
> -
> #ifdef CONFIG_PREEMPTION
> THUNK preempt_schedule_thunk, preempt_schedule
> THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
> @@ -54,7 +50,6 @@ SYM_FUNC_END(\name)
> #endif
>
> #if defined(CONFIG_TRACE_IRQFLAGS) \
> - || defined(CONFIG_DEBUG_LOCK_ALLOC) \
> || defined(CONFIG_PREEMPTION)
> SYM_CODE_START_LOCAL_NOALIGN(.L_restore)
> popq %r11
> --- a/arch/x86/include/asm/irqflags.h
> +++ b/arch/x86/include/asm/irqflags.h
> @@ -180,30 +180,6 @@ static inline int arch_irqs_disabled(voi
> # define TRACE_IRQS_ON
> # define TRACE_IRQS_OFF
> #endif
> -#ifdef CONFIG_DEBUG_LOCK_ALLOC
> -# ifdef CONFIG_X86_64
> -# define LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk
> -# define LOCKDEP_SYS_EXIT_IRQ \
> - TRACE_IRQS_ON; \
> - sti; \
> - call lockdep_sys_exit_thunk; \
> - cli; \
> - TRACE_IRQS_OFF;
> -# else
> -# define LOCKDEP_SYS_EXIT \
> - pushl %eax; \
> - pushl %ecx; \
> - pushl %edx; \
> - call lockdep_sys_exit; \
> - popl %edx; \
> - popl %ecx; \
> - popl %eax;
> -# define LOCKDEP_SYS_EXIT_IRQ
> -# endif
> -#else
> -# define LOCKDEP_SYS_EXIT
> -# define LOCKDEP_SYS_EXIT_IRQ
> -#endif
> #endif /* __ASSEMBLY__ */
>
> #endif
>

2020-05-19 20:04:56

by tip-bot2 for Alexey Makhalov

[permalink] [raw]

Subject: [tip: x86/entry] x86/entry: Remove the unused LOCKDEP_SYSEXIT cruft

The following commit has been merged into the x86/entry branch of tip:

Commit-ID: 235f96a65b3be1ff5cea6e51c597fa7876f0efdd
Gitweb: https://git.kernel.org/tip/235f96a65b3be1ff5cea6e51c597fa7876f0efdd
Author: Thomas Gleixner <[email protected]>
AuthorDate: Thu, 05 Mar 2020 11:16:49 +01:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Fri, 15 May 2020 20:03:05 +02:00

x86/entry: Remove the unused LOCKDEP_SYSEXIT cruft

No users left since two years due to commit 21d375b6b34f ("x86/entry/64:
Remove the SYSCALL64 fast path")

Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Alexandre Chartre <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

---
arch/x86/entry/thunk_64.S | 5 -----
arch/x86/include/asm/irqflags.h | 24 ------------------------
2 files changed, 29 deletions(-)

diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S
index dbe4493..34f980c 100644
--- a/arch/x86/entry/thunk_64.S
+++ b/arch/x86/entry/thunk_64.S
@@ -42,10 +42,6 @@ SYM_FUNC_END(\name)
THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
#endif

-#ifdef CONFIG_DEBUG_LOCK_ALLOC
- THUNK lockdep_sys_exit_thunk,lockdep_sys_exit
-#endif
-
#ifdef CONFIG_PREEMPTION
THUNK preempt_schedule_thunk, preempt_schedule
THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace
@@ -54,7 +50,6 @@ SYM_FUNC_END(\name)
#endif

#if defined(CONFIG_TRACE_IRQFLAGS) \
- || defined(CONFIG_DEBUG_LOCK_ALLOC) \
|| defined(CONFIG_PREEMPTION)
SYM_CODE_START_LOCAL_NOALIGN(.L_restore)
popq %r11
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 8a0e56e..e00f064 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -180,30 +180,6 @@ static inline int arch_irqs_disabled(void)
# define TRACE_IRQS_ON
# define TRACE_IRQS_OFF
#endif
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-# ifdef CONFIG_X86_64
-# define LOCKDEP_SYS_EXIT call lockdep_sys_exit_thunk
-# define LOCKDEP_SYS_EXIT_IRQ \
- TRACE_IRQS_ON; \
- sti; \
- call lockdep_sys_exit_thunk; \
- cli; \
- TRACE_IRQS_OFF;
-# else
-# define LOCKDEP_SYS_EXIT \
- pushl %eax; \
- pushl %ecx; \
- pushl %edx; \
- call lockdep_sys_exit; \
- popl %edx; \
- popl %ecx; \
- popl %eax;
-# define LOCKDEP_SYS_EXIT_IRQ
-# endif
-#else
-# define LOCKDEP_SYS_EXIT
-# define LOCKDEP_SYS_EXIT_IRQ
-#endif
#endif /* __ASSEMBLY__ */

#endif