sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux510/512/513-tkg: Update cacule patchsets

Browse Source 
This required splitting parts of the glitched base for CFS-only kernels (the patch was common to all schedulers before, even though only CFS was effectively making use of the changes), which were moved to a 0003-glitched-cfs-additions.patch file.

https://github.com/hamadmarri/cacule-cpu-scheduler
This commit is contained in:
Tk-Glitch
2021-07-05 13:21:57 +02:00
parent 35aebf772c
commit 654f290f6c
11 changed files with 515 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PKGBUILD
View File

@@ -59,7 +59,7 @@ else
fi
pkgname=("${pkgbase}" "${pkgbase}-headers")
pkgver="${_basekernel}"."${_sub}"
pkgrel=174
pkgrel=176
pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here
url="http://www.kernel.org/"
@@ -299,6 +299,7 @@ case $_basever in
0002-clear-patches.patch
0003-glitched-base.patch
0003-glitched-cfs.patch
0003-glitched-cfs-additions.patch
0003-cacule-5.10.patch
0004-glitched-ondemand-muqss.patch
0004-glitched-muqss.patch
@@ -326,9 +327,10 @@ case $_basever in
'66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
'35a7cde86fb94939c0f25a62b8c47f3de0dbd3c65f876f460b263181b3e92fc0'
'1ac97da07e72ec7e2b0923d32daacacfaa632a44c714d6942d9f143fe239e1b5'
'a447e697cb744283e3e89f300c8a8bda04a9c8108f03677fb48bf9675c992cbd'
'7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
'5bff350e3463acdddb5d8b2ed1af0b54586500c4b4ee6be1f14744a65b383497'
'e5ea0bb25ee294c655ac3cc30e1eea497799826108fbfb4ef3258c676c1e8a12'
'a1758208827816fe01cf34947b0c07553af40b60d8480292e6918966f362d62a'
'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
'2bbbac963b6ca44ef3f8a71ec7c5cad7d66df860869a73059087ee236775970a'
'e00096244e5cddaa5500d08b5f692fd3f25be9401dfa3b0fc624625ff2f5e198'
@@ -428,6 +430,7 @@ case $_basever in
0002-clear-patches.patch
0003-glitched-base.patch
0003-glitched-cfs.patch
0003-glitched-cfs-additions.patch
0003-cacule-5.12.patch
0004-glitched-ondemand-muqss.patch
0004-glitched-muqss.patch
@@ -458,9 +461,10 @@ case $_basever in
'66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
'35a7cde86fb94939c0f25a62b8c47f3de0dbd3c65f876f460b263181b3e92fc0'
'1ac97da07e72ec7e2b0923d32daacacfaa632a44c714d6942d9f143fe239e1b5'
'a447e697cb744283e3e89f300c8a8bda04a9c8108f03677fb48bf9675c992cbd'
'5efd40c392ece498d2d43d5443e6537c2d9ef7cf9820d5ce80b6577fc5d1a4b2'
'2b0a310f577261ed51b25307720bc57119a9d67bb531291997ba93507a98ede5'
'e5ea0bb25ee294c655ac3cc30e1eea497799826108fbfb4ef3258c676c1e8a12'
'912786eae40b7993ca04ef3eb86e6f03c95d60749819cb2c75260b63c978989c'
'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
'3cdc90f272465c2edb6bac8a3c90f2e098ba8ca73d27e4c0cadf70b7e87641ea'
'c8b0f2a1ef84b192c67b61c5a60426a640d5a83ac55a736929f0c4e6ec7b85f8'
@@ -492,6 +496,7 @@ case $_basever in
0002-clear-patches.patch
0003-glitched-base.patch
0003-glitched-cfs.patch
0003-glitched-cfs-additions.patch
0003-cacule-5.13.patch
0005-glitched-pds.patch
0006-add-acs-overrides_iommu.patch
@@ -515,9 +520,10 @@ case $_basever in
'66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
'35a7cde86fb94939c0f25a62b8c47f3de0dbd3c65f876f460b263181b3e92fc0'
'ef80c354d08f63363d36485b1b77b15f3d36cad1e00edbe13ba89538fbb38146'
'ef48eea194c1c101de0461572eaf311f232fee55c155c52904b20085a92db680'
'5efd40c392ece498d2d43d5443e6537c2d9ef7cf9820d5ce80b6577fc5d1a4b2'
'858ffe05c9f89ad216edacf36c90512f141667a6e13a91b1b6f85ba5b481e129'
'e5ea0bb25ee294c655ac3cc30e1eea497799826108fbfb4ef3258c676c1e8a12'
'97d7f9ebecfe12d3b4be73f530c110936cc9bdc5a08303af09711398b64d418d'
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'9ec679871cba674cf876ba836cde969296ae5034bcc10e1ec39b372e6e07aab0'

2
linux-tkg-config/prepare
View File

@@ -501,6 +501,8 @@ _tkg_srcprep() {
elif [ "${_cpusched}" = "cfs" ]; then
_msg="Applying Glitched CFS patch"
tkgpatch="$srcdir/0003-glitched-cfs.patch" && _tkg_patcher
_msg="Applying Glitched CFS additions patch"
tkgpatch="$srcdir/0003-glitched-cfs-additions.patch" && _tkg_patcher
fi
fi

211
linux-tkg-patches/5.10/0003-cacule-5.10.patch
View File

@@ -96,10 +96,10 @@ index 000000000000..82b0847c468a
+ idle timer scheduler in order to avoid to get into priority
+ inversion problems which would deadlock the machine.
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 76cd21fa5501..0abad9f1247a 100644
index 2660ee4b08ad..ec38de9296f1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -448,10 +448,22 @@ struct sched_statistics {
@@ -456,10 +456,22 @@ struct sched_statistics {
#endif
};
@@ -192,7 +192,7 @@ index 38ef6d06888e..865f8dbddca8 100644
config SCHED_HRTICK
def_bool HIGH_RES_TIMERS
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 57b236251884..6ad7f6f33ed5 100644
index 57b236251884..860b1a747dfb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3068,6 +3068,11 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
@@ -218,7 +218,24 @@ index 57b236251884..6ad7f6f33ed5 100644
activate_task(rq, p, ENQUEUE_NOCLOCK);
trace_sched_wakeup_new(p);
check_preempt_curr(rq, p, WF_FORK);
@@ -7066,6 +7075,10 @@ void __init sched_init(void)
@@ -4073,6 +4082,7 @@ static void sched_tick_remote(struct work_struct *work)
update_rq_clock(rq);
+#if !defined(CONFIG_CACULE_SCHED)
if (!is_idle_task(curr)) {
/*
* Make sure the next tick runs within a reasonable
@@ -4081,6 +4091,8 @@ static void sched_tick_remote(struct work_struct *work)
delta = rq_clock_task(rq) - curr->se.exec_start;
WARN_ON_ONCE(delta > (u64)NSEC_PER_SEC * 3);
}
+#endif
+
curr->sched_class->task_tick(rq, curr, 0);
calc_load_nohz_remote(rq);
@@ -7066,6 +7078,10 @@ void __init sched_init(void)
BUG_ON(&dl_sched_class + 1 != &stop_sched_class);
#endif
@@ -230,7 +247,7 @@ index 57b236251884..6ad7f6f33ed5 100644
#ifdef CONFIG_FAIR_GROUP_SCHED
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 6264584b51c2..bd3901a849c4 100644
index 70a578272436..506c0512610c 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -554,8 +554,11 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
@@ -276,7 +293,7 @@ index 6264584b51c2..bd3901a849c4 100644
cfs_rq->nr_spread_over);
SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 1ad0e52487f6..bfd953e6b871 100644
index d6e1c90de570..f5565f9d303a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -19,6 +19,10 @@
@@ -290,7 +307,19 @@ index 1ad0e52487f6..bfd953e6b871 100644
*/
#include "sched.h"
@@ -113,6 +117,17 @@ int __weak arch_asym_cpu_priority(int cpu)
@@ -82,7 +86,11 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
+#ifdef CONFIG_CACULE_SCHED
+const_debug unsigned int sysctl_sched_migration_cost = 200000UL;
+#else
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
@@ -113,6 +121,17 @@ int __weak arch_asym_cpu_priority(int cpu)
*/
#define fits_capacity(cap, max) ((cap) * 1280 < (max) * 1024)
@@ -308,7 +337,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
#endif
#ifdef CONFIG_CFS_BANDWIDTH
@@ -253,6 +268,14 @@ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight
@@ -253,6 +272,14 @@ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight
const struct sched_class fair_sched_class;
@@ -323,7 +352,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/**************************************************************
* CFS operations on generic schedulable entities:
*/
@@ -512,7 +535,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);
@@ -512,7 +539,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);
/**************************************************************
* Scheduling class tree data structure manipulation methods:
*/
@@ -332,7 +361,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
{
s64 delta = (s64)(vruntime - max_vruntime);
@@ -568,7 +591,170 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
@@ -568,7 +595,204 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
cfs_rq->min_vruntime_copy = cfs_rq->min_vruntime;
#endif
}
@@ -374,12 +403,25 @@ index 1ad0e52487f6..bfd953e6b871 100644
+ return calc_interactivity(sched_clock(), cn) < interactivity_threshold;
+}
+
+static inline int cn_has_idle_policy(struct cacule_node *se)
+{
+ return task_has_idle_policy(task_of(se_of(se)));
+}
+
+static inline int
+entity_before_cached(u64 now, unsigned int score_curr, struct cacule_node *se)
+{
+ unsigned int score_se;
+ int diff;
+
+ /*
+ * if se has idle class, then no need to
+ * calculate, since we are sure that score_curr
+ * is a score for non idle class task
+ */
+ if (cn_has_idle_policy(se))
+ return -1;
+
+ score_se = calc_interactivity(now, se);
+ diff = score_se - score_curr;
+
@@ -400,6 +442,16 @@ index 1ad0e52487f6..bfd953e6b871 100644
+{
+ unsigned int score_curr, score_se;
+ int diff;
+ int is_curr_idle = cn_has_idle_policy(curr);
+ int is_se_idle = cn_has_idle_policy(se);
+
+ /* if curr is normal but se is idle class, then no */
+ if (!is_curr_idle && is_se_idle)
+ return -1;
+
+ /* if curr is idle class and se is normal, then yes */
+ if (is_curr_idle && !is_se_idle)
+ return 1;
+
+ score_curr = calc_interactivity(now, curr);
+ score_se = calc_interactivity(now, se);
@@ -411,7 +463,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
+
+ return -1;
+}
+
+/*
+ * Enqueue an entity
+ */
@@ -421,6 +473,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
+ struct cacule_node *iter, *next = NULL;
+ u64 now = sched_clock();
+ unsigned int score_se = calc_interactivity(now, se);
+ int is_idle_task = cn_has_idle_policy(se);
+
+ se->next = NULL;
+ se->prev = NULL;
@@ -430,6 +483,15 @@ index 1ad0e52487f6..bfd953e6b871 100644
+ // start from tail
+ iter = cfs_rq->tail;
+
+ /*
+ * if this task has idle class, then
+ * push it to the tail right away
+ */
+ if (is_idle_task)
+ goto to_tail;
+
+ /* here we know that this task isn't idle clas */
+
+ // does se have higher IS than iter?
+ while (iter && entity_before_cached(now, score_se, iter) == -1) {
+ next = iter;
@@ -438,6 +500,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
+
+ // se in tail position
+ if (iter == cfs_rq->tail) {
+to_tail:
+ cfs_rq->tail->next = se;
+ se->prev = cfs_rq->tail;
+
@@ -494,7 +557,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
+ next->prev = prev;
+ }
+}
+
+struct sched_entity *__pick_first_entity(struct cfs_rq *cfs_rq)
+{
+ return se_of(cfs_rq->head);
@@ -503,7 +566,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Enqueue an entity into the rb-tree:
*/
@@ -626,16 +812,24 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
@@ -626,16 +850,24 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
return rb_entry(next, struct sched_entity, run_node);
}
@@ -528,7 +591,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
}
/**************************************************************
@@ -730,6 +924,7 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -730,6 +962,7 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
return slice;
}
@@ -536,7 +599,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* We calculate the vruntime slice of a to-be-inserted task.
*
@@ -739,6 +934,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -739,6 +972,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
{
return calc_delta_fair(sched_slice(cfs_rq, se), se);
}
@@ -544,7 +607,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
#include "pelt.h"
#ifdef CONFIG_SMP
@@ -846,14 +1042,51 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
@@ -846,14 +1080,51 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
}
#endif /* CONFIG_SMP */
@@ -596,7 +659,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (unlikely(!curr))
return;
@@ -870,8 +1103,15 @@ static void update_curr(struct cfs_rq *cfs_rq)
@@ -870,8 +1141,15 @@ static void update_curr(struct cfs_rq *cfs_rq)
curr->sum_exec_runtime += delta_exec;
schedstat_add(cfs_rq->exec_clock, delta_exec);
@@ -612,7 +675,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (entity_is_task(curr)) {
struct task_struct *curtask = task_of(curr);
@@ -1030,7 +1270,6 @@ update_stats_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -1030,7 +1308,6 @@ update_stats_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
static inline void
update_stats_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
{
@@ -620,7 +683,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (!schedstat_enabled())
return;
@@ -1062,7 +1301,11 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -1062,7 +1339,11 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se)
/*
* We are starting a new run period:
*/
@@ -632,7 +695,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
}
/**************************************************
@@ -4123,7 +4366,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) {}
@@ -4129,7 +4410,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) {}
static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
{
@@ -641,7 +704,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
s64 d = se->vruntime - cfs_rq->min_vruntime;
if (d < 0)
@@ -4134,6 +4377,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4140,6 +4421,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
#endif
}
@@ -649,7 +712,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static void
place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
{
@@ -4165,6 +4409,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
@@ -4171,6 +4453,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
/* ensure we never gain time by being placed backwards. */
se->vruntime = max_vruntime(se->vruntime, vruntime);
}
@@ -657,7 +720,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static void check_enqueue_throttle(struct cfs_rq *cfs_rq);
@@ -4223,18 +4468,23 @@ static inline bool cfs_bandwidth_used(void);
@@ -4229,18 +4512,23 @@ static inline bool cfs_bandwidth_used(void);
static void
enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
{
@@ -681,7 +744,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Otherwise, renormalise after, such that we're placed at the current
* moment in time, instead of some random moment in the past. Being
@@ -4243,6 +4493,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4249,6 +4537,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if (renorm && !curr)
se->vruntime += cfs_rq->min_vruntime;
@@ -689,7 +752,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* When enqueuing a sched_entity, we must:
@@ -4257,8 +4508,10 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4263,8 +4552,10 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
update_cfs_group(se);
account_entity_enqueue(cfs_rq, se);
@@ -700,7 +763,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
check_schedstat_required();
update_stats_enqueue(cfs_rq, se, flags);
@@ -4279,6 +4532,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4285,6 +4576,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
check_enqueue_throttle(cfs_rq);
}
@@ -708,7 +771,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static void __clear_buddies_last(struct sched_entity *se)
{
for_each_sched_entity(se) {
@@ -4323,6 +4577,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4329,6 +4621,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
if (cfs_rq->skip == se)
__clear_buddies_skip(se);
}
@@ -716,7 +779,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);
@@ -4347,13 +4602,16 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4353,13 +4646,16 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
update_stats_dequeue(cfs_rq, se, flags);
@@ -733,7 +796,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Normalize after update_curr(); which will also have moved
* min_vruntime if @se is the one holding it back. But before doing
@@ -4362,12 +4620,14 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4368,12 +4664,14 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if (!(flags & DEQUEUE_SLEEP))
se->vruntime -= cfs_rq->min_vruntime;
@@ -748,7 +811,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Now advance min_vruntime if @se was the entity holding it back,
* except when: DEQUEUE_SAVE && !DEQUEUE_MOVE, in this case we'll be
@@ -4376,8 +4636,21 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4382,8 +4680,21 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if ((flags & (DEQUEUE_SAVE | DEQUEUE_MOVE)) != DEQUEUE_SAVE)
update_min_vruntime(cfs_rq);
@@ -770,7 +833,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Preempt the current task with a newly woken task if needed:
*/
@@ -4417,6 +4690,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -4423,6 +4734,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
if (delta > ideal_runtime)
resched_curr(rq_of(cfs_rq));
}
@@ -778,7 +841,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static void
set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4451,6 +4725,21 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4457,6 +4769,21 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
se->prev_sum_exec_runtime = se->sum_exec_runtime;
}
@@ -800,7 +863,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static int
wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se);
@@ -4511,6 +4800,7 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -4517,6 +4844,7 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
return se;
}
@@ -808,7 +871,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static bool check_cfs_rq_runtime(struct cfs_rq *cfs_rq);
@@ -5604,7 +5894,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -5610,7 +5938,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
hrtick_update(rq);
}
@@ -818,7 +881,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* The dequeue_task method is called before nr_running is
@@ -5636,12 +5928,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -5642,12 +5972,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
if (cfs_rq->load.weight) {
/* Avoid re-evaluating load for this entity: */
se = parent_entity(se);
@@ -833,7 +896,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
break;
}
flags |= DEQUEUE_SLEEP;
@@ -5757,6 +6051,7 @@ static unsigned long capacity_of(int cpu)
@@ -5763,6 +6095,7 @@ static unsigned long capacity_of(int cpu)
return cpu_rq(cpu)->cpu_capacity;
}
@@ -841,7 +904,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static void record_wakee(struct task_struct *p)
{
/*
@@ -5803,6 +6098,7 @@ static int wake_wide(struct task_struct *p)
@@ -5809,6 +6142,7 @@ static int wake_wide(struct task_struct *p)
return 0;
return 1;
}
@@ -849,7 +912,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* The purpose of wake_affine() is to quickly determine on which CPU we can run
@@ -6479,6 +6775,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p)
@@ -6485,6 +6819,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p)
return min_t(unsigned long, util, capacity_orig_of(cpu));
}
@@ -857,7 +920,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Predicts what cpu_util(@cpu) would return if @p was migrated (and enqueued)
* to @dst_cpu.
@@ -6712,6 +7009,57 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
@@ -6718,6 +7053,57 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
return -1;
}
@@ -915,7 +978,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* select_task_rq_fair: Select target runqueue for the waking task in domains
@@ -6734,6 +7082,26 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
@@ -6740,6 +7126,26 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
int want_affine = 0;
int sync = (wake_flags & WF_SYNC) && !(current->flags & PF_EXITING);
@@ -942,7 +1005,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (sd_flag & SD_BALANCE_WAKE) {
record_wakee(p);
@@ -6746,6 +7114,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
@@ -6752,6 +7158,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
want_affine = !wake_wide(p) && cpumask_test_cpu(cpu, p->cpus_ptr);
}
@@ -950,7 +1013,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
rcu_read_lock();
for_each_domain(cpu, tmp) {
@@ -6793,6 +7162,7 @@ static void detach_entity_cfs_rq(struct sched_entity *se);
@@ -6799,6 +7206,7 @@ static void detach_entity_cfs_rq(struct sched_entity *se);
*/
static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
{
@@ -958,7 +1021,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* As blocked tasks retain absolute vruntime the migration needs to
* deal with this by subtracting the old and adding the new
@@ -6818,6 +7188,7 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
@@ -6824,6 +7232,7 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
se->vruntime -= min_vruntime;
}
@@ -966,7 +1029,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (p->on_rq == TASK_ON_RQ_MIGRATING) {
/*
@@ -6863,6 +7234,7 @@ balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
@@ -6869,6 +7278,7 @@ balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
}
#endif /* CONFIG_SMP */
@@ -974,7 +1037,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static unsigned long wakeup_gran(struct sched_entity *se)
{
unsigned long gran = sysctl_sched_wakeup_granularity;
@@ -6941,6 +7313,7 @@ static void set_skip_buddy(struct sched_entity *se)
@@ -6947,6 +7357,7 @@ static void set_skip_buddy(struct sched_entity *se)
for_each_sched_entity(se)
cfs_rq_of(se)->skip = se;
}
@@ -982,7 +1045,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Preempt the current task with a newly woken task if needed:
@@ -6949,9 +7322,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -6955,9 +7366,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
{
struct task_struct *curr = rq->curr;
struct sched_entity *se = &curr->se, *pse = &p->se;
@@ -995,7 +1058,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (unlikely(se == pse))
return;
@@ -6965,10 +7341,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -6971,10 +7385,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (unlikely(throttled_hierarchy(cfs_rq_of(pse))))
return;
@@ -1008,7 +1071,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* We can come here with TIF_NEED_RESCHED already set from new task
@@ -6998,6 +7376,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7004,6 +7420,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
find_matching_se(&se, &pse);
update_curr(cfs_rq_of(se));
BUG_ON(!pse);
@@ -1020,7 +1083,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (wakeup_preempt_entity(se, pse) == 1) {
/*
* Bias pick_next to pick the sched entity that is
@@ -7007,11 +7390,14 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7013,11 +7434,14 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
set_next_buddy(pse);
goto preempt;
}
@@ -1035,7 +1098,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Only set the backward buddy when the current task is still
* on the rq. This can happen when a wakeup gets interleaved
@@ -7026,6 +7412,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7032,6 +7456,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (sched_feat(LAST_BUDDY) && scale && entity_is_task(se))
set_last_buddy(se);
@@ -1043,7 +1106,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
}
struct task_struct *
@@ -7200,7 +7587,10 @@ static void yield_task_fair(struct rq *rq)
@@ -7206,7 +7631,10 @@ static void yield_task_fair(struct rq *rq)
{
struct task_struct *curr = rq->curr;
struct cfs_rq *cfs_rq = task_cfs_rq(curr);
@@ -1054,7 +1117,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Are we the only task in the tree?
@@ -7208,7 +7598,9 @@ static void yield_task_fair(struct rq *rq)
@@ -7214,7 +7642,9 @@ static void yield_task_fair(struct rq *rq)
if (unlikely(rq->nr_running == 1))
return;
@@ -1064,7 +1127,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (curr->policy != SCHED_BATCH) {
update_rq_clock(rq);
@@ -7224,7 +7616,9 @@ static void yield_task_fair(struct rq *rq)
@@ -7230,7 +7660,9 @@ static void yield_task_fair(struct rq *rq)
rq_clock_skip_update(rq);
}
@@ -1074,7 +1137,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
}
static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
@@ -7235,8 +7629,10 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
@@ -7241,8 +7673,10 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
if (!se->on_rq || throttled_hierarchy(cfs_rq_of(se)))
return false;
@@ -1085,7 +1148,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
yield_task_fair(rq);
@@ -7464,6 +7860,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
@@ -7470,6 +7904,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
if (env->sd->flags & SD_SHARE_CPUCAPACITY)
return 0;
@@ -1093,7 +1156,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Buddy candidates are cache hot:
*/
@@ -7471,6 +7868,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
@@ -7477,6 +7912,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
(&p->se == cfs_rq_of(&p->se)->next ||
&p->se == cfs_rq_of(&p->se)->last))
return 1;
@@ -1101,7 +1164,31 @@ index 1ad0e52487f6..bfd953e6b871 100644
if (sysctl_sched_migration_cost == -1)
return 1;
@@ -10742,11 +11140,30 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
@@ -10513,9 +10949,11 @@ static void nohz_newidle_balance(struct rq *this_rq)
if (!housekeeping_cpu(this_cpu, HK_FLAG_SCHED))
return;
+#if !defined(CONFIG_CACULE_SCHED)
/* Will wake up very soon. No time for doing anything else*/
if (this_rq->avg_idle < sysctl_sched_migration_cost)
return;
+#endif
/* Don't need to update blocked load of idle CPUs*/
if (!READ_ONCE(nohz.has_blocked) ||
@@ -10583,7 +11021,10 @@ static int newidle_balance(struct rq *this_rq, struct rq_flags *rf)
*/
rq_unpin_lock(this_rq, rf);
- if (this_rq->avg_idle < sysctl_sched_migration_cost ||
+ if (
+#if !defined(CONFIG_CACULE_SCHED)
+ this_rq->avg_idle < sysctl_sched_migration_cost ||
+#endif
!READ_ONCE(this_rq->rd->overload)) {
rcu_read_lock();
@@ -10748,11 +11189,30 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
update_overutilized_status(task_rq(curr));
}
@@ -1132,7 +1219,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
static void task_fork_fair(struct task_struct *p)
{
struct cfs_rq *cfs_rq;
@@ -10777,6 +11194,7 @@ static void task_fork_fair(struct task_struct *p)
@@ -10783,6 +11243,7 @@ static void task_fork_fair(struct task_struct *p)
se->vruntime -= cfs_rq->min_vruntime;
rq_unlock(rq, &rf);
}
@@ -1140,7 +1227,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
/*
* Priority of the task has changed. Check to see if we preempt
@@ -10895,6 +11313,8 @@ static void attach_entity_cfs_rq(struct sched_entity *se)
@@ -10901,6 +11362,8 @@ static void attach_entity_cfs_rq(struct sched_entity *se)
static void detach_task_cfs_rq(struct task_struct *p)
{
struct sched_entity *se = &p->se;
@@ -1149,7 +1236,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
struct cfs_rq *cfs_rq = cfs_rq_of(se);
if (!vruntime_normalized(p)) {
@@ -10905,6 +11325,7 @@ static void detach_task_cfs_rq(struct task_struct *p)
@@ -10911,6 +11374,7 @@ static void detach_task_cfs_rq(struct task_struct *p)
place_entity(cfs_rq, se, 0);
se->vruntime -= cfs_rq->min_vruntime;
}
@@ -1157,7 +1244,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
detach_entity_cfs_rq(se);
}
@@ -10912,12 +11333,17 @@ static void detach_task_cfs_rq(struct task_struct *p)
@@ -10918,12 +11382,17 @@ static void detach_task_cfs_rq(struct task_struct *p)
static void attach_task_cfs_rq(struct task_struct *p)
{
struct sched_entity *se = &p->se;
@@ -1175,7 +1262,7 @@ index 1ad0e52487f6..bfd953e6b871 100644
}
static void switched_from_fair(struct rq *rq, struct task_struct *p)
@@ -10973,13 +11399,22 @@ static void set_next_task_fair(struct rq *rq, struct task_struct *p, bool first)
@@ -10979,13 +11448,22 @@ static void set_next_task_fair(struct rq *rq, struct task_struct *p, bool first)
void init_cfs_rq(struct cfs_rq *cfs_rq)
{
cfs_rq->tasks_timeline = RB_ROOT_CACHED;

18
linux-tkg-patches/5.10/0003-glitched-base.patch
View File

@@ -275,24 +275,6 @@ index 6b3b59cc51d6..2a0072192c3d 100644
/*
* After fork, child runs first. If set to 0 (default) then
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
*
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
*/
+#ifdef CONFIG_ZENIFY
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
+
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
+#else
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
@@ -128,8 +149,12 @@ int __weak arch_asym_cpu_priority(int cpu)
*
* (default: 5 msec, units: microseconds)

22
linux-tkg-patches/5.10/0003-glitched-cfs-additions.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 6b3b59cc51d6..2a0072192c3d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
*
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
*/
+#ifdef CONFIG_ZENIFY
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
+
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
+#else
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)

190
linux-tkg-patches/5.12/0003-cacule-5.12.patch
View File

@@ -96,10 +96,10 @@ index 000000000000..82b0847c468a
+ idle timer scheduler in order to avoid to get into priority
+ inversion problems which would deadlock the machine.
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ef00bb22164c..833c01b9ffd9 100644
index edc01bcefbfd..9e16c9dd3d78 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -450,10 +450,22 @@ struct sched_statistics {
@@ -458,10 +458,22 @@ struct sched_statistics {
#endif
};
@@ -230,7 +230,7 @@ index 814200541f8f..353f88cd05ca 100644
#ifdef CONFIG_FAIR_GROUP_SCHED
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 9c8b3ed2199a..6542bd142365 100644
index 9e0a915e6eb8..77ac9cd82113 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -554,8 +554,11 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
@@ -276,7 +276,7 @@ index 9c8b3ed2199a..6542bd142365 100644
cfs_rq->nr_spread_over);
SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index a073a839cd06..0da02e108674 100644
index 47fcc3fe9dc5..c0a60cc8d9ce 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -19,6 +19,10 @@
@@ -290,7 +290,19 @@ index a073a839cd06..0da02e108674 100644
*/
#include "sched.h"
@@ -113,6 +117,17 @@ int __weak arch_asym_cpu_priority(int cpu)
@@ -82,7 +86,11 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
+#ifdef CONFIG_CACULE_SCHED
+const_debug unsigned int sysctl_sched_migration_cost = 200000UL;
+#else
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
@@ -113,6 +121,17 @@ int __weak arch_asym_cpu_priority(int cpu)
*/
#define fits_capacity(cap, max) ((cap) * 1280 < (max) * 1024)
@@ -308,7 +320,7 @@ index a073a839cd06..0da02e108674 100644
#endif
#ifdef CONFIG_CFS_BANDWIDTH
@@ -253,6 +268,14 @@ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight
@@ -253,6 +272,14 @@ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight
const struct sched_class fair_sched_class;
@@ -323,7 +335,7 @@ index a073a839cd06..0da02e108674 100644
/**************************************************************
* CFS operations on generic schedulable entities:
*/
@@ -512,7 +535,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);
@@ -512,7 +539,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);
/**************************************************************
* Scheduling class tree data structure manipulation methods:
*/
@@ -332,7 +344,7 @@ index a073a839cd06..0da02e108674 100644
static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
{
s64 delta = (s64)(vruntime - max_vruntime);
@@ -575,7 +598,170 @@ static inline bool __entity_less(struct rb_node *a, const struct rb_node *b)
@@ -575,7 +602,204 @@ static inline bool __entity_less(struct rb_node *a, const struct rb_node *b)
{
return entity_before(__node_2_se(a), __node_2_se(b));
}
@@ -374,12 +386,25 @@ index a073a839cd06..0da02e108674 100644
+ return calc_interactivity(sched_clock(), cn) < interactivity_threshold;
+}
+
+static inline int cn_has_idle_policy(struct cacule_node *se)
+{
+ return task_has_idle_policy(task_of(se_of(se)));
+}
+
+static inline int
+entity_before_cached(u64 now, unsigned int score_curr, struct cacule_node *se)
+{
+ unsigned int score_se;
+ int diff;
+
+ /*
+ * if se has idle class, then no need to
+ * calculate, since we are sure that score_curr
+ * is a score for non idle class task
+ */
+ if (cn_has_idle_policy(se))
+ return -1;
+
+ score_se = calc_interactivity(now, se);
+ diff = score_se - score_curr;
+
@@ -400,6 +425,16 @@ index a073a839cd06..0da02e108674 100644
+{
+ unsigned int score_curr, score_se;
+ int diff;
+ int is_curr_idle = cn_has_idle_policy(curr);
+ int is_se_idle = cn_has_idle_policy(se);
+
+ /* if curr is normal but se is idle class, then no */
+ if (!is_curr_idle && is_se_idle)
+ return -1;
+
+ /* if curr is idle class and se is normal, then yes */
+ if (is_curr_idle && !is_se_idle)
+ return 1;
+
+ score_curr = calc_interactivity(now, curr);
+ score_se = calc_interactivity(now, se);
@@ -411,7 +446,7 @@ index a073a839cd06..0da02e108674 100644
+
+ return -1;
+}
+
+/*
+ * Enqueue an entity
+ */
@@ -421,6 +456,7 @@ index a073a839cd06..0da02e108674 100644
+ struct cacule_node *iter, *next = NULL;
+ u64 now = sched_clock();
+ unsigned int score_se = calc_interactivity(now, se);
+ int is_idle_task = cn_has_idle_policy(se);
+
+ se->next = NULL;
+ se->prev = NULL;
@@ -430,6 +466,15 @@ index a073a839cd06..0da02e108674 100644
+ // start from tail
+ iter = cfs_rq->tail;
+
+ /*
+ * if this task has idle class, then
+ * push it to the tail right away
+ */
+ if (is_idle_task)
+ goto to_tail;
+
+ /* here we know that this task isn't idle clas */
+
+ // does se have higher IS than iter?
+ while (iter && entity_before_cached(now, score_se, iter) == -1) {
+ next = iter;
@@ -438,6 +483,7 @@ index a073a839cd06..0da02e108674 100644
+
+ // se in tail position
+ if (iter == cfs_rq->tail) {
+to_tail:
+ cfs_rq->tail->next = se;
+ se->prev = cfs_rq->tail;
+
@@ -494,7 +540,7 @@ index a073a839cd06..0da02e108674 100644
+ next->prev = prev;
+ }
+}
+
+struct sched_entity *__pick_first_entity(struct cfs_rq *cfs_rq)
+{
+ return se_of(cfs_rq->head);
@@ -503,7 +549,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Enqueue an entity into the rb-tree:
*/
@@ -608,16 +794,24 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
@@ -608,16 +832,24 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
return __node_2_se(next);
}
@@ -528,7 +574,7 @@ index a073a839cd06..0da02e108674 100644
}
/**************************************************************
@@ -712,6 +906,7 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -712,6 +944,7 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
return slice;
}
@@ -536,7 +582,7 @@ index a073a839cd06..0da02e108674 100644
/*
* We calculate the vruntime slice of a to-be-inserted task.
*
@@ -721,6 +916,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -721,6 +954,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
{
return calc_delta_fair(sched_slice(cfs_rq, se), se);
}
@@ -544,7 +590,7 @@ index a073a839cd06..0da02e108674 100644
#include "pelt.h"
#ifdef CONFIG_SMP
@@ -828,14 +1024,51 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
@@ -828,14 +1062,51 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
}
#endif /* CONFIG_SMP */
@@ -596,7 +642,7 @@ index a073a839cd06..0da02e108674 100644
if (unlikely(!curr))
return;
@@ -852,8 +1085,15 @@ static void update_curr(struct cfs_rq *cfs_rq)
@@ -852,8 +1123,15 @@ static void update_curr(struct cfs_rq *cfs_rq)
curr->sum_exec_runtime += delta_exec;
schedstat_add(cfs_rq->exec_clock, delta_exec);
@@ -612,7 +658,7 @@ index a073a839cd06..0da02e108674 100644
if (entity_is_task(curr)) {
struct task_struct *curtask = task_of(curr);
@@ -1021,7 +1261,6 @@ update_stats_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -1021,7 +1299,6 @@ update_stats_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
static inline void
update_stats_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
{
@@ -620,7 +666,7 @@ index a073a839cd06..0da02e108674 100644
if (!schedstat_enabled())
return;
@@ -1053,7 +1292,11 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -1053,7 +1330,11 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se)
/*
* We are starting a new run period:
*/
@@ -632,7 +678,7 @@ index a073a839cd06..0da02e108674 100644
}
/**************************************************
@@ -4116,7 +4359,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) {}
@@ -4122,7 +4403,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) {}
static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
{
@@ -641,7 +687,7 @@ index a073a839cd06..0da02e108674 100644
s64 d = se->vruntime - cfs_rq->min_vruntime;
if (d < 0)
@@ -4127,6 +4370,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4133,6 +4414,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
#endif
}
@@ -649,7 +695,7 @@ index a073a839cd06..0da02e108674 100644
static void
place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
{
@@ -4158,6 +4402,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
@@ -4164,6 +4446,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
/* ensure we never gain time by being placed backwards. */
se->vruntime = max_vruntime(se->vruntime, vruntime);
}
@@ -657,7 +703,7 @@ index a073a839cd06..0da02e108674 100644
static void check_enqueue_throttle(struct cfs_rq *cfs_rq);
@@ -4216,18 +4461,23 @@ static inline bool cfs_bandwidth_used(void);
@@ -4222,18 +4505,23 @@ static inline bool cfs_bandwidth_used(void);
static void
enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
{
@@ -681,7 +727,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Otherwise, renormalise after, such that we're placed at the current
* moment in time, instead of some random moment in the past. Being
@@ -4236,6 +4486,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4242,6 +4530,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if (renorm && !curr)
se->vruntime += cfs_rq->min_vruntime;
@@ -689,7 +735,7 @@ index a073a839cd06..0da02e108674 100644
/*
* When enqueuing a sched_entity, we must:
@@ -4250,8 +4501,10 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4256,8 +4545,10 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
update_cfs_group(se);
account_entity_enqueue(cfs_rq, se);
@@ -700,7 +746,7 @@ index a073a839cd06..0da02e108674 100644
check_schedstat_required();
update_stats_enqueue(cfs_rq, se, flags);
@@ -4272,6 +4525,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4278,6 +4569,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
check_enqueue_throttle(cfs_rq);
}
@@ -708,7 +754,7 @@ index a073a839cd06..0da02e108674 100644
static void __clear_buddies_last(struct sched_entity *se)
{
for_each_sched_entity(se) {
@@ -4316,6 +4570,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4322,6 +4614,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
if (cfs_rq->skip == se)
__clear_buddies_skip(se);
}
@@ -716,7 +762,7 @@ index a073a839cd06..0da02e108674 100644
static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);
@@ -4340,13 +4595,16 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4346,13 +4639,16 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
update_stats_dequeue(cfs_rq, se, flags);
@@ -733,7 +779,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Normalize after update_curr(); which will also have moved
* min_vruntime if @se is the one holding it back. But before doing
@@ -4355,12 +4613,14 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4361,12 +4657,14 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if (!(flags & DEQUEUE_SLEEP))
se->vruntime -= cfs_rq->min_vruntime;
@@ -748,7 +794,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Now advance min_vruntime if @se was the entity holding it back,
* except when: DEQUEUE_SAVE && !DEQUEUE_MOVE, in this case we'll be
@@ -4369,8 +4629,21 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4375,8 +4673,21 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if ((flags & (DEQUEUE_SAVE | DEQUEUE_MOVE)) != DEQUEUE_SAVE)
update_min_vruntime(cfs_rq);
@@ -770,7 +816,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Preempt the current task with a newly woken task if needed:
*/
@@ -4410,6 +4683,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -4416,6 +4727,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
if (delta > ideal_runtime)
resched_curr(rq_of(cfs_rq));
}
@@ -778,7 +824,7 @@ index a073a839cd06..0da02e108674 100644
static void
set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4444,6 +4718,21 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4450,6 +4762,21 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
se->prev_sum_exec_runtime = se->sum_exec_runtime;
}
@@ -800,7 +846,7 @@ index a073a839cd06..0da02e108674 100644
static int
wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se);
@@ -4504,6 +4793,7 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -4510,6 +4837,7 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
return se;
}
@@ -808,7 +854,7 @@ index a073a839cd06..0da02e108674 100644
static bool check_cfs_rq_runtime(struct cfs_rq *cfs_rq);
@@ -5606,7 +5896,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -5612,7 +5940,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
hrtick_update(rq);
}
@@ -818,7 +864,7 @@ index a073a839cd06..0da02e108674 100644
/*
* The dequeue_task method is called before nr_running is
@@ -5638,12 +5930,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -5644,12 +5974,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
if (cfs_rq->load.weight) {
/* Avoid re-evaluating load for this entity: */
se = parent_entity(se);
@@ -833,7 +879,7 @@ index a073a839cd06..0da02e108674 100644
break;
}
flags |= DEQUEUE_SLEEP;
@@ -5759,6 +6053,7 @@ static unsigned long capacity_of(int cpu)
@@ -5765,6 +6097,7 @@ static unsigned long capacity_of(int cpu)
return cpu_rq(cpu)->cpu_capacity;
}
@@ -841,7 +887,7 @@ index a073a839cd06..0da02e108674 100644
static void record_wakee(struct task_struct *p)
{
/*
@@ -5805,6 +6100,7 @@ static int wake_wide(struct task_struct *p)
@@ -5811,6 +6144,7 @@ static int wake_wide(struct task_struct *p)
return 0;
return 1;
}
@@ -849,7 +895,7 @@ index a073a839cd06..0da02e108674 100644
/*
* The purpose of wake_affine() is to quickly determine on which CPU we can run
@@ -6507,6 +6803,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p)
@@ -6513,6 +6847,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p)
return min_t(unsigned long, util, capacity_orig_of(cpu));
}
@@ -857,7 +903,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Predicts what cpu_util(@cpu) would return if @p was migrated (and enqueued)
* to @dst_cpu.
@@ -6756,6 +7053,57 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
@@ -6762,6 +7097,57 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
return -1;
}
@@ -915,7 +961,7 @@ index a073a839cd06..0da02e108674 100644
/*
* select_task_rq_fair: Select target runqueue for the waking task in domains
@@ -6780,6 +7128,26 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
@@ -6786,6 +7172,26 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
/* SD_flags and WF_flags share the first nibble */
int sd_flag = wake_flags & 0xF;
@@ -942,7 +988,7 @@ index a073a839cd06..0da02e108674 100644
if (wake_flags & WF_TTWU) {
record_wakee(p);
@@ -6792,6 +7160,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
@@ -6798,6 +7204,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
want_affine = !wake_wide(p) && cpumask_test_cpu(cpu, p->cpus_ptr);
}
@@ -950,7 +996,7 @@ index a073a839cd06..0da02e108674 100644
rcu_read_lock();
for_each_domain(cpu, tmp) {
@@ -6838,6 +7207,7 @@ static void detach_entity_cfs_rq(struct sched_entity *se);
@@ -6844,6 +7251,7 @@ static void detach_entity_cfs_rq(struct sched_entity *se);
*/
static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
{
@@ -958,7 +1004,7 @@ index a073a839cd06..0da02e108674 100644
/*
* As blocked tasks retain absolute vruntime the migration needs to
* deal with this by subtracting the old and adding the new
@@ -6863,6 +7233,7 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
@@ -6869,6 +7277,7 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
se->vruntime -= min_vruntime;
}
@@ -966,7 +1012,7 @@ index a073a839cd06..0da02e108674 100644
if (p->on_rq == TASK_ON_RQ_MIGRATING) {
/*
@@ -6908,6 +7279,7 @@ balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
@@ -6914,6 +7323,7 @@ balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
}
#endif /* CONFIG_SMP */
@@ -974,7 +1020,7 @@ index a073a839cd06..0da02e108674 100644
static unsigned long wakeup_gran(struct sched_entity *se)
{
unsigned long gran = sysctl_sched_wakeup_granularity;
@@ -6986,6 +7358,7 @@ static void set_skip_buddy(struct sched_entity *se)
@@ -6992,6 +7402,7 @@ static void set_skip_buddy(struct sched_entity *se)
for_each_sched_entity(se)
cfs_rq_of(se)->skip = se;
}
@@ -982,7 +1028,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Preempt the current task with a newly woken task if needed:
@@ -6994,9 +7367,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7000,9 +7411,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
{
struct task_struct *curr = rq->curr;
struct sched_entity *se = &curr->se, *pse = &p->se;
@@ -995,7 +1041,7 @@ index a073a839cd06..0da02e108674 100644
if (unlikely(se == pse))
return;
@@ -7010,10 +7386,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7016,10 +7430,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (unlikely(throttled_hierarchy(cfs_rq_of(pse))))
return;
@@ -1008,7 +1054,7 @@ index a073a839cd06..0da02e108674 100644
/*
* We can come here with TIF_NEED_RESCHED already set from new task
@@ -7043,6 +7421,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7049,6 +7465,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
find_matching_se(&se, &pse);
update_curr(cfs_rq_of(se));
BUG_ON(!pse);
@@ -1020,7 +1066,7 @@ index a073a839cd06..0da02e108674 100644
if (wakeup_preempt_entity(se, pse) == 1) {
/*
* Bias pick_next to pick the sched entity that is
@@ -7052,11 +7435,14 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7058,11 +7479,14 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
set_next_buddy(pse);
goto preempt;
}
@@ -1035,7 +1081,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Only set the backward buddy when the current task is still
* on the rq. This can happen when a wakeup gets interleaved
@@ -7071,6 +7457,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7077,6 +7501,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (sched_feat(LAST_BUDDY) && scale && entity_is_task(se))
set_last_buddy(se);
@@ -1043,7 +1089,7 @@ index a073a839cd06..0da02e108674 100644
}
struct task_struct *
@@ -7245,7 +7632,10 @@ static void yield_task_fair(struct rq *rq)
@@ -7251,7 +7676,10 @@ static void yield_task_fair(struct rq *rq)
{
struct task_struct *curr = rq->curr;
struct cfs_rq *cfs_rq = task_cfs_rq(curr);
@@ -1054,7 +1100,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Are we the only task in the tree?
@@ -7253,7 +7643,9 @@ static void yield_task_fair(struct rq *rq)
@@ -7259,7 +7687,9 @@ static void yield_task_fair(struct rq *rq)
if (unlikely(rq->nr_running == 1))
return;
@@ -1064,7 +1110,7 @@ index a073a839cd06..0da02e108674 100644
if (curr->policy != SCHED_BATCH) {
update_rq_clock(rq);
@@ -7269,7 +7661,9 @@ static void yield_task_fair(struct rq *rq)
@@ -7275,7 +7705,9 @@ static void yield_task_fair(struct rq *rq)
rq_clock_skip_update(rq);
}
@@ -1074,7 +1120,7 @@ index a073a839cd06..0da02e108674 100644
}
static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
@@ -7280,8 +7674,10 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
@@ -7286,8 +7718,10 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
if (!se->on_rq || throttled_hierarchy(cfs_rq_of(se)))
return false;
@@ -1085,7 +1131,7 @@ index a073a839cd06..0da02e108674 100644
yield_task_fair(rq);
@@ -7509,6 +7905,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
@@ -7515,6 +7949,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
if (env->sd->flags & SD_SHARE_CPUCAPACITY)
return 0;
@@ -1093,7 +1139,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Buddy candidates are cache hot:
*/
@@ -7516,6 +7913,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
@@ -7522,6 +7957,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
(&p->se == cfs_rq_of(&p->se)->next ||
&p->se == cfs_rq_of(&p->se)->last))
return 1;
@@ -1101,7 +1147,31 @@ index a073a839cd06..0da02e108674 100644
if (sysctl_sched_migration_cost == -1)
return 1;
@@ -10817,11 +11215,30 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
@@ -10585,9 +11021,11 @@ static void nohz_newidle_balance(struct rq *this_rq)
if (!housekeeping_cpu(this_cpu, HK_FLAG_SCHED))
return;
+#if !defined(CONFIG_CACULE_SCHED)
/* Will wake up very soon. No time for doing anything else*/
if (this_rq->avg_idle < sysctl_sched_migration_cost)
return;
+#endif
/* Don't need to update blocked load of idle CPUs*/
if (!READ_ONCE(nohz.has_blocked) ||
@@ -10655,7 +11093,10 @@ static int newidle_balance(struct rq *this_rq, struct rq_flags *rf)
*/
rq_unpin_lock(this_rq, rf);
- if (this_rq->avg_idle < sysctl_sched_migration_cost ||
+ if (
+#if !defined(CONFIG_CACULE_SCHED)
+ this_rq->avg_idle < sysctl_sched_migration_cost ||
+#endif
!READ_ONCE(this_rq->rd->overload)) {
rcu_read_lock();
@@ -10823,11 +11264,30 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
update_overutilized_status(task_rq(curr));
}
@@ -1132,7 +1202,7 @@ index a073a839cd06..0da02e108674 100644
static void task_fork_fair(struct task_struct *p)
{
struct cfs_rq *cfs_rq;
@@ -10852,6 +11269,7 @@ static void task_fork_fair(struct task_struct *p)
@@ -10858,6 +11318,7 @@ static void task_fork_fair(struct task_struct *p)
se->vruntime -= cfs_rq->min_vruntime;
rq_unlock(rq, &rf);
}
@@ -1140,7 +1210,7 @@ index a073a839cd06..0da02e108674 100644
/*
* Priority of the task has changed. Check to see if we preempt
@@ -10970,6 +11388,8 @@ static void attach_entity_cfs_rq(struct sched_entity *se)
@@ -10976,6 +11437,8 @@ static void attach_entity_cfs_rq(struct sched_entity *se)
static void detach_task_cfs_rq(struct task_struct *p)
{
struct sched_entity *se = &p->se;
@@ -1149,7 +1219,7 @@ index a073a839cd06..0da02e108674 100644
struct cfs_rq *cfs_rq = cfs_rq_of(se);
if (!vruntime_normalized(p)) {
@@ -10980,6 +11400,7 @@ static void detach_task_cfs_rq(struct task_struct *p)
@@ -10986,6 +11449,7 @@ static void detach_task_cfs_rq(struct task_struct *p)
place_entity(cfs_rq, se, 0);
se->vruntime -= cfs_rq->min_vruntime;
}
@@ -1157,7 +1227,7 @@ index a073a839cd06..0da02e108674 100644
detach_entity_cfs_rq(se);
}
@@ -10987,12 +11408,17 @@ static void detach_task_cfs_rq(struct task_struct *p)
@@ -10993,12 +11457,17 @@ static void detach_task_cfs_rq(struct task_struct *p)
static void attach_task_cfs_rq(struct task_struct *p)
{
struct sched_entity *se = &p->se;
@@ -1175,7 +1245,7 @@ index a073a839cd06..0da02e108674 100644
}
static void switched_from_fair(struct rq *rq, struct task_struct *p)
@@ -11048,13 +11474,22 @@ static void set_next_task_fair(struct rq *rq, struct task_struct *p, bool first)
@@ -11054,13 +11523,22 @@ static void set_next_task_fair(struct rq *rq, struct task_struct *p, bool first)
void init_cfs_rq(struct cfs_rq *cfs_rq)
{
cfs_rq->tasks_timeline = RB_ROOT_CACHED;

18
linux-tkg-patches/5.12/0003-glitched-base.patch
View File

@@ -275,24 +275,6 @@ index 6b3b59cc51d6..2a0072192c3d 100644
/*
* After fork, child runs first. If set to 0 (default) then
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
*
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
*/
+#ifdef CONFIG_ZENIFY
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
+
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
+#else
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
@@ -128,8 +149,12 @@ int __weak arch_asym_cpu_priority(int cpu)
*
* (default: 5 msec, units: microseconds)

22
linux-tkg-patches/5.12/0003-glitched-cfs-additions.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 6b3b59cc51d6..2a0072192c3d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
*
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
*/
+#ifdef CONFIG_ZENIFY
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
+
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
+#else
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)

223
linux-tkg-patches/5.13/0003-cacule-5.13.patch
View File

@@ -1,5 +1,5 @@
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index 7ca8df5451d4..fb8e07fce8dd 100644
index 68b21395a743..3f4b9c6911be 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -1088,6 +1088,10 @@ Model available). If your platform happens to meet the
@@ -96,10 +96,10 @@ index 000000000000..82b0847c468a
+ idle timer scheduler in order to avoid to get into priority
+ inversion problems which would deadlock the machine.
diff --git a/include/linux/sched.h b/include/linux/sched.h
index d2c881384517..0be8e440d720 100644
index 32813c345115..d1d5717b2728 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -450,10 +450,22 @@ struct sched_statistics {
@@ -458,10 +458,22 @@ struct sched_statistics {
#endif
};
@@ -140,10 +140,10 @@ index db2c0f34aaaf..5a66fc5826fc 100644
SCHED_TUNABLESCALING_NONE,
SCHED_TUNABLESCALING_LOG,
diff --git a/init/Kconfig b/init/Kconfig
index 1ea12c64e4c9..719c94612548 100644
index a61c92066c2e..089e3bfe5dbc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -833,6 +833,17 @@ config UCLAMP_BUCKETS_COUNT
@@ -834,6 +834,17 @@ config UCLAMP_BUCKETS_COUNT
endmenu
@@ -161,7 +161,7 @@ index 1ea12c64e4c9..719c94612548 100644
#
# For architectures that want to enable the support for NUMA-affine scheduler
# balancing logic:
@@ -1230,6 +1241,7 @@ config SCHED_AUTOGROUP
@@ -1231,6 +1242,7 @@ config SCHED_AUTOGROUP
select CGROUPS
select CGROUP_SCHED
select FAIR_GROUP_SCHED
@@ -192,7 +192,7 @@ index 38ef6d06888e..865f8dbddca8 100644
config SCHED_HRTICK
def_bool HIGH_RES_TIMERS
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 5226cc26a095..8505beec4e99 100644
index 4ca80df205ce..520fb9991e04 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3574,6 +3574,11 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
@@ -218,19 +218,36 @@ index 5226cc26a095..8505beec4e99 100644
activate_task(rq, p, ENQUEUE_NOCLOCK);
trace_sched_wakeup_new(p);
check_preempt_curr(rq, p, WF_FORK);
@@ -8103,6 +8112,10 @@ void __init sched_init(void)
@@ -4690,6 +4699,7 @@ static void sched_tick_remote(struct work_struct *work)
update_rq_clock(rq);
+#if !defined(CONFIG_CACULE_SCHED)
if (!is_idle_task(curr)) {
/*
* Make sure the next tick runs within a reasonable
@@ -4698,6 +4708,8 @@ static void sched_tick_remote(struct work_struct *work)
delta = rq_clock_task(rq) - curr->se.exec_start;
WARN_ON_ONCE(delta > (u64)NSEC_PER_SEC * 3);
}
+#endif
+
curr->sched_class->task_tick(rq, curr, 0);
calc_load_nohz_remote(rq);
@@ -8102,6 +8114,10 @@ void __init sched_init(void)
BUG_ON(&dl_sched_class + 1 != &stop_sched_class);
#endif
+#ifdef CONFIG_CACULE_SCHED
+ printk(KERN_INFO "CacULE CPU scheduler v5.13 by Hamad Al Marri.");
+ printk(KERN_INFO "CacULE CPU scheduler v5.13-r2 by Hamad Al Marri.");
+#endif
+
wait_bit_init();
#ifdef CONFIG_FAIR_GROUP_SCHED
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 9c882f20803e..1af3163f5b73 100644
index c5aacbd492a1..adb021b7da8a 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -560,8 +560,11 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu)
@@ -276,7 +293,7 @@ index 9c882f20803e..1af3163f5b73 100644
cfs_rq->nr_spread_over);
SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 3248e24a90b0..6f66d89d8ba7 100644
index 23663318fb81..162395e3fda2 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -19,9 +19,25 @@
@@ -305,7 +322,19 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Targeted preemption latency for CPU-bound tasks:
*
@@ -263,6 +279,14 @@ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight
@@ -82,7 +98,11 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
+#ifdef CONFIG_CACULE_SCHED
+const_debug unsigned int sysctl_sched_migration_cost = 200000UL;
+#else
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
@@ -263,6 +283,14 @@ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight
const struct sched_class fair_sched_class;
@@ -320,7 +349,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/**************************************************************
* CFS operations on generic schedulable entities:
*/
@@ -522,7 +546,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);
@@ -522,7 +550,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec);
/**************************************************************
* Scheduling class tree data structure manipulation methods:
*/
@@ -329,7 +358,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
{
s64 delta = (s64)(vruntime - max_vruntime);
@@ -585,7 +609,170 @@ static inline bool __entity_less(struct rb_node *a, const struct rb_node *b)
@@ -585,7 +613,204 @@ static inline bool __entity_less(struct rb_node *a, const struct rb_node *b)
{
return entity_before(__node_2_se(a), __node_2_se(b));
}
@@ -371,12 +400,25 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+ return calc_interactivity(sched_clock(), cn) < interactivity_threshold;
+}
+
+static inline int cn_has_idle_policy(struct cacule_node *se)
+{
+ return task_has_idle_policy(task_of(se_of(se)));
+}
+
+static inline int
+entity_before_cached(u64 now, unsigned int score_curr, struct cacule_node *se)
+{
+ unsigned int score_se;
+ int diff;
+
+ /*
+ * if se has idle class, then no need to
+ * calculate, since we are sure that score_curr
+ * is a score for non idle class task
+ */
+ if (cn_has_idle_policy(se))
+ return -1;
+
+ score_se = calc_interactivity(now, se);
+ diff = score_se - score_curr;
+
@@ -397,6 +439,16 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+{
+ unsigned int score_curr, score_se;
+ int diff;
+ int is_curr_idle = cn_has_idle_policy(curr);
+ int is_se_idle = cn_has_idle_policy(se);
+
+ /* if curr is normal but se is idle class, then no */
+ if (!is_curr_idle && is_se_idle)
+ return -1;
+
+ /* if curr is idle class and se is normal, then yes */
+ if (is_curr_idle && !is_se_idle)
+ return 1;
+
+ score_curr = calc_interactivity(now, curr);
+ score_se = calc_interactivity(now, se);
@@ -408,7 +460,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+
+ return -1;
+}
+
+/*
+ * Enqueue an entity
+ */
@@ -418,6 +470,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+ struct cacule_node *iter, *next = NULL;
+ u64 now = sched_clock();
+ unsigned int score_se = calc_interactivity(now, se);
+ int is_idle_task = cn_has_idle_policy(se);
+
+ se->next = NULL;
+ se->prev = NULL;
@@ -427,6 +480,15 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+ // start from tail
+ iter = cfs_rq->tail;
+
+ /*
+ * if this task has idle class, then
+ * push it to the tail right away
+ */
+ if (is_idle_task)
+ goto to_tail;
+
+ /* here we know that this task isn't idle clas */
+
+ // does se have higher IS than iter?
+ while (iter && entity_before_cached(now, score_se, iter) == -1) {
+ next = iter;
@@ -435,6 +497,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+
+ // se in tail position
+ if (iter == cfs_rq->tail) {
+to_tail:
+ cfs_rq->tail->next = se;
+ se->prev = cfs_rq->tail;
+
@@ -491,7 +554,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
+ next->prev = prev;
+ }
+}
+
+struct sched_entity *__pick_first_entity(struct cfs_rq *cfs_rq)
+{
+ return se_of(cfs_rq->head);
@@ -500,7 +563,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Enqueue an entity into the rb-tree:
*/
@@ -618,16 +805,24 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
@@ -618,16 +843,24 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
return __node_2_se(next);
}
@@ -525,7 +588,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
}
/**************************************************************
@@ -717,6 +912,7 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -717,6 +950,7 @@ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se)
return slice;
}
@@ -533,7 +596,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* We calculate the vruntime slice of a to-be-inserted task.
*
@@ -726,6 +922,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -726,6 +960,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se)
{
return calc_delta_fair(sched_slice(cfs_rq, se), se);
}
@@ -541,7 +604,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
#include "pelt.h"
#ifdef CONFIG_SMP
@@ -833,14 +1030,51 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
@@ -833,14 +1068,51 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
}
#endif /* CONFIG_SMP */
@@ -593,7 +656,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (unlikely(!curr))
return;
@@ -857,8 +1091,15 @@ static void update_curr(struct cfs_rq *cfs_rq)
@@ -857,8 +1129,15 @@ static void update_curr(struct cfs_rq *cfs_rq)
curr->sum_exec_runtime += delta_exec;
schedstat_add(cfs_rq->exec_clock, delta_exec);
@@ -609,7 +672,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (entity_is_task(curr)) {
struct task_struct *curtask = task_of(curr);
@@ -1026,7 +1267,6 @@ update_stats_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -1026,7 +1305,6 @@ update_stats_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
static inline void
update_stats_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
{
@@ -617,7 +680,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (!schedstat_enabled())
return;
@@ -1058,7 +1298,11 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -1058,7 +1336,11 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se)
/*
* We are starting a new run period:
*/
@@ -629,7 +692,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
}
/**************************************************
@@ -4121,7 +4365,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) {}
@@ -4178,7 +4460,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) {}
static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
{
@@ -638,7 +701,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
s64 d = se->vruntime - cfs_rq->min_vruntime;
if (d < 0)
@@ -4132,6 +4376,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4189,6 +4471,7 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se)
#endif
}
@@ -646,7 +709,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static void
place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
{
@@ -4163,6 +4408,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
@@ -4220,6 +4503,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
/* ensure we never gain time by being placed backwards. */
se->vruntime = max_vruntime(se->vruntime, vruntime);
}
@@ -654,7 +717,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static void check_enqueue_throttle(struct cfs_rq *cfs_rq);
@@ -4221,18 +4467,23 @@ static inline bool cfs_bandwidth_used(void);
@@ -4278,18 +4562,23 @@ static inline bool cfs_bandwidth_used(void);
static void
enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
{
@@ -678,7 +741,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Otherwise, renormalise after, such that we're placed at the current
* moment in time, instead of some random moment in the past. Being
@@ -4241,6 +4492,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4298,6 +4587,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if (renorm && !curr)
se->vruntime += cfs_rq->min_vruntime;
@@ -686,7 +749,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* When enqueuing a sched_entity, we must:
@@ -4255,8 +4507,10 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4312,8 +4602,10 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
update_cfs_group(se);
account_entity_enqueue(cfs_rq, se);
@@ -697,7 +760,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
check_schedstat_required();
update_stats_enqueue(cfs_rq, se, flags);
@@ -4277,6 +4531,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4334,6 +4626,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
check_enqueue_throttle(cfs_rq);
}
@@ -705,7 +768,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static void __clear_buddies_last(struct sched_entity *se)
{
for_each_sched_entity(se) {
@@ -4321,6 +4576,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4378,6 +4671,7 @@ static void clear_buddies(struct cfs_rq *cfs_rq, struct sched_entity *se)
if (cfs_rq->skip == se)
__clear_buddies_skip(se);
}
@@ -713,7 +776,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static __always_inline void return_cfs_rq_runtime(struct cfs_rq *cfs_rq);
@@ -4345,13 +4601,16 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4402,13 +4696,16 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
update_stats_dequeue(cfs_rq, se, flags);
@@ -730,7 +793,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Normalize after update_curr(); which will also have moved
* min_vruntime if @se is the one holding it back. But before doing
@@ -4360,12 +4619,14 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4417,12 +4714,14 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if (!(flags & DEQUEUE_SLEEP))
se->vruntime -= cfs_rq->min_vruntime;
@@ -745,7 +808,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Now advance min_vruntime if @se was the entity holding it back,
* except when: DEQUEUE_SAVE && !DEQUEUE_MOVE, in this case we'll be
@@ -4374,8 +4635,21 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
@@ -4431,8 +4730,21 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
*/
if ((flags & (DEQUEUE_SAVE | DEQUEUE_MOVE)) != DEQUEUE_SAVE)
update_min_vruntime(cfs_rq);
@@ -767,7 +830,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Preempt the current task with a newly woken task if needed:
*/
@@ -4415,6 +4689,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -4472,6 +4784,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
if (delta > ideal_runtime)
resched_curr(rq_of(cfs_rq));
}
@@ -775,7 +838,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static void
set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4449,6 +4724,21 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
@@ -4506,6 +4819,21 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
se->prev_sum_exec_runtime = se->sum_exec_runtime;
}
@@ -797,7 +860,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static int
wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se);
@@ -4509,6 +4799,7 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -4566,6 +4894,7 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
return se;
}
@@ -805,7 +868,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static bool check_cfs_rq_runtime(struct cfs_rq *cfs_rq);
@@ -5611,7 +5902,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -5668,7 +5997,9 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)
hrtick_update(rq);
}
@@ -815,7 +878,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* The dequeue_task method is called before nr_running is
@@ -5643,12 +5936,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -5700,12 +6031,14 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
if (cfs_rq->load.weight) {
/* Avoid re-evaluating load for this entity: */
se = parent_entity(se);
@@ -830,7 +893,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
break;
}
flags |= DEQUEUE_SLEEP;
@@ -5764,6 +6059,7 @@ static unsigned long capacity_of(int cpu)
@@ -5821,6 +6154,7 @@ static unsigned long capacity_of(int cpu)
return cpu_rq(cpu)->cpu_capacity;
}
@@ -838,7 +901,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static void record_wakee(struct task_struct *p)
{
/*
@@ -5810,6 +6106,7 @@ static int wake_wide(struct task_struct *p)
@@ -5867,6 +6201,7 @@ static int wake_wide(struct task_struct *p)
return 0;
return 1;
}
@@ -846,7 +909,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* The purpose of wake_affine() is to quickly determine on which CPU we can run
@@ -6512,6 +6809,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p)
@@ -6569,6 +6904,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p)
return min_t(unsigned long, util, capacity_orig_of(cpu));
}
@@ -854,7 +917,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Predicts what cpu_util(@cpu) would return if @p was migrated (and enqueued)
* to @dst_cpu.
@@ -6761,6 +7059,57 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
@@ -6818,6 +7154,57 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
return -1;
}
@@ -912,7 +975,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* select_task_rq_fair: Select target runqueue for the waking task in domains
@@ -6785,6 +7134,26 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
@@ -6842,6 +7229,26 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
/* SD_flags and WF_flags share the first nibble */
int sd_flag = wake_flags & 0xF;
@@ -939,7 +1002,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (wake_flags & WF_TTWU) {
record_wakee(p);
@@ -6797,6 +7166,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
@@ -6854,6 +7261,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int wake_flags)
want_affine = !wake_wide(p) && cpumask_test_cpu(cpu, p->cpus_ptr);
}
@@ -947,7 +1010,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
rcu_read_lock();
for_each_domain(cpu, tmp) {
@@ -6843,6 +7213,7 @@ static void detach_entity_cfs_rq(struct sched_entity *se);
@@ -6900,6 +7308,7 @@ static void detach_entity_cfs_rq(struct sched_entity *se);
*/
static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
{
@@ -955,7 +1018,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* As blocked tasks retain absolute vruntime the migration needs to
* deal with this by subtracting the old and adding the new
@@ -6868,6 +7239,7 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
@@ -6925,6 +7334,7 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu)
se->vruntime -= min_vruntime;
}
@@ -963,7 +1026,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (p->on_rq == TASK_ON_RQ_MIGRATING) {
/*
@@ -6913,6 +7285,7 @@ balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
@@ -6970,6 +7380,7 @@ balance_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
}
#endif /* CONFIG_SMP */
@@ -971,7 +1034,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static unsigned long wakeup_gran(struct sched_entity *se)
{
unsigned long gran = sysctl_sched_wakeup_granularity;
@@ -6991,6 +7364,7 @@ static void set_skip_buddy(struct sched_entity *se)
@@ -7048,6 +7459,7 @@ static void set_skip_buddy(struct sched_entity *se)
for_each_sched_entity(se)
cfs_rq_of(se)->skip = se;
}
@@ -979,7 +1042,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Preempt the current task with a newly woken task if needed:
@@ -6999,9 +7373,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7056,9 +7468,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
{
struct task_struct *curr = rq->curr;
struct sched_entity *se = &curr->se, *pse = &p->se;
@@ -992,7 +1055,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (unlikely(se == pse))
return;
@@ -7015,10 +7392,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7072,10 +7487,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (unlikely(throttled_hierarchy(cfs_rq_of(pse))))
return;
@@ -1005,7 +1068,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* We can come here with TIF_NEED_RESCHED already set from new task
@@ -7048,6 +7427,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7105,6 +7522,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
find_matching_se(&se, &pse);
update_curr(cfs_rq_of(se));
BUG_ON(!pse);
@@ -1017,7 +1080,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (wakeup_preempt_entity(se, pse) == 1) {
/*
* Bias pick_next to pick the sched entity that is
@@ -7057,11 +7441,14 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7114,11 +7536,14 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
set_next_buddy(pse);
goto preempt;
}
@@ -1032,7 +1095,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Only set the backward buddy when the current task is still
* on the rq. This can happen when a wakeup gets interleaved
@@ -7076,6 +7463,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
@@ -7133,6 +7558,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (sched_feat(LAST_BUDDY) && scale && entity_is_task(se))
set_last_buddy(se);
@@ -1040,7 +1103,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
}
struct task_struct *
@@ -7250,7 +7638,10 @@ static void yield_task_fair(struct rq *rq)
@@ -7307,7 +7733,10 @@ static void yield_task_fair(struct rq *rq)
{
struct task_struct *curr = rq->curr;
struct cfs_rq *cfs_rq = task_cfs_rq(curr);
@@ -1051,7 +1114,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Are we the only task in the tree?
@@ -7258,7 +7649,9 @@ static void yield_task_fair(struct rq *rq)
@@ -7315,7 +7744,9 @@ static void yield_task_fair(struct rq *rq)
if (unlikely(rq->nr_running == 1))
return;
@@ -1061,7 +1124,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (curr->policy != SCHED_BATCH) {
update_rq_clock(rq);
@@ -7274,7 +7667,9 @@ static void yield_task_fair(struct rq *rq)
@@ -7331,7 +7762,9 @@ static void yield_task_fair(struct rq *rq)
rq_clock_skip_update(rq);
}
@@ -1071,7 +1134,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
}
static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
@@ -7285,8 +7680,10 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
@@ -7342,8 +7775,10 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
if (!se->on_rq || throttled_hierarchy(cfs_rq_of(se)))
return false;
@@ -1082,7 +1145,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
yield_task_fair(rq);
@@ -7513,6 +7910,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
@@ -7570,6 +8005,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
if (env->sd->flags & SD_SHARE_CPUCAPACITY)
return 0;
@@ -1090,7 +1153,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Buddy candidates are cache hot:
*/
@@ -7520,6 +7918,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
@@ -7577,6 +8013,7 @@ static int task_hot(struct task_struct *p, struct lb_env *env)
(&p->se == cfs_rq_of(&p->se)->next ||
&p->se == cfs_rq_of(&p->se)->last))
return 1;
@@ -1098,7 +1161,31 @@ index 3248e24a90b0..6f66d89d8ba7 100644
if (sysctl_sched_migration_cost == -1)
return 1;
@@ -10780,11 +11179,28 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
@@ -10587,9 +11024,11 @@ static void nohz_newidle_balance(struct rq *this_rq)
if (!housekeeping_cpu(this_cpu, HK_FLAG_SCHED))
return;
+#if !defined(CONFIG_CACULE_SCHED)
/* Will wake up very soon. No time for doing anything else*/
if (this_rq->avg_idle < sysctl_sched_migration_cost)
return;
+#endif
/* Don't need to update blocked load of idle CPUs*/
if (!READ_ONCE(nohz.has_blocked) ||
@@ -10652,7 +11091,10 @@ static int newidle_balance(struct rq *this_rq, struct rq_flags *rf)
*/
rq_unpin_lock(this_rq, rf);
- if (this_rq->avg_idle < sysctl_sched_migration_cost ||
+ if (
+#if !defined(CONFIG_CACULE_SCHED)
+ this_rq->avg_idle < sysctl_sched_migration_cost ||
+#endif
!READ_ONCE(this_rq->rd->overload)) {
rcu_read_lock();
@@ -10820,11 +11262,28 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
update_overutilized_status(task_rq(curr));
}
@@ -1127,7 +1214,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
static void task_fork_fair(struct task_struct *p)
{
struct cfs_rq *cfs_rq;
@@ -10815,6 +11231,7 @@ static void task_fork_fair(struct task_struct *p)
@@ -10855,6 +11314,7 @@ static void task_fork_fair(struct task_struct *p)
se->vruntime -= cfs_rq->min_vruntime;
rq_unlock(rq, &rf);
}
@@ -1135,7 +1222,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
/*
* Priority of the task has changed. Check to see if we preempt
@@ -10933,6 +11350,8 @@ static void attach_entity_cfs_rq(struct sched_entity *se)
@@ -10973,6 +11433,8 @@ static void attach_entity_cfs_rq(struct sched_entity *se)
static void detach_task_cfs_rq(struct task_struct *p)
{
struct sched_entity *se = &p->se;
@@ -1144,7 +1231,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
struct cfs_rq *cfs_rq = cfs_rq_of(se);
if (!vruntime_normalized(p)) {
@@ -10943,6 +11362,7 @@ static void detach_task_cfs_rq(struct task_struct *p)
@@ -10983,6 +11445,7 @@ static void detach_task_cfs_rq(struct task_struct *p)
place_entity(cfs_rq, se, 0);
se->vruntime -= cfs_rq->min_vruntime;
}
@@ -1152,7 +1239,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
detach_entity_cfs_rq(se);
}
@@ -10950,12 +11370,17 @@ static void detach_task_cfs_rq(struct task_struct *p)
@@ -10990,12 +11453,17 @@ static void detach_task_cfs_rq(struct task_struct *p)
static void attach_task_cfs_rq(struct task_struct *p)
{
struct sched_entity *se = &p->se;
@@ -1170,7 +1257,7 @@ index 3248e24a90b0..6f66d89d8ba7 100644
}
static void switched_from_fair(struct rq *rq, struct task_struct *p)
@@ -11011,13 +11436,22 @@ static void set_next_task_fair(struct rq *rq, struct task_struct *p, bool first)
@@ -11051,13 +11519,22 @@ static void set_next_task_fair(struct rq *rq, struct task_struct *p, bool first)
void init_cfs_rq(struct cfs_rq *cfs_rq)
{
cfs_rq->tasks_timeline = RB_ROOT_CACHED;
@@ -1228,10 +1315,10 @@ index a189bec13729..0affe3be7c21 100644
#ifdef CONFIG_SCHED_DEBUG
unsigned int nr_spread_over;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 14edf84cc571..f3273bc268c2 100644
index d4a78e08f6d8..e8cdedf74fed 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1716,6 +1716,29 @@ static struct ctl_table kern_table[] = {
@@ -1736,6 +1736,29 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},

18
linux-tkg-patches/5.13/0003-glitched-base.patch
View File

@@ -275,24 +275,6 @@ index 6b3b59cc51d6..2a0072192c3d 100644
/*
* After fork, child runs first. If set to 0 (default) then
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
*
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
*/
+#ifdef CONFIG_ZENIFY
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
+
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
+#else
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
@@ -128,8 +149,12 @@ int __weak arch_asym_cpu_priority(int cpu)
*
* (default: 5 msec, units: microseconds)

22
linux-tkg-patches/5.13/0003-glitched-cfs-additions.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 6b3b59cc51d6..2a0072192c3d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -81,10 +95,17 @@ unsigned int sysctl_sched_child_runs_first __read_mostly;
*
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
*/
+#ifdef CONFIG_ZENIFY
+unsigned int sysctl_sched_wakeup_granularity = 500000UL;
+static unsigned int normalized_sysctl_sched_wakeup_granularity = 500000UL;
+
+const_debug unsigned int sysctl_sched_migration_cost = 50000UL;
+#else
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#endif
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)