Sync with Github

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 40 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 909677e24bec..5630146a3662 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cachyos
-	pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
+	pkgdesc = Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements
 	pkgver = 6.7.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	arch = x86_64_v3
@@ -21,20 +21,23 @@ pkgbase = linux-cachyos
 	makedepends = make
 	makedepends = patch
 	makedepends = python
+	depends = scx-scheds
 	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/all/0001-cachyos-base-all.patch
+	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/sched/0001-sched-ext.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/sched/0001-bore-cachy.patch
 	b2sums = cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e
-	b2sums = da55af914e4d3e694009d534e89c8b73b23c174662a4bab6857b3e6ad51bb03a8d9ea7439e2dca2329fbeccbc6894e52ad90538649471e5b24328ecef7485575
+	b2sums = 9c7b52c103a8506c027a28e81779ecba972f3c85f8917359282a6183d04d04407950ba55d3db13b285b722aafb68f308b16733e575e6b2f6e77b08682c7e5dc4
 	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
-	b2sums = c48424df455ac2c6bd7cf73d64a671e7541eab75e644a403ef8162adb913b34d51f52cfa1dbb162976d7b85ba4055390f1bb2f90cb539c2bdb5efec7eae270fc
-	b2sums = 784371c03cce8d01eff2b94d55d084f73deedbad8724dba394c7a5b354d338f31c3114e16937afcaf40ec3e39608e0a905c4724c910bc85195a0fb985f62a626
+	b2sums = 6a1718dcc5cb15a784175ec49b4abe52d5a2677bf574883dc0e9e8c4fd6904b1bb9fc0d9b15a60d968b50dde138fd3ffb0824baf125194d136117881c0d5e441
+	b2sums = 8048e7e991f33d50f8f5e2802ddee66be80c1e7783fed7bf295cf50b08e20b6010d867cf7d38accf5e534cb48f4d03276243b79d7295a27dcc394718137f4826
+	b2sums = e6b0b333a3e5c141f248abe05d5341458173c2343c1da52683c2421f22aa07bb76321808a35b9285cf4778f971a34a70869b29d787a3b39b202fdc1a8a225f1a
 
 pkgname = linux-cachyos
-	pkgdesc = The Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
+	pkgdesc = The Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
@@ -48,6 +51,6 @@ pkgname = linux-cachyos
 	provides = UKSMD-BUILTIN
 
 pkgname = linux-cachyos-headers
-	pkgdesc = Headers and scripts for building modules for the Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements kernel
+	pkgdesc = Headers and scripts for building modules for the Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements kernel
 	depends = pahole
 	depends = linux-cachyos
diff --git a/PKGBUILD b/PKGBUILD
index 5f6c83ac52cc..61df96f5dc44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,6 +20,10 @@ _cachy_config=${_cachy_config-y}
 # 'sched-ext' - select 'sched-ext' Scheduler, based on EEVDF
 _cpusched=${_cpusched-cachyos}
 
+# Apply suggested sysctl values from them developer of the BORE Scheduler
+# base_slice and disable tuneable scaling
+_bore_tuning_sysctl=${_bore_tuning_sysctl-}
+
 ### Tweak kernel options prior to a build via nconfig
 _makenconfig=${_makenconfig-}
 
@@ -173,8 +177,8 @@ _stable=${_major}
 #_stablerc=${_major}-${_rcver}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
-pkgdesc='Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=3
+pkgdesc='Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements'
+pkgrel=4
 _kernver=$pkgver-$pkgrel
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
@@ -192,7 +196,7 @@ if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_k
     )
 fi
 
-if [ "$_cpusched" = "sched-ext" ]; then
+if [[ "$_cpusched" = "sched-ext" || "$_cpusched" = "cachyos" ]]; then
     depends+=(scx-scheds)
 fi
 
@@ -222,10 +226,11 @@ if [ -n "$_build_nvidia" ]; then
              "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
 fi
 
-## ToDo: Adjust for new Scheduler Changes
+## List of CachyOS schedulers
 case "$_cpusched" in
-    cachyos) # CachyOS Scheduler (EEVDF + BORE)
-        source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
+    cachyos|sched-ext) # CachyOS Scheduler (BORE + SCHED-EXT)
+        source+=("${_patchsource}/sched/0001-sched-ext.patch"
+                 "${_patchsource}/sched/0001-bore-cachy.patch");;
     bore) ## BORE Scheduler
         source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
     rt) ## EEVDF with RT patches
@@ -238,11 +243,15 @@ case "$_cpusched" in
     hardened) ## Hardened Patches with BORE Scheduler
         source+=("${_patchsource}/sched/0001-bore-cachy.patch"
                  "${_patchsource}/misc/0001-hardened.patch");;
-    sched-ext) ## Sched-ext with BORE
-        source+=("${_patchsource}/sched/0001-sched-ext.patch"
-                 "${_patchsource}/sched/0001-bore-cachy.patch");;
+    sched-ext) ## SCHED-EXT
+        source+=("${_patchsource}/sched/0001-sched-ext.patch");;
 esac
 
+# BORE Tuning Sysctl
+if [ -n "$_bore_tuning_sysctl" ]; then
+    source+=("${_patchsource}/misc/bore-tuning-sysctl.patch")
+fi
+
 ## lrng patchset
 if [ -n "$_lrng_enable" ]; then
     source+=("${_patchsource}/misc/0001-lrng.patch")
@@ -299,11 +308,12 @@ prepare() {
     [ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
 
     case "$_cpusched" in
-        bore|hardened|cachyos) scripts/config -e SCHED_BORE;;
+        cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
+        bore|hardened) scripts/config -e SCHED_BORE;;
         eevdf) ;;
         rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
         rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
-        sched-ext) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
+        sched-ext) scripts/config -e SCHED_CLASS_EXT;;
         *) _die "The value $_cpusched is invalid. Choose the correct one again.";;
     esac
 
@@ -554,7 +564,7 @@ prepare() {
     ### Disable DEBUG
     # Doesn't work with sched-ext
     # More infos here: https://github.com/CachyOS/linux-cachyos/issues/187
-    if [[ "$_cpusched" != "sched-ext" &&  -n "$_disable_debug" ]]; then
+    if [[ "$_cpusched" != "sched-ext" || "$_cpusched" != "cachyos" ]] && [ -n "$_disable_debug" ]; then
         scripts/config -d DEBUG_INFO \
             -d DEBUG_INFO_BTF \
             -d DEBUG_INFO_DWARF4 \
@@ -820,7 +830,8 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e'
-        'da55af914e4d3e694009d534e89c8b73b23c174662a4bab6857b3e6ad51bb03a8d9ea7439e2dca2329fbeccbc6894e52ad90538649471e5b24328ecef7485575'
+        '9c7b52c103a8506c027a28e81779ecba972f3c85f8917359282a6183d04d04407950ba55d3db13b285b722aafb68f308b16733e575e6b2f6e77b08682c7e5dc4'
         '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
-        'c48424df455ac2c6bd7cf73d64a671e7541eab75e644a403ef8162adb913b34d51f52cfa1dbb162976d7b85ba4055390f1bb2f90cb539c2bdb5efec7eae270fc'
-        '784371c03cce8d01eff2b94d55d084f73deedbad8724dba394c7a5b354d338f31c3114e16937afcaf40ec3e39608e0a905c4724c910bc85195a0fb985f62a626')
+        '6a1718dcc5cb15a784175ec49b4abe52d5a2677bf574883dc0e9e8c4fd6904b1bb9fc0d9b15a60d968b50dde138fd3ffb0824baf125194d136117881c0d5e441'
+        '8048e7e991f33d50f8f5e2802ddee66be80c1e7783fed7bf295cf50b08e20b6010d867cf7d38accf5e534cb48f4d03276243b79d7295a27dcc394718137f4826'
+        'e6b0b333a3e5c141f248abe05d5341458173c2343c1da52683c2421f22aa07bb76321808a35b9285cf4778f971a34a70869b29d787a3b39b202fdc1a8a225f1a')
diff --git a/config b/config
index 28e6956d3c11..4a7a087fae62 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.7.0 Kernel Configuration
+# Linux/x86 6.7.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20231110"
 CONFIG_CC_IS_GCC=y
@@ -943,9 +943,9 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_ARCH_MMAP_RND_BITS=32
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16
 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
@@ -10447,7 +10447,7 @@ CONFIG_BCACHEFS_FS=m
 CONFIG_BCACHEFS_QUOTA=y
 # CONFIG_BCACHEFS_ERASURE_CODING is not set
 CONFIG_BCACHEFS_POSIX_ACL=y
-CONFIG_BCACHEFS_DEBUG_TRANSACTIONS=y
+# CONFIG_BCACHEFS_DEBUG_TRANSACTIONS is not set
 # CONFIG_BCACHEFS_DEBUG is not set
 # CONFIG_BCACHEFS_TESTS is not set
 CONFIG_BCACHEFS_LOCK_TIME_STATS=y