diff --git a/Documentation/scheduler/sched-zone.txt b/Documentation/scheduler/sched-zone.txt index e2d2e4e2561b..5a84f0524481 100644 --- a/Documentation/scheduler/sched-zone.txt +++ b/Documentation/scheduler/sched-zone.txt @@ -641,7 +641,7 @@ While boost is in effect the scheduler checks for the precence of tasks that have been runnable for over some period of time within the tick. For such tasks the scheduler informs the governor of imminent need for high frequency. If there exists a task on the runqueue at the tick that has been runnable -for greater than sched_early_detection_duration amount of time, it notifies +for greater than SCHED_EARLY_DETECTION_DURATION amount of time, it notifies the governor with a fabricated load of the full window at the highest frequency. The fabricated load is maintained until the task is no longer runnable or until the next tick. @@ -1170,18 +1170,7 @@ power mode. It ignores the actual D-state that a cluster may be in and assumes the worst case power cost of the highest D-state. It is means of biasing task placement away from idle clusters when necessary. -*** 7.15 sched_early_detection_duration - -Default value: 9500000 - -Appears at /proc/sys/kernel/sched_early_detection_duration - -This governs the time in microseconds that a task has to runnable within one -tick for it to be eligible for the scheduler's early detection feature -under scheduler boost. For more information on the feature itself please -refer to section 5.2.1. - -*** 7.16 sched_restrict_cluster_spill +*** 7.15 sched_restrict_cluster_spill Default value: 0 @@ -1200,7 +1189,7 @@ CPU across all clusters. When this tunable is enabled, the RT tasks are restricted to the lowest possible power cluster. -*** 7.17 sched_downmigrate +*** 7.16 sched_downmigrate Appears at: /proc/sys/kernel/sched_downmigrate @@ -1213,7 +1202,7 @@ its demand *in reference to the power-efficient cpu* drops less than 60% (sched_downmigrate). -*** 7.18 sched_small_wakee_task_load +*** 7.17 sched_small_wakee_task_load Appears at: /proc/sys/kernel/sched_small_wakee_task_load @@ -1225,7 +1214,7 @@ categorized as small wakee tasks. Scheduler places small wakee tasks on the waker's cluster. -*** 7.19 sched_big_waker_task_load +*** 7.18 sched_big_waker_task_load Appears at: /proc/sys/kernel/sched_big_waker_task_load diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b6d48fbb0c60..0a7db8a3bc16 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1759,10 +1759,10 @@ struct cpu_cycle { /* * Tasks that are runnable continuously for a period greather than - * sysctl_early_detection_duration can be flagged early as potential + * EARLY_DETECTION_DURATION can be flagged early as potential * high load tasks. */ -__read_mostly unsigned int sysctl_early_detection_duration = 9500000; +#define EARLY_DETECTION_DURATION 9500000 static __read_mostly unsigned int sched_ravg_hist_size = 5; __read_mostly unsigned int sysctl_sched_ravg_hist_size = 5; @@ -6232,8 +6232,7 @@ static bool early_detection_notify(struct rq *rq, u64 wallclock) if (!loop_max) break; - if (wallclock - p->last_wake_ts >= - sysctl_early_detection_duration) { + if (wallclock - p->last_wake_ts >= EARLY_DETECTION_DURATION) { rq->ed_task = p; return 1; } diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 5f0767a2605c..3bfefc464569 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -375,13 +375,6 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = sched_hmp_proc_update_handler, }, - { - .procname = "sched_early_detection_duration", - .data = &sysctl_early_detection_duration, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, { .procname = "sched_select_prev_cpu_us", .data = &sysctl_sched_select_prev_cpu_us,