Update BORE Scheduler for 6.0/6.1

Signed-off-by: Peter Jung <admin@ptr1337.dev>

Author: ptr1337

6.0/sched/0001-bore.patch

@@ -1,16 +1,17 @@
-From add5124d9192816f1b14404923790b614b867e36 Mon Sep 17 00:00:00 2001
+From 4ab68a791da7b17fc52817b845a460648fe2a684 Mon Sep 17 00:00:00 2001
 From: Peter Jung <admin@ptr1337.dev>
-Date: Sat, 19 Nov 2022 15:53:35 +0100
+Date: Thu, 24 Nov 2022 15:22:26 +0100
 Subject: [PATCH] bore
 
 Signed-off-by: Peter Jung <admin@ptr1337.dev>
 ---
  include/linux/sched.h   |   5 ++
  init/Kconfig            |  21 ++++++++
- kernel/sched/core.c     |  22 ++++++++
+ kernel/sched/core.c     |  29 +++++++++++
+ kernel/sched/debug.c    |   3 ++
  kernel/sched/fair.c     | 112 +++++++++++++++++++++++++++++++++++++++-
  kernel/sched/features.h |   8 +++
- 5 files changed, 166 insertions(+), 2 deletions(-)
+ 6 files changed, 176 insertions(+), 2 deletions(-)
 
 diff --git a/include/linux/sched.h b/include/linux/sched.h
 index 8d82d6d32670..a53340011636 100644
@@ -61,18 +62,19 @@ index 532362fcfe31..d85483488230 100644
  	bool "Automatic process group scheduling"
  	select CGROUPS
 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index ee28253c9ac0..be15ee529bf5 100644
+index ee28253c9ac0..1fb48467329c 100644
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4320,6 +4320,21 @@ int wake_up_state(struct task_struct *p, unsigned int state)
+@@ -4320,6 +4320,22 @@ int wake_up_state(struct task_struct *p, unsigned int state)
  	return try_to_wake_up(p, state, 0);
  }
 
 +#ifdef CONFIG_SCHED_BORE
-+static inline void sched_fork_burst(struct task_struct *p)
++static inline void sched_on_fork_calc_prev_burst_from_siblings(struct task_struct *p)
 +{
 +	struct task_struct *sib;
-+	u64 cnt, sum, avg;
++	u64 sum, avg;
++	u16 cnt;
 +	list_for_each_entry(sib, &p->sibling, sibling) {
 +		cnt++;
 +		sum += sib->se.prev_burst_time;
@@ -86,27 +88,61 @@ index ee28253c9ac0..be15ee529bf5 100644
  /*
   * Perform scheduler related setup for a newly forked process p.
   * p is forked by current.
-@@ -4336,6 +4351,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
+@@ -4336,6 +4352,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
  	p->se.prev_sum_exec_runtime	= 0;
  	p->se.nr_migrations		= 0;
  	p->se.vruntime			= 0;
 +#ifdef CONFIG_SCHED_BORE
-+	sched_fork_burst(p);
++	p->se.burst_time      = 0;
 +#endif // CONFIG_SCHED_BORE
  	INIT_LIST_HEAD(&p->se.group_node);
 
  #ifdef CONFIG_FAIR_GROUP_SCHED
-@@ -9617,6 +9635,10 @@ void __init sched_init(void)
+@@ -4536,6 +4555,9 @@ late_initcall(sched_core_sysctl_init);
+ int sched_fork(unsigned long clone_flags, struct task_struct *p)
+ {
+ 	__sched_fork(clone_flags, p);
++#ifdef CONFIG_SCHED_BORE
++	sched_on_fork_calc_prev_burst_from_siblings(p);
++#endif // CONFIG_SCHED_BORE
+ 	/*
+ 	 * We mark the process as NEW here. This guarantees that
+ 	 * nobody will actually run it, and a signal or other external
+@@ -8947,6 +8969,9 @@ void __init init_idle(struct task_struct *idle, int cpu)
+ 
+ 	idle->__state = TASK_RUNNING;
+ 	idle->se.exec_start = sched_clock();
++#ifdef CONFIG_SCHED_BORE
++	idle->se.prev_burst_time = 0;
++#endif //CONFIG_SCHED_BORE
+ 	/*
+ 	 * PF_KTHREAD should already be set at this point; regardless, make it
+ 	 * look like a proper per-CPU kthread.
+@@ -9617,6 +9642,10 @@ void __init sched_init(void)
  	BUG_ON(&dl_sched_class != &stop_sched_class + 1);
  #endif
 
 +#ifdef CONFIG_SCHED_BORE
-+	printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 1.7.0 by Masahito Suzuki");
++	printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 1.7.1 by Masahito Suzuki");
 +#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 667876da8382..e9f7a9cb02b3 100644
+--- a/kernel/sched/debug.c
++++ b/kernel/sched/debug.c
+@@ -546,6 +546,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
+ #ifdef CONFIG_NUMA_BALANCING
+ 	SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p));
+ #endif
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
 index 914096c5b1ae..fbb362d11e96 100644
 --- a/kernel/sched/fair.c
@@ -342,5 +378,5 @@ index ee7f23c76bd3..3115bde98211 100644
  /*
   * Prefer to schedule the task that ran last (when we did
 -- 
-2.38.1.436.geea7033409
+2.39.0.rc0
 

6.1/sched/0001-bore-cachy.patch

@@ -1,19 +1,20 @@
-From 621f1ecd04cdfbe39b65ff5f83f168b439a2b251 Mon Sep 17 00:00:00 2001
+From f0626f74cee6463884ab30abe77b6f68165cc17a Mon Sep 17 00:00:00 2001
 From: Peter Jung <admin@ptr1337.dev>
-Date: Sat, 19 Nov 2022 15:43:12 +0100
+Date: Thu, 24 Nov 2022 13:48:52 +0100
 Subject: [PATCH] bore-cachy
 
 Signed-off-by: Peter Jung <admin@ptr1337.dev>
 ---
  include/linux/sched.h   |   5 ++
  init/Kconfig            |  21 ++++++++
- kernel/sched/core.c     |  22 ++++++++
+ kernel/sched/core.c     |  29 +++++++++++
+ kernel/sched/debug.c    |   3 ++
  kernel/sched/fair.c     | 112 +++++++++++++++++++++++++++++++++++++++-
  kernel/sched/features.h |   8 +++
- 5 files changed, 166 insertions(+), 2 deletions(-)
+ 6 files changed, 176 insertions(+), 2 deletions(-)
 
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 87eb96123e6c..e1ca07e4f531 100644
+index f601b193bc26..3b748bda6031 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -556,6 +556,11 @@ struct sched_entity {
@@ -61,18 +62,19 @@ index c6d646a27d9a..a58d2919c78c 100644
  	bool "Automatic process group scheduling"
  	select CGROUPS
 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 9ba8821927a5..8e8d0b01fa13 100644
+index d0df2f1fe5a9..99158ac2b614 100644
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4351,6 +4351,21 @@ int wake_up_state(struct task_struct *p, unsigned int state)
+@@ -4369,6 +4369,22 @@ int wake_up_state(struct task_struct *p, unsigned int state)
  	return try_to_wake_up(p, state, 0);
  }
 
 +#ifdef CONFIG_SCHED_BORE
-+static inline void sched_fork_burst(struct task_struct *p)
++static inline void sched_on_fork_calc_prev_burst_from_siblings(struct task_struct *p)
 +{
 +	struct task_struct *sib;
-+	u64 cnt, sum, avg;
++	u64 sum, avg;
++	u16 cnt;
 +	list_for_each_entry(sib, &p->sibling, sibling) {
 +		cnt++;
 +		sum += sib->se.prev_burst_time;
@@ -86,29 +88,63 @@ index 9ba8821927a5..8e8d0b01fa13 100644
  /*
   * Perform scheduler related setup for a newly forked process p.
   * p is forked by current.
-@@ -4367,6 +4382,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
+@@ -4385,6 +4401,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
  	p->se.prev_sum_exec_runtime	= 0;
  	p->se.nr_migrations		= 0;
  	p->se.vruntime			= 0;
 +#ifdef CONFIG_SCHED_BORE
-+	sched_fork_burst(p);
++	p->se.burst_time      = 0;
 +#endif // CONFIG_SCHED_BORE
  	INIT_LIST_HEAD(&p->se.group_node);
  	RB_CLEAR_NODE(&p->se.latency_node);
 
-@@ -9732,6 +9750,10 @@ void __init sched_init(void)
+@@ -4600,6 +4619,9 @@ late_initcall(sched_core_sysctl_init);
+ int sched_fork(unsigned long clone_flags, struct task_struct *p)
+ {
+ 	__sched_fork(clone_flags, p);
++#ifdef CONFIG_SCHED_BORE
++	sched_on_fork_calc_prev_burst_from_siblings(p);
++#endif // CONFIG_SCHED_BORE
+ 	/*
+ 	 * We mark the process as NEW here. This guarantees that
+ 	 * nobody will actually run it, and a signal or other external
+@@ -9083,6 +9105,9 @@ void __init init_idle(struct task_struct *idle, int cpu)
+ 
+ 	idle->__state = TASK_RUNNING;
+ 	idle->se.exec_start = sched_clock();
++#ifdef CONFIG_SCHED_BORE
++	idle->se.prev_burst_time = 0;
++#endif //CONFIG_SCHED_BORE
+ 	/*
+ 	 * PF_KTHREAD should already be set at this point; regardless, make it
+ 	 * look like a proper per-CPU kthread.
+@@ -9750,6 +9775,10 @@ void __init sched_init(void)
  	BUG_ON(&dl_sched_class != &stop_sched_class + 1);
  #endif
 
 +#ifdef CONFIG_SCHED_BORE
-+	printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 1.7.0 by Masahito Suzuki");
++	printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 1.7.1 by Masahito Suzuki");
 +#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 b3922184af91..6c87abccf794 100644
+--- a/kernel/sched/debug.c
++++ b/kernel/sched/debug.c
+@@ -547,6 +547,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
+ #ifdef CONFIG_NUMA_BALANCING
+ 	SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p));
+ #endif
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 16aac664de6b..58a869c637a8 100644
+index e2005697b538..ad450649b52e 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
 @@ -19,6 +19,9 @@
@@ -136,7 +172,7 @@ index 16aac664de6b..58a869c637a8 100644
  int sched_thermal_decay_shift;
  static int __init setup_sched_thermal_decay_shift(char *str)
  {
-@@ -198,6 +209,35 @@ static unsigned int sysctl_sched_cfs_bandwidth_slice		= 5000UL;
+@@ -201,6 +212,35 @@ static unsigned int sysctl_sched_cfs_bandwidth_slice		= 5000UL;
 
  #ifdef CONFIG_SYSCTL
  static struct ctl_table sched_fair_sysctls[] = {
@@ -172,7 +208,7 @@ index 16aac664de6b..58a869c637a8 100644
  	{
  		.procname       = "sched_child_runs_first",
  		.data           = &sysctl_sched_child_runs_first,
-@@ -963,6 +1003,31 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
+@@ -966,6 +1006,31 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
  }
  #endif /* CONFIG_SMP */
 
@@ -204,7 +240,7 @@ index 16aac664de6b..58a869c637a8 100644
  /*
   * Update the current task's runtime statistics.
   */
-@@ -992,6 +1057,13 @@ static void update_curr(struct cfs_rq *cfs_rq)
+@@ -995,6 +1060,13 @@ static void update_curr(struct cfs_rq *cfs_rq)
  	curr->sum_exec_runtime += delta_exec;
  	schedstat_add(cfs_rq->exec_clock, delta_exec);
 
@@ -218,7 +254,7 @@ index 16aac664de6b..58a869c637a8 100644
  	curr->vruntime += calc_delta_fair(delta_exec, curr);
  	update_min_vruntime(cfs_rq);
 
-@@ -5038,6 +5110,11 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
+@@ -5046,6 +5118,11 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
  	se->prev_sum_exec_runtime = se->sum_exec_runtime;
  }
 
@@ -230,7 +266,7 @@ index 16aac664de6b..58a869c637a8 100644
  static int
  wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se);
 
-@@ -5082,7 +5159,13 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+@@ -5090,7 +5167,13 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
  			se = second;
  	}
 
@@ -245,7 +281,7 @@ index 16aac664de6b..58a869c637a8 100644
  		/*
  		 * Someone really wants this to run. If it's not unfair, run it.
  		 */
-@@ -6238,6 +6321,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
+@@ -6376,6 +6459,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
  	util_est_dequeue(&rq->cfs, p);
 
  	for_each_sched_entity(se) {
@@ -255,7 +291,7 @@ index 16aac664de6b..58a869c637a8 100644
  		cfs_rq = cfs_rq_of(se);
  		dequeue_entity(cfs_rq, se, flags);
 
-@@ -7622,7 +7708,12 @@ static unsigned long wakeup_gran(struct sched_entity *se)
+@@ -7760,7 +7846,12 @@ static unsigned long wakeup_gran(struct sched_entity *se)
   *
   */
  static int
@@ -268,7 +304,7 @@ index 16aac664de6b..58a869c637a8 100644
  {
  	s64 gran, vdiff = curr->vruntime - se->vruntime;
  	s64 offset = wakeup_latency_gran(curr, se);
-@@ -7642,12 +7733,21 @@ wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se)
+@@ -7780,12 +7871,21 @@ wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se)
  	 * chance to preempt current.
  	 */
  	gran = min_t(s64, gran, get_latency_max());
@@ -290,7 +326,7 @@ index 16aac664de6b..58a869c637a8 100644
 
  static void set_last_buddy(struct sched_entity *se)
  {
-@@ -7747,7 +7847,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
+@@ -7885,7 +7985,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
  		return;
 
  	update_curr(cfs_rq_of(se));
@@ -304,7 +340,7 @@ index 16aac664de6b..58a869c637a8 100644
  		/*
  		 * Bias pick_next to pick the sched entity that is
  		 * triggering this preemption.
-@@ -7983,6 +8088,9 @@ static void yield_task_fair(struct rq *rq)
+@@ -8121,6 +8226,9 @@ static void yield_task_fair(struct rq *rq)
  	struct task_struct *curr = rq->curr;
  	struct cfs_rq *cfs_rq = task_cfs_rq(curr);
  	struct sched_entity *se = &curr->se;
@@ -343,5 +379,5 @@ index ee7f23c76bd3..3115bde98211 100644
  /*
   * Prefer to schedule the task that ran last (when we did
 -- 
-2.38.1.436.geea7033409
+2.39.0.rc0