diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index de47bc6..d08e12c 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -681,6 +681,11 @@ _tkg_srcprep() { tkgpatch="$srcdir/0003-glitched-base.patch" _msg="Applying glitched base patch" && _tkg_patcher + if [ "${_preempt_rt}" != "1" ]; then + tkgpatch="$srcdir/0003-glitched-base-nonrt.patch" + _msg="Applying glitched base non-rt additions patch" && _tkg_patcher + fi + if [[ "$_distro" =~ ^(Fedora|Suse)$ ]]; then tkgpatch="$srcdir/0013-fedora-rpm.patch" _msg="RPM: fixing spec generator" && _tkg_patcher diff --git a/linux-tkg-patches/5.10/0003-glitched-base-nonrt.patch b/linux-tkg-patches/5.10/0003-glitched-base-nonrt.patch new file mode 100644 index 0000000..4ebcead --- /dev/null +++ b/linux-tkg-patches/5.10/0003-glitched-base-nonrt.patch @@ -0,0 +1,38 @@ +From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001 +From: Alexandre Frade +Date: Mon, 29 Jan 2018 18:29:13 +0000 +Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks + to iterate in a single balance run. + +Signed-off-by: Alexandre Frade +--- + kernel/sched/core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index f788cd61df21..2bfbb4213707 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -59,7 +59,7 @@ const_debug unsigned int sysctl_sched_features = + * Number of tasks to iterate in a single balance run. + * Limited because this is done with IRQs disabled. + */ +-const_debug unsigned int sysctl_sched_nr_migrate = 32; ++const_debug unsigned int sysctl_sched_nr_migrate = 128; + + /* + * period over which we measure -rt task CPU usage in us. +@@ -71,9 +71,9 @@ __read_mostly int scheduler_running; + + /* + * part of the period that we allow rt tasks to run in us. +- * default: 0.95s ++ * XanMod default: 0.98s + */ +-int sysctl_sched_rt_runtime = 950000; ++int sysctl_sched_rt_runtime = 980000; + + /* + * __task_rq_lock - lock the rq @p resides on. +-- +2.28.0 diff --git a/linux-tkg-patches/5.10/0003-glitched-base.patch b/linux-tkg-patches/5.10/0003-glitched-base.patch index 1cbe492..f62fa62 100644 --- a/linux-tkg-patches/5.10/0003-glitched-base.patch +++ b/linux-tkg-patches/5.10/0003-glitched-base.patch @@ -54,46 +54,6 @@ index 361ea7ab30ea..0c5cf69b241a 100644 2.28.0 -From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001 -From: Alexandre Frade -Date: Mon, 29 Jan 2018 18:29:13 +0000 -Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks - to iterate in a single balance run. - -Signed-off-by: Alexandre Frade ---- - kernel/sched/core.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index f788cd61df21..2bfbb4213707 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -59,7 +59,7 @@ const_debug unsigned int sysctl_sched_features = - * Number of tasks to iterate in a single balance run. - * Limited because this is done with IRQs disabled. - */ --const_debug unsigned int sysctl_sched_nr_migrate = 32; -+const_debug unsigned int sysctl_sched_nr_migrate = 128; - - /* - * period over which we measure -rt task CPU usage in us. -@@ -71,9 +71,9 @@ __read_mostly int scheduler_running; - - /* - * part of the period that we allow rt tasks to run in us. -- * default: 0.95s -+ * XanMod default: 0.98s - */ --int sysctl_sched_rt_runtime = 950000; -+int sysctl_sched_rt_runtime = 980000; - - /* - * __task_rq_lock - lock the rq @p resides on. --- -2.28.0 - - From acc49f33a10f61dc66c423888cbb883ba46710e4 Mon Sep 17 00:00:00 2001 From: Alexandre Frade Date: Mon, 29 Jan 2018 17:41:29 +0000 diff --git a/linux-tkg-patches/5.15/0003-glitched-base-nonrt.patch b/linux-tkg-patches/5.15/0003-glitched-base-nonrt.patch new file mode 100644 index 0000000..4ebcead --- /dev/null +++ b/linux-tkg-patches/5.15/0003-glitched-base-nonrt.patch @@ -0,0 +1,38 @@ +From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001 +From: Alexandre Frade +Date: Mon, 29 Jan 2018 18:29:13 +0000 +Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks + to iterate in a single balance run. + +Signed-off-by: Alexandre Frade +--- + kernel/sched/core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index f788cd61df21..2bfbb4213707 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -59,7 +59,7 @@ const_debug unsigned int sysctl_sched_features = + * Number of tasks to iterate in a single balance run. + * Limited because this is done with IRQs disabled. + */ +-const_debug unsigned int sysctl_sched_nr_migrate = 32; ++const_debug unsigned int sysctl_sched_nr_migrate = 128; + + /* + * period over which we measure -rt task CPU usage in us. +@@ -71,9 +71,9 @@ __read_mostly int scheduler_running; + + /* + * part of the period that we allow rt tasks to run in us. +- * default: 0.95s ++ * XanMod default: 0.98s + */ +-int sysctl_sched_rt_runtime = 950000; ++int sysctl_sched_rt_runtime = 980000; + + /* + * __task_rq_lock - lock the rq @p resides on. +-- +2.28.0 diff --git a/linux-tkg-patches/5.15/0003-glitched-base.patch b/linux-tkg-patches/5.15/0003-glitched-base.patch index 9641cca..7737373 100644 --- a/linux-tkg-patches/5.15/0003-glitched-base.patch +++ b/linux-tkg-patches/5.15/0003-glitched-base.patch @@ -54,46 +54,6 @@ index 361ea7ab30ea..0c5cf69b241a 100644 2.28.0 -From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001 -From: Alexandre Frade -Date: Mon, 29 Jan 2018 18:29:13 +0000 -Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks - to iterate in a single balance run. - -Signed-off-by: Alexandre Frade ---- - kernel/sched/core.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index f788cd61df21..2bfbb4213707 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -59,7 +59,7 @@ const_debug unsigned int sysctl_sched_features = - * Number of tasks to iterate in a single balance run. - * Limited because this is done with IRQs disabled. - */ --const_debug unsigned int sysctl_sched_nr_migrate = 32; -+const_debug unsigned int sysctl_sched_nr_migrate = 128; - - /* - * period over which we measure -rt task CPU usage in us. -@@ -71,9 +71,9 @@ __read_mostly int scheduler_running; - - /* - * part of the period that we allow rt tasks to run in us. -- * default: 0.95s -+ * XanMod default: 0.98s - */ --int sysctl_sched_rt_runtime = 950000; -+int sysctl_sched_rt_runtime = 980000; - - /* - * __task_rq_lock - lock the rq @p resides on. --- -2.28.0 - - From acc49f33a10f61dc66c423888cbb883ba46710e4 Mon Sep 17 00:00:00 2001 From: Alexandre Frade Date: Mon, 29 Jan 2018 17:41:29 +0000 diff --git a/linux-tkg-patches/5.4/0003-glitched-base-nonrt.patch b/linux-tkg-patches/5.4/0003-glitched-base-nonrt.patch new file mode 100644 index 0000000..4ebcead --- /dev/null +++ b/linux-tkg-patches/5.4/0003-glitched-base-nonrt.patch @@ -0,0 +1,38 @@ +From 28f32f59d9d55ac7ec3a20b79bdd02d2a0a5f7e1 Mon Sep 17 00:00:00 2001 +From: Alexandre Frade +Date: Mon, 29 Jan 2018 18:29:13 +0000 +Subject: [PATCH 03/17] sched/core: nr_migrate = 128 increases number of tasks + to iterate in a single balance run. + +Signed-off-by: Alexandre Frade +--- + kernel/sched/core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index f788cd61df21..2bfbb4213707 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -59,7 +59,7 @@ const_debug unsigned int sysctl_sched_features = + * Number of tasks to iterate in a single balance run. + * Limited because this is done with IRQs disabled. + */ +-const_debug unsigned int sysctl_sched_nr_migrate = 32; ++const_debug unsigned int sysctl_sched_nr_migrate = 128; + + /* + * period over which we measure -rt task CPU usage in us. +@@ -71,9 +71,9 @@ __read_mostly int scheduler_running; + + /* + * part of the period that we allow rt tasks to run in us. +- * default: 0.95s ++ * XanMod default: 0.98s + */ +-int sysctl_sched_rt_runtime = 950000; ++int sysctl_sched_rt_runtime = 980000; + + /* + * __task_rq_lock - lock the rq @p resides on. +-- +2.28.0 diff --git a/linux-tkg-patches/5.4/0003-glitched-base.patch b/linux-tkg-patches/5.4/0003-glitched-base.patch index a04d49e..ee009a8 100644 --- a/linux-tkg-patches/5.4/0003-glitched-base.patch +++ b/linux-tkg-patches/5.4/0003-glitched-base.patch @@ -31,31 +31,6 @@ index 2acfc69878f5..3f1131431e06 100644 EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure); __cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock); -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 211890edf37e..37121563407d 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -41,7 +41,7 @@ const_debug unsigned int sysctl_sched_features = - * Number of tasks to iterate in a single balance run. - * Limited because this is done with IRQs disabled. - */ --const_debug unsigned int sysctl_sched_nr_migrate = 32; -+const_debug unsigned int sysctl_sched_nr_migrate = 128; - - /* - * period over which we average the RT time consumption, measured -@@ -61,9 +61,9 @@ __read_mostly int scheduler_running; - - /* - * part of the period that we allow rt tasks to run in us. -- * default: 0.95s -+ * XanMod default: 0.98s - */ --int sysctl_sched_rt_runtime = 950000; -+int sysctl_sched_rt_runtime = 980000; - - /* - * __task_rq_lock - lock the rq @p resides on. diff --git a/lib/Kconfig b/lib/Kconfig index 5fe577673b98..c44c27cd6e05 100644 --- a/lib/Kconfig