Skip to content

Commit e4ec331

Browse files
Peter ZijlstraIngo Molnar
authored andcommitted
sched/debug: Rename sysctl_sched_min_granularity to sysctl_sched_base_slice
EEVDF uses this tunable as the base request/slice -- make sure the name reflects this. Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5e963f2 commit e4ec331

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

kernel/sched/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4502,7 +4502,7 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
45024502
p->se.nr_migrations = 0;
45034503
p->se.vruntime = 0;
45044504
p->se.vlag = 0;
4505-
p->se.slice = sysctl_sched_min_granularity;
4505+
p->se.slice = sysctl_sched_base_slice;
45064506
INIT_LIST_HEAD(&p->se.group_node);
45074507

45084508
#ifdef CONFIG_FAIR_GROUP_SCHED

kernel/sched/debug.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static __init int sched_init_debug(void)
347347
debugfs_create_file("preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops);
348348
#endif
349349

350-
debugfs_create_u32("min_granularity_ns", 0644, debugfs_sched, &sysctl_sched_min_granularity);
350+
debugfs_create_u32("base_slice_ns", 0644, debugfs_sched, &sysctl_sched_base_slice);
351351

352352
debugfs_create_u32("latency_warn_ms", 0644, debugfs_sched, &sysctl_resched_latency_warn_ms);
353353
debugfs_create_u32("latency_warn_once", 0644, debugfs_sched, &sysctl_resched_latency_warn_once);
@@ -863,7 +863,7 @@ static void sched_debug_header(struct seq_file *m)
863863
SEQ_printf(m, " .%-40s: %Ld\n", #x, (long long)(x))
864864
#define PN(x) \
865865
SEQ_printf(m, " .%-40s: %Ld.%06ld\n", #x, SPLIT_NS(x))
866-
PN(sysctl_sched_min_granularity);
866+
PN(sysctl_sched_base_slice);
867867
P(sysctl_sched_child_runs_first);
868868
P(sysctl_sched_features);
869869
#undef PN

kernel/sched/fair.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ unsigned int sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_LOG;
7575
*
7676
* (default: 0.75 msec * (1 + ilog(ncpus)), units: nanoseconds)
7777
*/
78-
unsigned int sysctl_sched_min_granularity = 750000ULL;
79-
static unsigned int normalized_sysctl_sched_min_granularity = 750000ULL;
78+
unsigned int sysctl_sched_base_slice = 750000ULL;
79+
static unsigned int normalized_sysctl_sched_base_slice = 750000ULL;
8080

8181
/*
8282
* After fork, child runs first. If set to 0 (default) then
@@ -237,7 +237,7 @@ static void update_sysctl(void)
237237

238238
#define SET_SYSCTL(name) \
239239
(sysctl_##name = (factor) * normalized_sysctl_##name)
240-
SET_SYSCTL(sched_min_granularity);
240+
SET_SYSCTL(sched_base_slice);
241241
#undef SET_SYSCTL
242242
}
243243

@@ -943,7 +943,7 @@ int sched_update_scaling(void)
943943

944944
#define WRT_SYSCTL(name) \
945945
(normalized_sysctl_##name = sysctl_##name / (factor))
946-
WRT_SYSCTL(sched_min_granularity);
946+
WRT_SYSCTL(sched_base_slice);
947947
#undef WRT_SYSCTL
948948

949949
return 0;
@@ -964,9 +964,9 @@ static void update_deadline(struct cfs_rq *cfs_rq, struct sched_entity *se)
964964
/*
965965
* For EEVDF the virtual time slope is determined by w_i (iow.
966966
* nice) while the request time r_i is determined by
967-
* sysctl_sched_min_granularity.
967+
* sysctl_sched_base_slice.
968968
*/
969-
se->slice = sysctl_sched_min_granularity;
969+
se->slice = sysctl_sched_base_slice;
970970

971971
/*
972972
* EEVDF: vd_i = ve_i + r_i / w_i

kernel/sched/sched.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2503,7 +2503,7 @@ extern void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags);
25032503
extern const_debug unsigned int sysctl_sched_nr_migrate;
25042504
extern const_debug unsigned int sysctl_sched_migration_cost;
25052505

2506-
extern unsigned int sysctl_sched_min_granularity;
2506+
extern unsigned int sysctl_sched_base_slice;
25072507

25082508
#ifdef CONFIG_SCHED_DEBUG
25092509
extern int sysctl_resched_latency_warn_ms;

0 commit comments

Comments
 (0)