From 943645bbab9f0e55a799aab6924faf2cd69c0852 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Tue, 8 Jul 2025 15:21:47 +0200 Subject: [PATCH] bore Signed-off-by: Piotr Gorski --- include/linux/sched.h | 18 ++ include/linux/sched/bore.h | 39 ++++ init/Kconfig | 17 ++ kernel/Kconfig.hz | 17 ++ kernel/fork.c | 6 + kernel/sched/Makefile | 1 + kernel/sched/bore.c | 447 +++++++++++++++++++++++++++++++++++++ kernel/sched/core.c | 6 + kernel/sched/debug.c | 61 ++++- kernel/sched/fair.c | 90 +++++++- kernel/sched/sched.h | 9 + 11 files changed, 706 insertions(+), 5 deletions(-) create mode 100644 include/linux/sched/bore.h create mode 100644 kernel/sched/bore.c diff --git a/include/linux/sched.h b/include/linux/sched.h index f96ac1982..fa6550be5 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -566,6 +566,15 @@ struct sched_statistics { #endif /* CONFIG_SCHEDSTATS */ } ____cacheline_aligned; +#ifdef CONFIG_SCHED_BORE +struct sched_burst_cache { + u64 timestamp; + u64 rate; + u32 count; + spinlock_t lock; +}; +#endif // CONFIG_SCHED_BORE + struct sched_entity { /* For load-balancing: */ struct load_weight load; @@ -585,6 +594,15 @@ struct sched_entity { u64 sum_exec_runtime; u64 prev_sum_exec_runtime; u64 vruntime; +#ifdef CONFIG_SCHED_BORE + u64 burst_time; + u64 target_burst_time; + u64 avg_burst_rate; + u8 burst_score; + u8 burst_count; + struct sched_burst_cache child_burst; + struct sched_burst_cache group_burst; +#endif // CONFIG_SCHED_BORE s64 vlag; u64 slice; diff --git a/include/linux/sched/bore.h b/include/linux/sched/bore.h new file mode 100644 index 000000000..1e00b5170 --- /dev/null +++ b/include/linux/sched/bore.h @@ -0,0 +1,39 @@ + +#include +#include + +#ifndef _LINUX_SCHED_BORE_H +#define _LINUX_SCHED_BORE_H +#define SCHED_BORE_VERSION "6.0.0-beta3" + +#ifdef CONFIG_SCHED_BORE +extern u8 __read_mostly sched_bore; +extern u8 __read_mostly sched_burst_exclude_kthreads; +extern u8 __read_mostly sched_burst_smoothness; +extern u8 __read_mostly sched_burst_fork_atavistic; +extern u8 __read_mostly sched_burst_parity_threshold; +extern u8 __read_mostly sched_burst_penalty_offset; +extern uint __read_mostly sched_burst_penalty_scale; +extern uint __read_mostly sched_burst_cache_stop_count; +extern uint __read_mostly sched_burst_cache_lifetime; +extern uint __read_mostly sched_deadline_boost_mask; + +extern void update_burst_score(struct sched_entity *se); +extern void update_burst_penalty(struct sched_entity *se); + +extern void restart_burst(struct sched_entity *se); +extern void restart_burst_rescale_deadline(struct sched_entity *se); + +extern int sched_bore_update_handler(const struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos); + +extern void sched_clone_bore( + struct task_struct *p, struct task_struct *parent, u64 clone_flags, u64 now); + +extern void reset_task_bore(struct task_struct *p); +extern void sched_bore_init(void); + +extern void reweight_entity(struct cfs_rq *cfs_rq, + struct sched_entity *se, unsigned long weight, bool no_update_curr); +#endif // CONFIG_SCHED_BORE +#endif // _LINUX_SCHED_BORE_H diff --git a/init/Kconfig b/init/Kconfig index bf3a92006..5efa0ec37 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1362,6 +1362,23 @@ config CHECKPOINT_RESTORE If unsure, say N here. +config SCHED_BORE + bool "Burst-Oriented Response Enhancer" + default y + help + In Desktop and Mobile computing, one might prefer interactive + tasks to keep responsive no matter what they run in the background. + + Enabling this kernel feature modifies the scheduler to discriminate + tasks by their burst time (runtime since it last went sleeping or + yielding state) and prioritize those that run less bursty. + Such tasks usually include window compositor, widgets backend, + terminal emulator, video playback, games and so on. + With a little impact to scheduling fairness, it may improve + responsiveness especially under heavy background workload. + + If unsure, say Y here. + config SCHED_AUTOGROUP bool "Automatic process group scheduling" select CGROUPS diff --git a/kernel/Kconfig.hz b/kernel/Kconfig.hz index ce1435cb0..b93d1f657 100644 --- a/kernel/Kconfig.hz +++ b/kernel/Kconfig.hz @@ -55,5 +55,22 @@ config HZ default 300 if HZ_300 default 1000 if HZ_1000 +config MIN_BASE_SLICE_NS + int "Default value for min_base_slice_ns" + default 2000000 + help + The BORE Scheduler automatically calculates the optimal base + slice for the configured HZ using the following equation: + + base_slice_ns = + 1000000000/HZ * DIV_ROUNDUP(min_base_slice_ns, 1000000000/HZ) + + This option sets the default lower bound limit of the base slice + to prevent the loss of task throughput due to overscheduling. + + Setting this value too high can cause the system to boot with + an unnecessarily large base slice, resulting in high scheduling + latency and poor system responsiveness. + config SCHED_HRTICK def_bool HIGH_RES_TIMERS diff --git a/kernel/fork.c b/kernel/fork.c index 168681fc4..74d2b1a4c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -112,6 +112,8 @@ #include #include +#include + #include #define CREATE_TRACE_POINTS @@ -2554,6 +2556,10 @@ __latent_entropy struct task_struct *copy_process( p->start_time = ktime_get_ns(); p->start_boottime = ktime_get_boottime_ns(); +#ifdef CONFIG_SCHED_BORE + if (likely(p->pid)) + sched_clone_bore(p, current, clone_flags, p->start_time); +#endif // CONFIG_SCHED_BORE /* * Make it visible to the rest of the system, but dont wake it up yet. * Need tasklist lock for parent etc handling! diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 8ae86371d..ab9ad886a 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -37,3 +37,4 @@ obj-y += core.o obj-y += fair.o obj-y += build_policy.o obj-y += build_utility.o +obj-y += bore.o diff --git a/kernel/sched/bore.c b/kernel/sched/bore.c new file mode 100644 index 000000000..6c03929b6 --- /dev/null +++ b/kernel/sched/bore.c @@ -0,0 +1,447 @@ +/* + * Burst-Oriented Response Enhancer (BORE) CPU Scheduler + * Copyright (C) 2021-2024 Masahito Suzuki + */ +#include +#include +#include +#include "sched.h" + +#ifdef CONFIG_SCHED_BORE +u8 __read_mostly sched_bore = 1; +u8 __read_mostly sched_burst_exclude_kthreads = 1; +u8 __read_mostly sched_burst_smoothness = 8; +u8 __read_mostly sched_burst_fork_atavistic = 2; +u8 __read_mostly sched_burst_parity_threshold = 2; +u8 __read_mostly sched_burst_penalty_offset = 24; +uint __read_mostly sched_burst_penalty_scale = 1280; +uint __read_mostly sched_burst_cache_stop_count = 64; +uint __read_mostly sched_burst_cache_lifetime = 75000000; +uint __read_mostly sched_deadline_boost_mask = ENQUEUE_INITIAL + | ENQUEUE_WAKEUP; +static int __maybe_unused sixty_four = 64; +static int __maybe_unused maxval_u8 = 255; +static int __maybe_unused maxval_12_bits = 4095; + +#define MAX_BURST_SCORE 39U +#define MAX_BURST_RATE ((1ULL << 42) - 1) + +static inline u32 log2plus1_u64_u32f8(u64 v) { + u32 integral = fls64(v); + u8 fractional = v << (64 - integral) >> 55; + return integral << 8 | fractional; +} + +static inline u8 calc_burst_score(u64 burst_time) { + u32 greed, tolerance, penalty, scaled_penalty; + + greed = log2plus1_u64_u32f8(burst_time); + tolerance = sched_burst_penalty_offset << 8; + penalty = max(0, (s32)(greed - tolerance)); + scaled_penalty = penalty * sched_burst_penalty_scale >> 18; + + return min(MAX_BURST_SCORE, scaled_penalty); +} + +static inline u64 adjusted_burst_time(struct sched_entity *se) { + u64 overrun = max(0LL, (s64)(se->burst_time - se->target_burst_time)); + if (overrun) + overrun = div_u64(overrun, se->burst_count); + return se->target_burst_time + overrun; +} + +static inline u64 __scale_slice(u64 delta, u8 score) +{return mul_u64_u32_shr(delta, sched_prio_to_wmult[score], 22);} + +static inline u64 __unscale_slice(u64 delta, u8 score) +{return mul_u64_u32_shr(delta, sched_prio_to_weight[score], 10);} + +static void reweight_task_by_prio(struct task_struct *p, int prio) { + struct sched_entity *se = &p->se; + unsigned long weight = scale_load(sched_prio_to_weight[prio]); + + reweight_entity(cfs_rq_of(se), se, weight, true); + se->load.inv_weight = sched_prio_to_wmult[prio]; +} + +static inline u8 effective_prio(struct task_struct *p) { + u8 prio = p->static_prio - MAX_RT_PRIO; + if (likely(sched_bore)) + prio += p->se.burst_score; + return min(39, prio); +} + +void update_burst_score(struct sched_entity *se) { + if (!entity_is_task(se)) return; + struct task_struct *p = task_of(se); + u8 prev_prio = effective_prio(p); + + u8 burst_score = 0; + if (!((p->flags & PF_KTHREAD) && likely(sched_burst_exclude_kthreads))) + burst_score = calc_burst_score(adjusted_burst_time(se)); + se->burst_score = burst_score; + + u8 new_prio = effective_prio(p); + if (new_prio != prev_prio) + reweight_task_by_prio(p, new_prio); +} + +static inline u32 binary_smooth(u64 new, u64 old, u8 dumper) { + s64 increment = new - old; + return (0 <= increment)? + old + (div_u64( increment, dumper)): + old - (div_u64(-increment, dumper)); +} + +static inline u64 convert_time_rate(u64 v) { + u64 ret = MAX_BURST_RATE; + if (v) + ret = div_u64(ret, v); + return ret; +} + +static void revolve_burst_time(struct sched_entity *se) { + u64 burst_rate = convert_time_rate(se->burst_time); + se->avg_burst_rate = binary_smooth( + burst_rate, se->avg_burst_rate, se->burst_count); + se->target_burst_time = convert_time_rate(se->avg_burst_rate); + se->burst_time = 0; + + se->burst_count = (se->burst_count < sched_burst_smoothness) ? + (se->burst_count + 1) : sched_burst_smoothness; +} + +inline void restart_burst(struct sched_entity *se) { + revolve_burst_time(se); + update_burst_score(se); +} + +void restart_burst_rescale_deadline(struct sched_entity *se) { + s64 vscaled, wremain, vremain = se->deadline - se->vruntime; + struct task_struct *p = task_of(se); + u8 prev_prio = effective_prio(p); + restart_burst(se); + u8 new_prio = effective_prio(p); + if (prev_prio > new_prio) { + wremain = __unscale_slice(abs(vremain), prev_prio); + vscaled = __scale_slice(wremain, new_prio); + if (unlikely(vremain < 0)) + vscaled = -vscaled; + se->deadline = se->vruntime + vscaled; + } +} + +static inline bool task_is_bore_eligible(struct task_struct *p) +{return p && p->sched_class == &fair_sched_class && !p->exit_state;} + +static void reset_task_weights_bore(void) { + struct task_struct *task; + struct rq *rq; + struct rq_flags rf; + + write_lock_irq(&tasklist_lock); + for_each_process(task) { + if (!task_is_bore_eligible(task)) continue; + rq = task_rq(task); + rq_pin_lock(rq, &rf); + update_rq_clock(rq); + reweight_task_by_prio(task, effective_prio(task)); + rq_unpin_lock(rq, &rf); + } + write_unlock_irq(&tasklist_lock); +} + +int sched_bore_update_handler(const struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) { + int ret = proc_dou8vec_minmax(table, write, buffer, lenp, ppos); + if (ret || !write) + return ret; + + reset_task_weights_bore(); + + return 0; +} + +#define for_each_child(p, t) \ + list_for_each_entry(t, &(p)->children, sibling) + +static u32 count_entries_upto2(struct list_head *head) { + struct list_head *next = head->next; + return (next != head) + (next->next != head); +} + +static inline void init_task_burst_cache_lock(struct task_struct *p) { + spin_lock_init(&p->se.child_burst.lock); + spin_lock_init(&p->se.group_burst.lock); +} + +static inline bool burst_cache_expired(struct sched_burst_cache *bc, u64 now) +{return (s64)(bc->timestamp + sched_burst_cache_lifetime - now) < 0;} + +static void update_burst_cache(struct sched_burst_cache *bc, + struct task_struct *p, u32 cnt, u32 sum, u64 now) { + u8 avg = cnt ? sum / cnt : 0; + bc->rate = max(avg, p->se.avg_burst_rate); + bc->count = cnt; + bc->timestamp = now; +} + +static inline void update_child_burst_direct(struct task_struct *p, u64 now) { + u32 cnt = 0, sum = 0; + struct task_struct *child; + + for_each_child(p, child) { + if (!task_is_bore_eligible(child)) continue; + cnt++; + sum += child->se.avg_burst_rate; + } + + update_burst_cache(&p->se.child_burst, p, cnt, sum, now); +} + +static inline u64 inherit_burst_direct( + struct task_struct *p, u64 now, u64 clone_flags) { + struct task_struct *parent = p; + struct sched_burst_cache *bc; + + if (clone_flags & CLONE_PARENT) + parent = parent->real_parent; + + bc = &parent->se.child_burst; + guard(spinlock)(&bc->lock); + if (burst_cache_expired(bc, now)) + update_child_burst_direct(parent, now); + + return bc->rate; +} + +static void update_child_burst_topological( + struct task_struct *p, u64 now, u32 depth, u32 *acnt, u32 *asum) { + u32 cnt = 0, dcnt = 0, sum = 0; + struct task_struct *child, *dec; + struct sched_burst_cache *bc __maybe_unused; + + for_each_child(p, child) { + dec = child; + while ((dcnt = count_entries_upto2(&dec->children)) == 1) + dec = list_first_entry(&dec->children, struct task_struct, sibling); + + if (!dcnt || !depth) { + if (!task_is_bore_eligible(dec)) continue; + cnt++; + sum += dec->se.avg_burst_rate; + continue; + } + bc = &dec->se.child_burst; + spin_lock(&bc->lock); + if (!burst_cache_expired(bc, now)) { + cnt += bc->count; + sum += (u32)bc->rate * bc->count; + if (sched_burst_cache_stop_count <= cnt) { + spin_unlock(&bc->lock); + break; + } + spin_unlock(&bc->lock); + continue; + } + update_child_burst_topological(dec, now, depth - 1, &cnt, &sum); + spin_unlock(&bc->lock); + } + + update_burst_cache(&p->se.child_burst, p, cnt, sum, now); + *acnt += cnt; + *asum += sum; +} + +static inline u64 inherit_burst_topological( + struct task_struct *p, u64 now, u64 clone_flags) { + struct task_struct *anc = p; + struct sched_burst_cache *bc; + u32 cnt = 0, sum = 0; + u32 base_child_cnt = 0; + + if (clone_flags & CLONE_PARENT) { + anc = anc->real_parent; + base_child_cnt = 1; + } + + for (struct task_struct *next; + anc != (next = anc->real_parent) && + count_entries_upto2(&anc->children) <= base_child_cnt;) { + anc = next; + base_child_cnt = 1; + } + + bc = &anc->se.child_burst; + guard(spinlock)(&bc->lock); + if (burst_cache_expired(bc, now)) + update_child_burst_topological( + anc, now, sched_burst_fork_atavistic - 1, &cnt, &sum); + + return bc->rate; +} + +static inline void update_tg_burst(struct task_struct *p, u64 now) { + struct task_struct *task; + u32 cnt = 0, sum = 0; + + for_each_thread(p, task) { + if (!task_is_bore_eligible(task)) continue; + cnt++; + sum += task->se.avg_burst_rate; + } + + update_burst_cache(&p->se.group_burst, p, cnt, sum, now); +} + +static inline u64 inherit_burst_tg(struct task_struct *p, u64 now) { + struct task_struct *parent = rcu_dereference(p->group_leader); + struct sched_burst_cache *bc = &parent->se.group_burst; + guard(spinlock)(&bc->lock); + if (burst_cache_expired(bc, now)) + update_tg_burst(parent, now); + + return bc->rate; +} + +void sched_clone_bore(struct task_struct *p, + struct task_struct *parent, u64 clone_flags, u64 now) { + struct sched_entity *se = &p->se; + u64 rate; + + init_task_burst_cache_lock(p); + + if (!task_is_bore_eligible(p)) return; + + if (clone_flags & CLONE_THREAD) { + rcu_read_lock(); + rate = inherit_burst_tg(parent, now); + rcu_read_unlock(); + } else { + read_lock(&tasklist_lock); + rate = likely(sched_burst_fork_atavistic) ? + inherit_burst_topological(parent, now, clone_flags): + inherit_burst_direct(parent, now, clone_flags); + read_unlock(&tasklist_lock); + } + + revolve_burst_time(se); + se->avg_burst_rate = min(se->avg_burst_rate, rate); + se->target_burst_time = + max(se->target_burst_time, convert_time_rate(se->avg_burst_rate)); + se->burst_count = 1; + se->child_burst.timestamp = 0; + se->group_burst.timestamp = 0; +} + +void reset_task_bore(struct task_struct *p) { + p->se.burst_time = 0; + p->se.target_burst_time = 0; + p->se.avg_burst_rate = 0; + p->se.burst_score = 0; + p->se.burst_count = 1; + memset(&p->se.child_burst, 0, sizeof(struct sched_burst_cache)); + memset(&p->se.group_burst, 0, sizeof(struct sched_burst_cache)); +} + +void __init sched_bore_init(void) { + printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification %s by Masahito Suzuki", SCHED_BORE_VERSION); + reset_task_bore(&init_task); + init_task_burst_cache_lock(&init_task); +} + +#ifdef CONFIG_SYSCTL +static struct ctl_table sched_bore_sysctls[] = { + { + .procname = "sched_bore", + .data = &sched_bore, + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = sched_bore_update_handler, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, + { + .procname = "sched_burst_exclude_kthreads", + .data = &sched_burst_exclude_kthreads, + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, + { + .procname = "sched_burst_smoothness", + .data = &sched_burst_smoothness, + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ONE, + .extra2 = &maxval_u8, + }, + { + .procname = "sched_burst_fork_atavistic", + .data = &sched_burst_fork_atavistic, + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_THREE, + }, + { + .procname = "sched_burst_parity_threshold", + .data = &sched_burst_parity_threshold, + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = &maxval_u8, + }, + { + .procname = "sched_burst_penalty_offset", + .data = &sched_burst_penalty_offset, + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = &sixty_four, + }, + { + .procname = "sched_burst_penalty_scale", + .data = &sched_burst_penalty_scale, + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = &maxval_12_bits, + }, + { + .procname = "sched_burst_cache_stop_count", + .data = &sched_burst_cache_stop_count, + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec, + }, + { + .procname = "sched_burst_cache_lifetime", + .data = &sched_burst_cache_lifetime, + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec, + }, + { + .procname = "sched_deadline_boost_mask", + .data = &sched_deadline_boost_mask, + .maxlen = sizeof(uint), + .mode = 0644, + .proc_handler = proc_douintvec, + }, +}; + +static int __init sched_bore_sysctl_init(void) { + register_sysctl_init("kernel", sched_bore_sysctls); + return 0; +} +late_initcall(sched_bore_sysctl_init); +#endif // CONFIG_SYSCTL +#endif // CONFIG_SCHED_BORE diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 39fac649a..3f0b9d2d3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -96,6 +96,8 @@ #include "../../io_uring/io-wq.h" #include "../smpboot.h" +#include + EXPORT_TRACEPOINT_SYMBOL_GPL(ipi_send_cpu); EXPORT_TRACEPOINT_SYMBOL_GPL(ipi_send_cpumask); @@ -8549,6 +8551,10 @@ void __init sched_init(void) BUG_ON(!sched_class_above(&ext_sched_class, &idle_sched_class)); #endif +#ifdef CONFIG_SCHED_BORE + sched_bore_init(); +#endif // CONFIG_SCHED_BORE + wait_bit_init(); #ifdef CONFIG_FAIR_GROUP_SCHED diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 56ae54e0c..4302a4d60 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -167,7 +167,53 @@ static const struct file_operations sched_feat_fops = { }; #ifdef CONFIG_SMP +#ifdef CONFIG_SCHED_BORE +#define DEFINE_SYSCTL_SCHED_FUNC(name, update_func) \ +static ssize_t sched_##name##_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) \ +{ \ + char buf[16]; \ + unsigned int value; \ +\ + if (cnt > 15) \ + cnt = 15; \ +\ + if (copy_from_user(&buf, ubuf, cnt)) \ + return -EFAULT; \ + buf[cnt] = '\0'; \ +\ + if (kstrtouint(buf, 10, &value)) \ + return -EINVAL; \ +\ + sysctl_sched_##name = value; \ + sched_update_##update_func(); \ +\ + *ppos += cnt; \ + return cnt; \ +} \ +\ +static int sched_##name##_show(struct seq_file *m, void *v) \ +{ \ + seq_printf(m, "%d\n", sysctl_sched_##name); \ + return 0; \ +} \ +\ +static int sched_##name##_open(struct inode *inode, struct file *filp) \ +{ \ + return single_open(filp, sched_##name##_show, NULL); \ +} \ +\ +static const struct file_operations sched_##name##_fops = { \ + .open = sched_##name##_open, \ + .write = sched_##name##_write, \ + .read = seq_read, \ + .llseek = seq_lseek, \ + .release = single_release, \ +}; +DEFINE_SYSCTL_SCHED_FUNC(min_base_slice, min_base_slice) + +#undef DEFINE_SYSCTL_SCHED_FUNC +#else // !CONFIG_SCHED_BORE static ssize_t sched_scaling_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) { @@ -213,7 +259,7 @@ static const struct file_operations sched_scaling_fops = { .llseek = seq_lseek, .release = single_release, }; - +#endif // CONFIG_SCHED_BORE #endif /* SMP */ #ifdef CONFIG_PREEMPT_DYNAMIC @@ -507,13 +553,20 @@ static __init int sched_init_debug(void) debugfs_create_file("preempt", 0644, debugfs_sched, NULL, &sched_dynamic_fops); #endif +#ifdef CONFIG_SCHED_BORE + debugfs_create_file("min_base_slice_ns", 0644, debugfs_sched, NULL, &sched_min_base_slice_fops); + debugfs_create_u32("base_slice_ns", 0444, debugfs_sched, &sysctl_sched_base_slice); +#else // !CONFIG_SCHED_BORE debugfs_create_u32("base_slice_ns", 0644, debugfs_sched, &sysctl_sched_base_slice); +#endif // CONFIG_SCHED_BORE debugfs_create_u32("latency_warn_ms", 0644, debugfs_sched, &sysctl_resched_latency_warn_ms); debugfs_create_u32("latency_warn_once", 0644, debugfs_sched, &sysctl_resched_latency_warn_once); #ifdef CONFIG_SMP +#if !defined(CONFIG_SCHED_BORE) debugfs_create_file("tunable_scaling", 0644, debugfs_sched, NULL, &sched_scaling_fops); +#endif // CONFIG_SCHED_BORE debugfs_create_u32("migration_cost_ns", 0644, debugfs_sched, &sysctl_sched_migration_cost); debugfs_create_u32("nr_migrate", 0644, debugfs_sched, &sysctl_sched_nr_migrate); @@ -758,6 +811,9 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) SPLIT_NS(schedstat_val_or_zero(p->stats.sum_sleep_runtime)), SPLIT_NS(schedstat_val_or_zero(p->stats.sum_block_runtime))); +#ifdef CONFIG_SCHED_BORE + SEQ_printf(m, " %2d", p->se.burst_score); +#endif // CONFIG_SCHED_BORE #ifdef CONFIG_NUMA_BALANCING SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p)); #endif @@ -1244,6 +1300,9 @@ void proc_sched_show_task(struct task_struct *p, struct pid_namespace *ns, P(se.load.weight); #ifdef CONFIG_SMP +#ifdef CONFIG_SCHED_BORE + P(se.burst_score); +#endif // CONFIG_SCHED_BORE P(se.avg.load_sum); P(se.avg.runnable_sum); P(se.avg.util_sum); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 138d9f465..6c46678c4 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -58,6 +58,8 @@ #include "stats.h" #include "autogroup.h" +#include + /* * The initial- and re-scaling of tunables is configurable * @@ -67,17 +69,30 @@ * SCHED_TUNABLESCALING_LOG - scaled logarithmically, *1+ilog(ncpus) * SCHED_TUNABLESCALING_LINEAR - scaled linear, *ncpus * - * (default SCHED_TUNABLESCALING_LOG = *(1+ilog(ncpus)) + * BORE : default SCHED_TUNABLESCALING_NONE = *1 constant + * EEVDF: default SCHED_TUNABLESCALING_LOG = *(1+ilog(ncpus)) */ +#ifdef CONFIG_SCHED_BORE +unsigned int sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE; +#else // !CONFIG_SCHED_BORE unsigned int sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_LOG; +#endif // CONFIG_SCHED_BORE /* * Minimal preemption granularity for CPU-bound tasks: * - * (default: 0.70 msec * (1 + ilog(ncpus)), units: nanoseconds) + * BORE : base_slice = minimum multiple of nsecs_per_tick >= min_base_slice + * (default min_base_slice = 2000000 constant, units: nanoseconds) + * EEVDF: default 0.70 msec * (1 + ilog(ncpus)), units: nanoseconds */ +#ifdef CONFIG_SCHED_BORE +static const unsigned int nsecs_per_tick = 1000000000ULL / HZ; +unsigned int sysctl_sched_min_base_slice = CONFIG_MIN_BASE_SLICE_NS; +__read_mostly uint sysctl_sched_base_slice = nsecs_per_tick; +#else // !CONFIG_SCHED_BORE unsigned int sysctl_sched_base_slice = 700000ULL; static unsigned int normalized_sysctl_sched_base_slice = 700000ULL; +#endif // CONFIG_SCHED_BORE __read_mostly unsigned int sysctl_sched_migration_cost = 500000UL; @@ -191,6 +206,13 @@ static inline void update_load_set(struct load_weight *lw, unsigned long w) * * This idea comes from the SD scheduler of Con Kolivas: */ +#ifdef CONFIG_SCHED_BORE +static void update_sysctl(void) { + sysctl_sched_base_slice = nsecs_per_tick * + max(1UL, DIV_ROUND_UP(sysctl_sched_min_base_slice, nsecs_per_tick)); +} +void sched_update_min_base_slice(void) { update_sysctl(); } +#else // !CONFIG_SCHED_BORE static unsigned int get_update_sysctl_factor(void) { unsigned int cpus = min_t(unsigned int, num_online_cpus(), 8); @@ -221,6 +243,7 @@ static void update_sysctl(void) SET_SYSCTL(sched_base_slice); #undef SET_SYSCTL } +#endif // CONFIG_SCHED_BORE void __init sched_init_granularity(void) { @@ -700,6 +723,9 @@ static void update_entity_lag(struct cfs_rq *cfs_rq, struct sched_entity *se) vlag = avg_vruntime(cfs_rq) - se->vruntime; limit = calc_delta_fair(max_t(u64, 2*se->slice, TICK_NSEC), se); +#ifdef CONFIG_SCHED_BORE + limit >>= !!sched_bore; +#endif // CONFIG_SCHED_BORE se->vlag = clamp(vlag, -limit, limit); } @@ -940,6 +966,10 @@ static struct sched_entity *pick_eevdf(struct cfs_rq *cfs_rq) curr = NULL; if (sched_feat(RUN_TO_PARITY) && curr && protect_slice(curr)) +#ifdef CONFIG_SCHED_BORE + if (!(likely(sched_bore) && likely(sched_burst_parity_threshold) && + sched_burst_parity_threshold < cfs_rq->nr_queued)) +#endif // CONFIG_SCHED_BORE return curr; /* Pick the leftmost entity if it's eligible */ @@ -997,6 +1027,7 @@ struct sched_entity *__pick_last_entity(struct cfs_rq *cfs_rq) * Scheduling class statistics methods: */ #ifdef CONFIG_SMP +#if !defined(CONFIG_SCHED_BORE) int sched_update_scaling(void) { unsigned int factor = get_update_sysctl_factor(); @@ -1008,6 +1039,7 @@ int sched_update_scaling(void) return 0; } +#endif // CONFIG_SCHED_BORE #endif static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se); @@ -1237,6 +1269,10 @@ static void update_curr(struct cfs_rq *cfs_rq) if (unlikely(delta_exec <= 0)) return; +#ifdef CONFIG_SCHED_BORE + curr->burst_time += delta_exec; + update_burst_score(curr); +#endif // CONFIG_SCHED_BORE curr->vruntime += calc_delta_fair(delta_exec, curr); resched = update_deadline(cfs_rq, curr); update_min_vruntime(cfs_rq); @@ -3784,13 +3820,22 @@ dequeue_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) { } static void place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags); -static void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, + +#ifdef CONFIG_SCHED_BORE +void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, + unsigned long weight, bool no_update_curr) +#else // !CONFIG_SCHED_BORE +void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, unsigned long weight) +#endif // CONFIG_SCHED_BORE { bool curr = cfs_rq->curr == se; if (se->on_rq) { /* commit outstanding execution time */ +#ifdef CONFIG_SCHED_BORE + if (!no_update_curr) +#endif // CONFIG_SCHED_BORE update_curr(cfs_rq); update_entity_lag(cfs_rq, se); se->deadline -= se->vruntime; @@ -3846,7 +3891,11 @@ static void reweight_task_fair(struct rq *rq, struct task_struct *p, struct cfs_rq *cfs_rq = cfs_rq_of(se); struct load_weight *load = &se->load; +#ifdef CONFIG_SCHED_BORE + reweight_entity(cfs_rq, se, lw->weight, false); +#else // !CONFIG_SCHED_BORE reweight_entity(cfs_rq, se, lw->weight); +#endif // CONFIG_SCHED_BORE load->inv_weight = lw->inv_weight; } @@ -3987,7 +4036,11 @@ static void update_cfs_group(struct sched_entity *se) shares = calc_group_shares(gcfs_rq); #endif if (unlikely(se->load.weight != shares)) +#ifdef CONFIG_SCHED_BORE + reweight_entity(cfs_rq_of(se), se, shares, false); +#else // !CONFIG_SCHED_BORE reweight_entity(cfs_rq_of(se), se, shares); +#endif // CONFIG_SCHED_BORE } #else /* CONFIG_FAIR_GROUP_SCHED */ @@ -5292,7 +5345,11 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) se->rel_deadline = 0; return; } - +#ifdef CONFIG_SCHED_BORE + else if (likely(sched_bore)) + vslice >>= !!(flags & sched_deadline_boost_mask); + else +#endif // CONFIG_SCHED_BORE /* * When joining the competition; the existing tasks will be, * on average, halfway through their slice, as such start tasks @@ -7187,6 +7244,15 @@ static bool dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) util_est_dequeue(&rq->cfs, p); util_est_update(&rq->cfs, p, flags & DEQUEUE_SLEEP); +#ifdef CONFIG_SCHED_BORE + struct cfs_rq *cfs_rq = &rq->cfs; + struct sched_entity *se = &p->se; + if (flags & DEQUEUE_SLEEP && entity_is_task(se)) { + if (cfs_rq->curr == se) + update_curr(cfs_rq); + restart_burst(se); + } +#endif // CONFIG_SCHED_BORE if (dequeue_entities(rq, &p->se, flags) < 0) return false; @@ -9016,16 +9082,25 @@ static void yield_task_fair(struct rq *rq) /* * Are we the only task in the tree? */ +#if !defined(CONFIG_SCHED_BORE) if (unlikely(rq->nr_running == 1)) return; clear_buddies(cfs_rq, se); +#endif // CONFIG_SCHED_BORE update_rq_clock(rq); /* * Update run-time statistics of the 'current'. */ update_curr(cfs_rq); +#ifdef CONFIG_SCHED_BORE + restart_burst_rescale_deadline(se); + if (unlikely(rq->nr_running == 1)) + return; + + clear_buddies(cfs_rq, se); +#endif // CONFIG_SCHED_BORE /* * Tell update_rq_clock() that we've just updated, * so we don't do microscopic update in schedule() @@ -13138,6 +13213,9 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) static void task_fork_fair(struct task_struct *p) { set_task_max_allowed_capacity(p); +#ifdef CONFIG_SCHED_BORE + update_burst_score(&p->se); +#endif // CONFIG_SCHED_BORE } /* @@ -13248,6 +13326,10 @@ static void attach_task_cfs_rq(struct task_struct *p) static void switched_from_fair(struct rq *rq, struct task_struct *p) { + p->se.rel_deadline = 0; +#ifdef CONFIG_SCHED_BORE + reset_task_bore(p); +#endif // CONFIG_SCHED_BORE detach_task_cfs_rq(p); } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 47972f34e..a7c69cfbc 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2100,7 +2100,11 @@ extern int group_balance_cpu(struct sched_group *sg); extern void update_sched_domain_debugfs(void); extern void dirty_sched_domain_sysctl(int cpu); +#ifdef CONFIG_SCHED_BORE +extern void sched_update_min_base_slice(void); +#else // !CONFIG_SCHED_BORE extern int sched_update_scaling(void); +#endif // CONFIG_SCHED_BORE static inline const struct cpumask *task_user_cpus(struct task_struct *p) { @@ -2799,7 +2803,12 @@ extern void wakeup_preempt(struct rq *rq, struct task_struct *p, int flags); extern __read_mostly unsigned int sysctl_sched_nr_migrate; extern __read_mostly unsigned int sysctl_sched_migration_cost; +#ifdef CONFIG_SCHED_BORE +extern unsigned int sysctl_sched_min_base_slice; +extern __read_mostly uint sysctl_sched_base_slice; +#else // !CONFIG_SCHED_BORE extern unsigned int sysctl_sched_base_slice; +#endif // CONFIG_SCHED_BORE extern int sysctl_resched_latency_warn_ms; extern int sysctl_resched_latency_warn_once; -- 2.50.0