Skip to content

Commit 1b0b7c1

Browse files
Davidlohr BuesoKAGA-KOKO
Davidlohr Bueso
authored andcommittedJul 20, 2015
rtmutex: Delete scriptable tester
No one uses this anymore, and this is not the first time the idea of replacing it with a (now possible) userspace side. Lock stealing logic was removed long ago in when the lock was granted to the highest prio. Signed-off-by: Davidlohr Bueso <[email protected]> Cc: Darren Hart <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Sebastian Andrzej Siewior <[email protected]> Cc: Davidlohr Bueso <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent ab51fba commit 1b0b7c1

23 files changed

+1
-1986
lines changed
 

‎arch/parisc/configs/c8000_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ CONFIG_LOCKUP_DETECTOR=y
242242
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
243243
CONFIG_PANIC_ON_OOPS=y
244244
CONFIG_DEBUG_RT_MUTEXES=y
245-
CONFIG_RT_MUTEX_TESTER=y
246245
CONFIG_PROVE_RCU_DELAY=y
247246
CONFIG_DEBUG_BLOCK_EXT_DEVT=y
248247
CONFIG_LATENCYTOP=y

‎arch/parisc/configs/generic-32bit_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ CONFIG_DEBUG_SHIRQ=y
295295
CONFIG_DETECT_HUNG_TASK=y
296296
CONFIG_TIMER_STATS=y
297297
CONFIG_DEBUG_RT_MUTEXES=y
298-
CONFIG_RT_MUTEX_TESTER=y
299298
CONFIG_DEBUG_SPINLOCK=y
300299
CONFIG_DEBUG_MUTEXES=y
301300
CONFIG_RCU_CPU_STALL_INFO=y

‎arch/xtensa/configs/iss_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@ CONFIG_SCHED_DEBUG=y
616616
# CONFIG_SLUB_DEBUG_ON is not set
617617
# CONFIG_SLUB_STATS is not set
618618
# CONFIG_DEBUG_RT_MUTEXES is not set
619-
# CONFIG_RT_MUTEX_TESTER is not set
620619
# CONFIG_DEBUG_SPINLOCK is not set
621620
# CONFIG_DEBUG_MUTEXES is not set
622621
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

‎kernel/locking/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ obj-$(CONFIG_PROVE_LOCKING) += spinlock.o
2020
obj-$(CONFIG_QUEUED_SPINLOCKS) += qspinlock.o
2121
obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
2222
obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
23-
obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o
2423
obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
2524
obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
2625
obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o

‎kernel/locking/rtmutex-tester.c

-420
This file was deleted.

‎kernel/locking/rtmutex.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
11201120

11211121
debug_rt_mutex_print_deadlock(waiter);
11221122

1123-
schedule_rt_mutex(lock);
1123+
schedule();
11241124

11251125
raw_spin_lock(&lock->wait_lock);
11261126
set_current_state(state);

‎kernel/locking/rtmutex_common.h

-22
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,6 @@
1414

1515
#include <linux/rtmutex.h>
1616

17-
/*
18-
* The rtmutex in kernel tester is independent of rtmutex debugging. We
19-
* call schedule_rt_mutex_test() instead of schedule() for the tasks which
20-
* belong to the tester. That way we can delay the wakeup path of those
21-
* threads to provoke lock stealing and testing of complex boosting scenarios.
22-
*/
23-
#ifdef CONFIG_RT_MUTEX_TESTER
24-
25-
extern void schedule_rt_mutex_test(struct rt_mutex *lock);
26-
27-
#define schedule_rt_mutex(_lock) \
28-
do { \
29-
if (!(current->flags & PF_MUTEX_TESTER)) \
30-
schedule(); \
31-
else \
32-
schedule_rt_mutex_test(_lock); \
33-
} while (0)
34-
35-
#else
36-
# define schedule_rt_mutex(_lock) schedule()
37-
#endif
38-
3917
/*
4018
* This is the control structure for tasks blocked on a rt_mutex,
4119
* which is allocated on the kernel stack on of the blocked task.

‎lib/Kconfig.debug

-6
Original file line numberDiff line numberDiff line change
@@ -916,12 +916,6 @@ config DEBUG_RT_MUTEXES
916916
This allows rt mutex semantics violations and rt mutex related
917917
deadlocks (lockups) to be detected and reported automatically.
918918

919-
config RT_MUTEX_TESTER
920-
bool "Built-in scriptable tester for rt-mutexes"
921-
depends on DEBUG_KERNEL && RT_MUTEXES && BROKEN
922-
help
923-
This option enables a rt-mutex tester.
924-
925919
config DEBUG_SPINLOCK
926920
bool "Spinlock and rw-lock debugging: basic checks"
927921
depends on DEBUG_KERNEL

‎scripts/rt-tester/check-all.sh

-21
This file was deleted.

‎scripts/rt-tester/rt-tester.py

-218
This file was deleted.

‎scripts/rt-tester/t2-l1-2rt-sameprio.tst

-94
This file was deleted.

‎scripts/rt-tester/t2-l1-pi.tst

-77
This file was deleted.

‎scripts/rt-tester/t2-l1-signal.tst

-72
This file was deleted.

‎scripts/rt-tester/t2-l2-2rt-deadlock.tst

-84
This file was deleted.

‎scripts/rt-tester/t3-l1-pi-1rt.tst

-87
This file was deleted.

‎scripts/rt-tester/t3-l1-pi-2rt.tst

-88
This file was deleted.

‎scripts/rt-tester/t3-l1-pi-3rt.tst

-87
This file was deleted.

‎scripts/rt-tester/t3-l1-pi-signal.tst

-93
This file was deleted.

‎scripts/rt-tester/t3-l1-pi-steal.tst

-91
This file was deleted.

‎scripts/rt-tester/t3-l2-pi.tst

-87
This file was deleted.

‎scripts/rt-tester/t4-l2-pi-deboost.tst

-118
This file was deleted.

‎scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst

-178
This file was deleted.

‎scripts/rt-tester/t5-l4-pi-boost-deboost.tst

-138
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.