kernel-packages/linux-pikaos-template
Template
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 6.2.5 and add eevdf to bore

Browse Source
This commit is contained in:
ferrreo 2023-03-12 19:40:20 +00:00
parent e5d2ca1127
commit 7ed50b27aa
7 changed files with 7779 additions and 1032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config
View File

@ -151,7 +151,6 @@ CONFIG_SCHED_CORE=y
#
# CPU/Task time and stats accounting
#
CONFIG_TICK_CPU_ACCOUNTING=n
CONFIG_VIRT_CPU_ACCOUNTING=y
CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_IRQ_TIME_ACCOUNTING=y
@ -542,7 +541,7 @@ CONFIG_X86_INTEL_TSX_MODE_AUTO=y
CONFIG_X86_SGX=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
# CONFIG_EFI_HANDOVER_PROTOCOL is not set
CONFIG_EFI_HANDOVER_PROTOCOL=y
CONFIG_EFI_MIXED=y
# CONFIG_EFI_FAKE_MEMMAP is not set
CONFIG_EFI_RUNTIME_MAP=y
@ -3409,6 +3408,7 @@ CONFIG_MICROSOFT_MANA=m
CONFIG_NET_VENDOR_MYRI=y
CONFIG_MYRI10GE=m
CONFIG_MYRI10GE_DCA=y
CONFIG_FEALNX=m
CONFIG_NET_VENDOR_NI=y
CONFIG_NI_XGE_MANAGEMENT_ENET=m
CONFIG_NET_VENDOR_NATSEMI=y
@ -5880,6 +5880,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
CONFIG_VIDEO_TUNER=m
CONFIG_V4L2_LOOPBACK=m
CONFIG_V4L2_MEM2MEM_DEV=m
CONFIG_V4L2_FLASH_LED_CLASS=m
CONFIG_V4L2_FWNODE=m
@ -7105,6 +7106,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m
CONFIG_SND_HDA_GENERIC=m
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
# CONFIG_SND_HDA_CTL_DEV_ID is not set
# end of HD-Audio
CONFIG_SND_HDA_CORE=m
@ -9002,7 +9004,6 @@ CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
CONFIG_THINKPAD_ACPI_VIDEO=y
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_LMI=m
CONFIG_LEGION_LAPTOP=m
CONFIG_INTEL_ATOMISP2_PDX86=y
CONFIG_INTEL_ATOMISP2_LED=m
CONFIG_INTEL_IFS=m

7338
patches/0001-cachy-all.patch
View File

File diff suppressed because it is too large Load Diff

128
patches/0003-bore.patch
View File

@ -1,23 +1,22 @@
From f169eabeb1ba8f339ab9bebec8d503c70c5f5879 Mon Sep 17 00:00:00 2001
From e016cce088886f56617becc8fcc598a0114e4faa Mon Sep 17 00:00:00 2001
From: Peter Jung <admin@ptr1337.dev>
Date: Fri, 17 Feb 2023 15:39:23 +0100
Subject: [PATCH] bore-cachy
Date: Sat, 11 Mar 2023 18:44:19 +0100
Subject: [PATCH] bore-eevdf
Signed-off-by: Peter Jung <admin@ptr1337.dev>
---
include/linux/sched.h | 5 ++
init/Kconfig | 20 ++++++
kernel/sched/core.c | 29 +++++++++
kernel/sched/debug.c | 3 +
kernel/sched/fair.c | 132 +++++++++++++++++++++++++++++++++++++++-
kernel/sched/features.h | 4 ++
6 files changed, 190 insertions(+), 3 deletions(-)
include/linux/sched.h | 5 ++
init/Kconfig | 20 +++++++
kernel/sched/core.c | 29 ++++++++++
kernel/sched/debug.c | 3 +
kernel/sched/fair.c | 124 +++++++++++++++++++++++++++++++++++++++++-
5 files changed, 180 insertions(+), 1 deletion(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index df219c7cd6aa..a3538eacb095 100644
index 764df627c243..f912da35db34 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -556,6 +556,11 @@ struct sched_entity {
@@ -558,6 +558,11 @@ struct sched_entity {
u64 sum_exec_runtime;
u64 vruntime;
u64 prev_sum_exec_runtime;
@ -26,11 +25,11 @@ index df219c7cd6aa..a3538eacb095 100644
+ u64 burst_time;
+ u8 burst_score;
+#endif // CONFIG_SCHED_BORE
s64 lag;
u64 slice;
u64 nr_migrations;
u64 prev_sleep_sum_runtime;
diff --git a/init/Kconfig b/init/Kconfig
index 85a602dba878..bc69f062ca76 100644
index 748a9491ca12..d10f1e6257cd 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1318,6 +1318,26 @@ config CHECKPOINT_RESTORE
@ -61,10 +60,10 @@ index 85a602dba878..bc69f062ca76 100644
bool "Automatic process group scheduling"
select CGROUPS
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 919edb034108..fd52870a002f 100644
index 9db5f9ec9022..1f1e1f586407 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4420,6 +4420,21 @@ int wake_up_state(struct task_struct *p, unsigned int state)
@@ -4418,6 +4418,21 @@ int wake_up_state(struct task_struct *p, unsigned int state)
return try_to_wake_up(p, state, 0);
}
@ -86,16 +85,16 @@ index 919edb034108..fd52870a002f 100644
/*
* Perform scheduler related setup for a newly forked process p.
* p is forked by current.
@@ -4438,6 +4453,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
@@ -4434,6 +4449,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
p->se.prev_sum_exec_runtime = 0;
p->se.nr_migrations = 0;
p->se.vruntime = 0;
p->se.dur_avg = 0;
p->se.prev_sleep_sum_runtime = 0;
+#ifdef CONFIG_SCHED_BORE
+ p->se.burst_time = 0;
+#endif // CONFIG_SCHED_BORE
INIT_LIST_HEAD(&p->se.group_node);
RB_CLEAR_NODE(&p->se.latency_node);
p->se.dur_avg = 0;
p->se.prev_sleep_sum_runtime = 0;
p->se.lag = 0;
@@ -4664,6 +4682,10 @@ late_initcall(sched_core_sysctl_init);
int sched_fork(unsigned long clone_flags, struct task_struct *p)
{
@ -107,7 +106,7 @@ index 919edb034108..fd52870a002f 100644
/*
* We mark the process as NEW here. This guarantees that
* nobody will actually run it, and a signal or other external
@@ -9154,6 +9176,9 @@ void __init init_idle(struct task_struct *idle, int cpu)
@@ -9153,6 +9175,9 @@ void __init init_idle(struct task_struct *idle, int cpu)
idle->__state = TASK_RUNNING;
idle->se.exec_start = sched_clock();
@ -117,22 +116,22 @@ index 919edb034108..fd52870a002f 100644
/*
* PF_KTHREAD should already be set at this point; regardless, make it
* look like a proper per-CPU kthread.
@@ -9821,6 +9846,10 @@ void __init sched_init(void)
@@ -9820,6 +9845,10 @@ void __init sched_init(void)
BUG_ON(&dl_sched_class != &stop_sched_class + 1);
#endif
+#ifdef CONFIG_SCHED_BORE
+ printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification 1.7.10 by Masahito Suzuki");
+ printk(KERN_INFO "BORE (Burst-Oriented Response Enhancer) CPU Scheduler modification for 1.7-eevdf2 by Masahito Suzuki");
+#endif // CONFIG_SCHED_BORE
+
wait_bit_init();
#ifdef CONFIG_FAIR_GROUP_SCHED
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 177934290ec4..2f40a238cdad 100644
index fe9edfa43f65..3672df7c1f6a 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -547,6 +547,9 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
@@ -551,6 +551,9 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p)
SPLIT_NS(schedstat_val_or_zero(p->stats.sum_sleep_runtime)),
SPLIT_NS(schedstat_val_or_zero(p->stats.sum_block_runtime)));
@ -143,7 +142,7 @@ index 177934290ec4..2f40a238cdad 100644
SEQ_printf(m, " %d %d", task_node(p), task_numa_group_id(p));
#endif
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 5ef893ce5734..590adb9a3e37 100644
index c40b775452bc..1e4ca5419a11 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -19,6 +19,9 @@
@ -156,14 +155,14 @@ index 5ef893ce5734..590adb9a3e37 100644
*/
#include <linux/energy_model.h>
#include <linux/mmap_lock.h>
@@ -140,6 +143,16 @@ static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
@@ -141,6 +144,16 @@ static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
const_debug unsigned int sysctl_sched_migration_cost = 500000UL;
+#ifdef CONFIG_SCHED_BORE
+unsigned int __read_mostly sched_bore = 1;
+unsigned int __read_mostly sched_burst_penalty_scale = 1280;
+unsigned int __read_mostly sched_burst_granularity = 12;
+unsigned int __read_mostly sched_burst_granularity = 6;
+unsigned int __read_mostly sched_burst_smoothness = 2;
+static int three = 3;
+static int sixty_four = 64;
@ -173,7 +172,7 @@ index 5ef893ce5734..590adb9a3e37 100644
int sched_thermal_decay_shift;
static int __init setup_sched_thermal_decay_shift(char *str)
{
@@ -203,6 +216,44 @@ static unsigned int sysctl_numa_balancing_promote_rate_limit = 65536;
@@ -204,6 +217,44 @@ static unsigned int sysctl_numa_balancing_promote_rate_limit = 65536;
#ifdef CONFIG_SYSCTL
static struct ctl_table sched_fair_sysctls[] = {
@ -185,7 +184,7 @@ index 5ef893ce5734..590adb9a3e37 100644
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .extra1 = SYSCTL_ZERO,
+ .extra2 = &three,
+ .extra2 = SYSCTL_ONE,
+ },
+ {
+ .procname = "sched_burst_penalty_scale",
@ -218,7 +217,7 @@ index 5ef893ce5734..590adb9a3e37 100644
{
.procname = "sched_child_runs_first",
.data = &sysctl_sched_child_runs_first,
@@ -978,6 +1029,39 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
@@ -1182,6 +1233,39 @@ static void update_tg_load_avg(struct cfs_rq *cfs_rq)
}
#endif /* CONFIG_SMP */
@ -258,21 +257,21 @@ index 5ef893ce5734..590adb9a3e37 100644
/*
* Update the current task's runtime statistics.
*/
@@ -1007,6 +1091,13 @@ static void update_curr(struct cfs_rq *cfs_rq)
@@ -1211,6 +1295,13 @@ static void update_curr(struct cfs_rq *cfs_rq)
curr->sum_exec_runtime += delta_exec;
schedstat_add(cfs_rq->exec_clock, delta_exec);
+#ifdef CONFIG_SCHED_BORE
+ curr->burst_time += delta_exec;
+ update_burst_score(curr);
+ if (sched_bore & 1)
+ if (sched_bore)
+ curr->vruntime += calc_delta_fair_bscale(delta_exec, curr);
+ else
+#endif // CONFIG_SCHED_BORE
curr->vruntime += calc_delta_fair(delta_exec, curr);
update_min_vruntime(cfs_rq);
@@ -5057,6 +5148,11 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
/*
* XXX: strictly: vd_i += N*r_i/w_i such that: vd_i > ve_i
@@ -5283,6 +5374,11 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
se->prev_sum_exec_runtime = se->sum_exec_runtime;
}
@ -284,7 +283,7 @@ index 5ef893ce5734..590adb9a3e37 100644
static int
wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se);
@@ -5101,7 +5197,13 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
@@ -5330,7 +5426,13 @@ pick_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *curr)
se = second;
}
@ -299,7 +298,7 @@ index 5ef893ce5734..590adb9a3e37 100644
/*
* Someone really wants this to run. If it's not unfair, run it.
*/
@@ -6394,6 +6496,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
@@ -6615,6 +6717,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
util_est_dequeue(&rq->cfs, p);
for_each_sched_entity(se) {
@ -309,7 +308,7 @@ index 5ef893ce5734..590adb9a3e37 100644
cfs_rq = cfs_rq_of(se);
dequeue_entity(cfs_rq, se, flags);
@@ -7856,7 +7961,12 @@ static unsigned long wakeup_gran(struct sched_entity *se)
@@ -8070,7 +8175,12 @@ static unsigned long wakeup_gran(struct sched_entity *se)
*
*/
static int
@ -321,12 +320,11 @@ index 5ef893ce5734..590adb9a3e37 100644
+#endif // CONFIG_SCHED_BORE
{
s64 gran, vdiff = curr->vruntime - se->vruntime;
s64 offset = wakeup_latency_gran(curr, se);
@@ -7876,12 +7986,20 @@ wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se)
* chance to preempt current.
*/
gran = min_t(s64, gran, get_latency_max());
-
@@ -8078,11 +8188,20 @@ wakeup_preempt_entity(struct sched_entity *curr, struct sched_entity *se)
return -1;
gran = wakeup_gran(se);
+#ifdef CONFIG_SCHED_BORE
+ if (do_scale) gran = burst_scale(gran, se);
+#endif // CONFIG_SCHED_BORE
@ -344,21 +342,7 @@ index 5ef893ce5734..590adb9a3e37 100644
static void set_last_buddy(struct sched_entity *se)
{
@@ -7981,7 +8099,12 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
return;
update_curr(cfs_rq_of(se));
- if (wakeup_preempt_entity(se, pse) == 1) {
+#ifdef CONFIG_SCHED_BORE
+ if (wakeup_preempt_entity_bscale(se, pse, sched_bore & 2) == 1)
+#else // CONFIG_SCHED_BORE
+ if (wakeup_preempt_entity(se, pse) == 1)
+#endif // CONFIG_SCHED_BORE
+ {
/*
* Bias pick_next to pick the sched entity that is
* triggering this preemption.
@@ -8217,6 +8340,9 @@ static void yield_task_fair(struct rq *rq)
@@ -8430,6 +8549,9 @@ static void yield_task_fair(struct rq *rq)
struct task_struct *curr = rq->curr;
struct cfs_rq *cfs_rq = task_cfs_rq(curr);
struct sched_entity *se = &curr->se;
@ -368,21 +352,5 @@ index 5ef893ce5734..590adb9a3e37 100644
/*
* Are we the only task in the tree?
diff --git a/kernel/sched/features.h b/kernel/sched/features.h
index efdc29c42161..0f28637ce1aa 100644
--- a/kernel/sched/features.h
+++ b/kernel/sched/features.h
@@ -4,7 +4,11 @@
* them to run sooner, but does not allow tons of sleepers to
* rip the spread apart.
*/
+#ifdef CONFIG_SCHED_BORE
+SCHED_FEAT(GENTLE_FAIR_SLEEPERS, false)
+#else // CONFIG_SCHED_BORE
SCHED_FEAT(GENTLE_FAIR_SLEEPERS, true)
+#endif // CONFIG_SCHED_BORE
/*
* Place new tasks ahead so that they do not starve already running
--
2.39.2
2.40.0.rc2

1326
patches/0004-eevdf.patch Normal file
View File

File diff suppressed because it is too large Load Diff

0
patches/0004-hdr.patch → patches/0005-hdr.patch
View File

8
scripts/patch.sh
View File

@ -7,10 +7,12 @@ echo "Pika Kernel - Applying patches"
patch -Np1 < "../patches/0001-cachy-all.patch"
# orig patch from cachy - 0001-Add-latency-priority-for-CFS-class.patch
patch -Np1 < "../patches/0002-cfs-nice.patch"
# orig patch from cachy - 0001-bore-cachy.patch
patch -Np1 < "../patches/0003-bore.patch"
# orig patch from cachy
patch -Np1 < "../patches/0003-eevdf.patch"
# orig patch from cachy - 0001-bore-eevdf.patch
patch -Np1 < "../patches/0004-bore.patch"
# HDR patch - from cachy (but they deleted it)
patch -Np1 < "../patches/0004-hdr.patch"
patch -Np1 < "../patches/0005-hdr.patch"
# Nobara patches are here: https://github.com/sammilucia/nobara-kernel-fork
# Extra Leigon laptop goodies
patch -Np1 < "../patches/0001-Add-legion-laptop-v0.1.patch"

6
scripts/source.sh
View File

@ -2,7 +2,7 @@
echo "Pika Kernel - Getting source"
wget -nv https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.tar.gz
tar -zxf ./linux-6.2.1.tar.gz
wget -nv https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.5.tar.gz
tar -zxf ./linux-6.2.5.tar.gz
cd linux-6.2.1
cd linux-6.2.5