Skip to content

Commit b88f553

Browse files
Tetsuo Handatorvalds
Tetsuo Handa
authored andcommitted
profiling: remove profile=sleep support
The kernel sleep profile is no longer working due to a recursive locking bug introduced by commit 42a20f8 ("sched: Add wrapper for get_wchan() to keep task blocked") Booting with the 'profile=sleep' kernel command line option added or executing # echo -n sleep > /sys/kernel/profiling after boot causes the system to lock up. Lockdep reports kthreadd/3 is trying to acquire lock: ffff93ac82e08d58 (&p->pi_lock){....}-{2:2}, at: get_wchan+0x32/0x70 but task is already holding lock: ffff93ac82e08d58 (&p->pi_lock){....}-{2:2}, at: try_to_wake_up+0x53/0x370 with the call trace being lock_acquire+0xc8/0x2f0 get_wchan+0x32/0x70 __update_stats_enqueue_sleeper+0x151/0x430 enqueue_entity+0x4b0/0x520 enqueue_task_fair+0x92/0x6b0 ttwu_do_activate+0x73/0x140 try_to_wake_up+0x213/0x370 swake_up_locked+0x20/0x50 complete+0x2f/0x40 kthread+0xfb/0x180 However, since nobody noticed this regression for more than two years, let's remove 'profile=sleep' support based on the assumption that nobody needs this functionality. Fixes: 42a20f8 ("sched: Add wrapper for get_wchan() to keep task blocked") Cc: [email protected] # v5.16+ Signed-off-by: Tetsuo Handa <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent a5dbd76 commit b88f553

File tree

4 files changed

+2
-24
lines changed

4 files changed

+2
-24
lines changed

Documentation/admin-guide/kernel-parameters.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -4798,11 +4798,9 @@
47984798

47994799
profile= [KNL] Enable kernel profiling via /proc/profile
48004800
Format: [<profiletype>,]<number>
4801-
Param: <profiletype>: "schedule", "sleep", or "kvm"
4801+
Param: <profiletype>: "schedule" or "kvm"
48024802
[defaults to kernel profiling]
48034803
Param: "schedule" - profile schedule points.
4804-
Param: "sleep" - profile D-state sleeping (millisecs).
4805-
Requires CONFIG_SCHEDSTATS
48064804
Param: "kvm" - profile VM exits.
48074805
Param: <number> - step/bucket size as a power of 2 for
48084806
statistical time based profiling.

include/linux/profile.h

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#define CPU_PROFILING 1
1212
#define SCHED_PROFILING 2
13-
#define SLEEP_PROFILING 3
1413
#define KVM_PROFILING 4
1514

1615
struct proc_dir_entry;

kernel/profile.c

+1-10
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,11 @@ EXPORT_SYMBOL_GPL(prof_on);
5050
int profile_setup(char *str)
5151
{
5252
static const char schedstr[] = "schedule";
53-
static const char sleepstr[] = "sleep";
5453
static const char kvmstr[] = "kvm";
5554
const char *select = NULL;
5655
int par;
5756

58-
if (!strncmp(str, sleepstr, strlen(sleepstr))) {
59-
#ifdef CONFIG_SCHEDSTATS
60-
force_schedstat_enabled();
61-
prof_on = SLEEP_PROFILING;
62-
select = sleepstr;
63-
#else
64-
pr_warn("kernel sleep profiling requires CONFIG_SCHEDSTATS\n");
65-
#endif /* CONFIG_SCHEDSTATS */
66-
} else if (!strncmp(str, schedstr, strlen(schedstr))) {
57+
if (!strncmp(str, schedstr, strlen(schedstr))) {
6758
prof_on = SCHED_PROFILING;
6859
select = schedstr;
6960
} else if (!strncmp(str, kvmstr, strlen(kvmstr))) {

kernel/sched/stats.c

-10
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@ void __update_stats_enqueue_sleeper(struct rq *rq, struct task_struct *p,
9292

9393
trace_sched_stat_blocked(p, delta);
9494

95-
/*
96-
* Blocking time is in units of nanosecs, so shift by
97-
* 20 to get a milliseconds-range estimation of the
98-
* amount of time that the task spent sleeping:
99-
*/
100-
if (unlikely(prof_on == SLEEP_PROFILING)) {
101-
profile_hits(SLEEP_PROFILING,
102-
(void *)get_wchan(p),
103-
delta >> 20);
104-
}
10595
account_scheduler_latency(p, delta >> 10, 0);
10696
}
10797
}

0 commit comments

Comments
 (0)