Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

6.1.10-2 && 6.2.rc7-2

Peter Jung2d03bc87698d
diff --git a/linux-bore/.SRCINFO b/linux-bore/.SRCINFO
index 442bb382..9dbbbc59 100644
--- a/linux-bore/.SRCINFO
+++ b/linux-bore/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -28,7 +28,7 @@ pkgbase = linux-bore
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = 479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
index 29255dac..532206df 100644
--- a/linux-bore/PKGBUILD
+++ b/linux-bore/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-bore}
+_cpusched=${_cpusched-'bore'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-y}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787'
diff --git a/linux-bore/config b/linux-bore/config
index e20776ec..1d4bc295 100644
--- a/linux-bore/config
+++ b/linux-bore/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos-bmq/.SRCINFO b/linux-cachyos-bmq/.SRCINFO
index 9c3c0ee0..8f7943d0 100644
--- a/linux-cachyos-bmq/.SRCINFO
+++ b/linux-cachyos-bmq/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-bmq
pkgdesc = Linux BMQ scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -27,7 +27,7 @@ pkgbase = linux-cachyos-bmq
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-prjc-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = f8d97fd1a17d8730a317eac694009b346ace1d9bf2630599ce06d8f6c53baf5b
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index cfa8d86e..39a0ab37 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-bmq}
+_cpusched=${_cpusched-'bmq'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BMQ scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'f8d97fd1a17d8730a317eac694009b346ace1d9bf2630599ce06d8f6c53baf5b')
diff --git a/linux-cachyos-bmq/config b/linux-cachyos-bmq/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos-bmq/config
+++ b/linux-cachyos-bmq/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos-bore/.SRCINFO b/linux-cachyos-bore/.SRCINFO
index efece280..9a609763 100644
--- a/linux-cachyos-bore/.SRCINFO
+++ b/linux-cachyos-bore/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-bore
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -28,7 +28,7 @@ pkgbase = linux-cachyos-bore
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = 479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 7220587e..2243399e 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-bore}
+_cpusched=${_cpusched-'bore'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-y}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787'
diff --git a/linux-cachyos-bore/config b/linux-cachyos-bore/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos-bore/config
+++ b/linux-cachyos-bore/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos-cfs/.SRCINFO b/linux-cachyos-cfs/.SRCINFO
index 30dd1ac7..8cfb196f 100644
--- a/linux-cachyos-cfs/.SRCINFO
+++ b/linux-cachyos-cfs/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-cfs
pkgdesc = Linux CFS scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -27,7 +27,7 @@ pkgbase = linux-cachyos-cfs
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = 479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787
diff --git a/linux-cachyos-cfs/PKGBUILD b/linux-cachyos-cfs/PKGBUILD
index ae022799..5a4a9dba 100644
--- a/linux-cachyos-cfs/PKGBUILD
+++ b/linux-cachyos-cfs/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-cfs}
+_cpusched=${_cpusched-'cfs'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-y}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux CFS scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787')
diff --git a/linux-cachyos-cfs/config b/linux-cachyos-cfs/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos-cfs/config
+++ b/linux-cachyos-cfs/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos-hardened/.SRCINFO b/linux-cachyos-hardened/.SRCINFO
index b87c845d..fd38bec8 100644
--- a/linux-cachyos-hardened/.SRCINFO
+++ b/linux-cachyos-hardened/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-hardened
pkgdesc = Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -28,12 +28,12 @@ pkgbase = linux-cachyos-hardened
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-hardened.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = aba3016994b0f06c516efb7494d295676315510c2ef3a6c9140827f36841ad23
+ sha256sums = 5a499b0c113fba464a9edab9898d8b229c523e1a5472675b9f2f1771188a0c83
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = 479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787
sha256sums = 80f8c92d504c1152adc85d1f832308e8bab7211613bd6c9a3a0c6752f0810b14
- sha256sums = 4c67bd19fcd045747a22ac1080b4b1acc5576dee23ba24f2643455b084bc4378
+ sha256sums = 0851bb448a717cd8711534cb06962983a92302687656eec902194b28dfb15060
pkgname = linux-cachyos-hardened
pkgdesc = The Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 900a0c06..2843f714 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-hardened}
+_cpusched=${_cpusched-'hardened'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-y}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux hardenened BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -219,7 +220,7 @@ makedepends=(
git
)
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -331,9 +332,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -359,16 +370,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -439,28 +465,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -479,40 +552,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -612,15 +713,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -863,9 +974,9 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- 'aba3016994b0f06c516efb7494d295676315510c2ef3a6c9140827f36841ad23'
+ '5a499b0c113fba464a9edab9898d8b229c523e1a5472675b9f2f1771188a0c83'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787'
'80f8c92d504c1152adc85d1f832308e8bab7211613bd6c9a3a0c6752f0810b14'
- '4c67bd19fcd045747a22ac1080b4b1acc5576dee23ba24f2643455b084bc4378')
+ '0851bb448a717cd8711534cb06962983a92302687656eec902194b28dfb15060')
diff --git a/linux-cachyos-hardened/config b/linux-cachyos-hardened/config
index 3b20c116..ff032d73 100644
--- a/linux-cachyos-hardened/config
+++ b/linux-cachyos-hardened/config
@@ -1,15 +1,15 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.6 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120200
+CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23900
+CONFIG_AS_VERSION=24000
CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23900
+CONFIG_LD_VERSION=24000
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
@@ -21,13 +21,11 @@ CONFIG_PAHOLE_VERSION=124
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
-# CONFIG_TT_SCHED is not set
-# CONFIG_TT_ACCOUNTING_STATS is not set
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -56,7 +54,7 @@ CONFIG_ZSTD_COMP_VAL=19
# end of ZSTD compression options
CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="cachyos"
+CONFIG_DEFAULT_HOSTNAME="archlinux"
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_SYSVIPC_COMPAT=y
@@ -208,11 +206,8 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
#
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_BUCKETS_COUNT=5
-# CONFIG_SCHED_ALT is not set
# end of Scheduler features
-# CONFIG_CACULE_SCHED is not set
-# CONFIG_CACULE_RDB is not set
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_CC_HAS_INT128=y
@@ -257,9 +252,8 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_BORE is not set
+CONFIG_SCHED_BORE=y
CONFIG_SCHED_AUTOGROUP=y
-CONFIG_RT_SOFTIRQ_AWARE_SCHED=y
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
@@ -415,7 +409,6 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MZEN is not set
# CONFIG_MZEN2 is not set
# CONFIG_MZEN3 is not set
-# CONFIG_MZEN4 is not set
# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
@@ -438,8 +431,6 @@ CONFIG_INTEL_TDX_GUEST=y
# CONFIG_MSAPPHIRERAPIDS is not set
# CONFIG_MROCKETLAKE is not set
# CONFIG_MALDERLAKE is not set
-# CONFIG_MRAPTORLAKE is not set
-# CONFIG_MMETEORLAKE is not set
CONFIG_GENERIC_CPU=y
# CONFIG_GENERIC_CPU2 is not set
# CONFIG_GENERIC_CPU3 is not set
@@ -448,7 +439,6 @@ CONFIG_GENERIC_CPU=y
# CONFIG_MNATIVE_AMD is not set
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y
@@ -496,8 +486,6 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=m
CONFIG_PERF_EVENTS_AMD_BRS=y
# end of Performance monitoring
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
CONFIG_X86_VSYSCALL_EMULATION=y
CONFIG_X86_IOPL_IOPERM=y
CONFIG_MICROCODE=y
@@ -544,13 +532,12 @@ CONFIG_EFI_STUB=y
CONFIG_EFI_MIXED=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_500 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_500=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
-CONFIG_HZ=300
+CONFIG_HZ=500
CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
# CONFIG_KEXEC_FILE is not set
@@ -696,12 +683,10 @@ CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -866,21 +851,10 @@ CONFIG_HAVE_ARCH_STACKLEAK=y
CONFIG_HAVE_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_LTO=y
-CONFIG_LTO_CLANG=y
CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
-CONFIG_ARCH_SUPPORTS_LTO_GCC=y
-CONFIG_HAS_LTO_CLANG=y
CONFIG_LTO_NONE=y
-# CONFIG_LTO_CLANG_FULL is not set
-# CONFIG_LTO_CLANG_THIN is not set
-# CONFIG_LTO_GCC is not set
-# CONFIG_LTO_CP_CLONE is not set
CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
-CONFIG_ARCH_USES_CFI_TRAPS=y
-# CONFIG_CFI_CLANG is not set
-# CONFIG_CFI_PERMISSIVE is not set
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
CONFIG_HAVE_CONTEXT_TRACKING_USER=y
CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y
@@ -982,7 +956,6 @@ CONFIG_MODULE_SIG_HASH="sha512"
# CONFIG_MODULE_COMPRESS_GZIP is not set
# CONFIG_MODULE_COMPRESS_XZ is not set
CONFIG_MODULE_COMPRESS_ZSTD=y
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
#
# ZSTD module compression options
@@ -992,7 +965,7 @@ CONFIG_MODULE_COMPRESS_ZSTD_LEVEL=9
# end of ZSTD module compression options
CONFIG_MODULE_DECOMPRESS=y
-CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
CONFIG_MODPROBE_PATH="/sbin/modprobe"
CONFIG_MODULES_TREE_LOOKUP=y
CONFIG_BLOCK=y
@@ -1150,7 +1123,7 @@ CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
CONFIG_MEMORY_BALLOON=y
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=0
CONFIG_PAGE_REPORTING=y
CONFIG_MIGRATION=y
CONFIG_DEVICE_MIGRATION=y
@@ -1167,8 +1140,8 @@ CONFIG_HWPOISON_INJECT=m
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ARCH_WANTS_THP_SWAP=y
CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_THP_SWAP=y
CONFIG_READ_ONLY_THP_FOR_FS=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
@@ -1208,13 +1181,17 @@ CONFIG_ANON_VMA_NAME=y
CONFIG_LRU_GEN=y
CONFIG_LRU_GEN_ENABLED=y
# CONFIG_LRU_GEN_STATS is not set
-CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
-# CONFIG_PER_VMA_LOCK is not set
#
# Data Access Monitoring
#
-# CONFIG_DAMON is not set
+CONFIG_DAMON=y
+CONFIG_DAMON_VADDR=y
+CONFIG_DAMON_PADDR=y
+CONFIG_DAMON_SYSFS=y
+CONFIG_DAMON_DBGFS=y
+CONFIG_DAMON_RECLAIM=y
+CONFIG_DAMON_LRU_SORT=y
# end of Data Access Monitoring
# end of Memory Management options
@@ -1295,7 +1272,7 @@ CONFIG_INET_RAW_DIAG=m
CONFIG_INET_DIAG_DESTROY=y
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_CUBIC=m
CONFIG_TCP_CONG_WESTWOOD=m
CONFIG_TCP_CONG_HTCP=m
CONFIG_TCP_CONG_HSTCP=m
@@ -1310,9 +1287,10 @@ CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_TCP_CONG_DCTCP=m
CONFIG_TCP_CONG_CDG=m
CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
+CONFIG_TCP_CONG_BBR2=y
+CONFIG_DEFAULT_BBR2=y
# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_DEFAULT_TCP_CONG="bbr2"
CONFIG_TCP_MD5SIG=y
# CONFIG_TCP_SIMULT_CONNECT_DEFAULT_ON is not set
CONFIG_IPV6=y
@@ -2575,13 +2553,6 @@ CONFIG_ZRAM_DEF_COMP="lzo-rle"
CONFIG_ZRAM_WRITEBACK=y
# CONFIG_ZRAM_MEMORY_TRACKING is not set
CONFIG_ZRAM_MULTI_COMP=y
-# CONFIG_ZRAM_DEF_RECOMP_LZORLE is not set
-CONFIG_ZRAM_DEF_RECOMP_ZSTD=y
-# CONFIG_ZRAM_DEF_RECOMP_LZ4 is not set
-# CONFIG_ZRAM_DEF_RECOMP_LZO is not set
-# CONFIG_ZRAM_DEF_RECOMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_RECOMP_842 is not set
-CONFIG_ZRAM_DEF_RECOMP="zstd"
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
CONFIG_BLK_DEV_DRBD=m
@@ -2657,7 +2628,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -2856,7 +2826,6 @@ CONFIG_SCSI_DH_RDAC=m
CONFIG_SCSI_DH_HP_SW=m
CONFIG_SCSI_DH_EMC=m
CONFIG_SCSI_DH_ALUA=m
-CONFIG_VHBA=m
# end of SCSI device support
CONFIG_ATA=y
@@ -2967,7 +2936,6 @@ CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
CONFIG_BCACHE=m
# CONFIG_BCACHE_DEBUG is not set
# CONFIG_BCACHE_CLOSURES_DEBUG is not set
@@ -3992,20 +3960,13 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
# CONFIG_RTW88_DEBUG is not set
# CONFIG_RTW88_DEBUGFS is not set
@@ -6193,15 +6154,6 @@ CONFIG_VIDEO_CAFE_CCIC=m
# MMC/SDIO DVB adapters
#
CONFIG_SMS_SDIO_DRV=m
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIM2M=m
-CONFIG_VIDEO_VICODEC=m
-CONFIG_VIDEO_VIMC=m
-CONFIG_VIDEO_VIVID=m
-CONFIG_VIDEO_VIVID_CEC=y
-CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_DVB_TEST_DRIVERS=y
-CONFIG_DVB_VIDTV=m
#
# FireWire (IEEE 1394) Adapters
@@ -6221,7 +6173,6 @@ CONFIG_DVB_B2C2_FLEXCOP=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
# CONFIG_SMS_SIANO_DEBUGFS is not set
-CONFIG_VIDEO_V4L2_TPG=m
CONFIG_VIDEOBUF2_CORE=m
CONFIG_VIDEOBUF2_V4L2=m
CONFIG_VIDEOBUF2_MEMOPS=m
@@ -6568,11 +6519,6 @@ CONFIG_DVB_DRX39XYJ=m
#
CONFIG_DVB_CXD2099=m
CONFIG_DVB_SP2=m
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
# end of Media ancillary drivers
#
@@ -9878,12 +9824,6 @@ CONFIG_F2FS_FS_LZ4HC=y
CONFIG_F2FS_FS_ZSTD=y
CONFIG_F2FS_IOSTAT=y
CONFIG_F2FS_UNFAIR_RWSEM=y
-CONFIG_BCACHEFS_FS=y
-CONFIG_BCACHEFS_QUOTA=y
-CONFIG_BCACHEFS_POSIX_ACL=y
-# CONFIG_BCACHEFS_DEBUG is not set
-# CONFIG_BCACHEFS_TESTS is not set
-CONFIG_BCACHEFS_LOCK_TIME_STATS=y
CONFIG_ZONEFS_FS=m
CONFIG_FS_DAX=y
CONFIG_FS_DAX_PMD=y
@@ -10718,7 +10658,6 @@ CONFIG_BTREE=y
CONFIG_INTERVAL_TREE=y
CONFIG_XARRAY_MULTI=y
CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_CLOSURES=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT_MAP=y
CONFIG_HAS_DMA=y
@@ -10880,7 +10819,6 @@ CONFIG_DEBUG_WX=y
CONFIG_GENERIC_PTDUMP=y
CONFIG_PTDUMP_CORE=y
# CONFIG_PTDUMP_DEBUGFS is not set
-# CONFIG_PER_VMA_LOCK_STATS is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SHRINKER_DEBUG is not set
CONFIG_HAVE_DEBUG_KMEMLEAK=y
diff --git a/linux-cachyos-pds/.SRCINFO b/linux-cachyos-pds/.SRCINFO
index dcf9d256..5f4a18c3 100644
--- a/linux-cachyos-pds/.SRCINFO
+++ b/linux-cachyos-pds/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-pds
pkgdesc = Linux PDS scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -27,7 +27,7 @@ pkgbase = linux-cachyos-pds
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-prjc-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = f8d97fd1a17d8730a317eac694009b346ace1d9bf2630599ce06d8f6c53baf5b
diff --git a/linux-cachyos-pds/PKGBUILD b/linux-cachyos-pds/PKGBUILD
index 1c3e06cc..976c403b 100644
--- a/linux-cachyos-pds/PKGBUILD
+++ b/linux-cachyos-pds/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-pds}
+_cpusched=${_cpusched-'pds'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux PDS scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'f8d97fd1a17d8730a317eac694009b346ace1d9bf2630599ce06d8f6c53baf5b')
diff --git a/linux-cachyos-pds/config b/linux-cachyos-pds/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos-pds/config
+++ b/linux-cachyos-pds/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos-rc/.SRCINFO b/linux-cachyos-rc/.SRCINFO
index 8de0f9c8..cb1036ae 100644
--- a/linux-cachyos-rc/.SRCINFO
+++ b/linux-cachyos-rc/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-rc
pkgdesc = Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements
pkgver = 6.2.rc7
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 6f03b11b..f9115e4e 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-bore}
+_cpusched=${_cpusched-'bore'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-y}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-rc-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}-${_rcver}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS and with some other patches and other improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
diff --git a/linux-cachyos-server/.SRCINFO b/linux-cachyos-server/.SRCINFO
index 1d255ba3..52427af5 100644
--- a/linux-cachyos-server/.SRCINFO
+++ b/linux-cachyos-server/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-server
pkgdesc = Linux CFS scheduler Kernel by CachyOS targeted for Servers
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -26,7 +26,7 @@ pkgbase = linux-cachyos-server
source = auto-cpu-optimization.sh
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index 2c0e2273..4d6aa461 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'no'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-cfs}
+_cpusched=${_cpusched-'cfs'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-madvise}
+_hugepage=${_hugepage-'madvise'}
## Enable DAMON
_damon=${_damon-y}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-server-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux CFS scheduler Kernel by CachyOS targeted for Servers'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -412,7 +438,7 @@ prepare() {
scripts/config --set-val NR_CPUS "$_nr_cpus"
else
echo "Setting default NR_CPUS..."
- scripts/config --set-val NR_CPUS 320
+ scripts/config --set-val NR_CPUS 512
fi
### Disable MQ Deadline I/O scheduler
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,6 +970,6 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629')
diff --git a/linux-cachyos-server/config b/linux-cachyos-server/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos-server/config
+++ b/linux-cachyos-server/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos-tt/.SRCINFO b/linux-cachyos-tt/.SRCINFO
index 1001f881..08b94e7f 100644
--- a/linux-cachyos-tt/.SRCINFO
+++ b/linux-cachyos-tt/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos-tt
pkgdesc = Linux TT scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -27,7 +27,7 @@ pkgbase = linux-cachyos-tt
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-tt-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = d23955f69440adab0e1edd4e372bcf424c4772556a6bca7565ddd087eaf31fec
diff --git a/linux-cachyos-tt/PKGBUILD b/linux-cachyos-tt/PKGBUILD
index 670a6500..8a97456f 100644
--- a/linux-cachyos-tt/PKGBUILD
+++ b/linux-cachyos-tt/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-tt}
+_cpusched=${_cpusched-'tt'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux TT scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'd23955f69440adab0e1edd4e372bcf424c4772556a6bca7565ddd087eaf31fec')
diff --git a/linux-cachyos-tt/config b/linux-cachyos-tt/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos-tt/config
+++ b/linux-cachyos-tt/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-cachyos/.SRCINFO b/linux-cachyos/.SRCINFO
index 5bdc10d2..579a8065 100644
--- a/linux-cachyos/.SRCINFO
+++ b/linux-cachyos/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-cachyos
pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -28,7 +28,7 @@ pkgbase = linux-cachyos
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = 479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 7117156f..0d067bf9 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-### BUILD OPTIONS
-# Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-bore}
+_cpusched=${_cpusched-'bore'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-y}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=cachyos-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'479019c7ea52de10b6cadac468eb61215bafef596da3d751571bb6dc4fcd8787'
diff --git a/linux-cachyos/config b/linux-cachyos/config
index e20776ec..1d4bc295 100644
--- a/linux-cachyos/config
+++ b/linux-cachyos/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/linux-tt/.SRCINFO b/linux-tt/.SRCINFO
index 8f5e78da..ee82398d 100644
--- a/linux-tt/.SRCINFO
+++ b/linux-tt/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-tt
pkgdesc = Linux TT scheduler Kernel by CachyOS with other patches and improvements
pkgver = 6.1.10
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
arch = x86_64_v3
@@ -27,7 +27,7 @@ pkgbase = linux-tt
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-tt-cachy.patch
sha256sums = 0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d
- sha256sums = 111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6
+ sha256sums = a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847
sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106
sha256sums = 87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629
sha256sums = d23955f69440adab0e1edd4e372bcf424c4772556a6bca7565ddd087eaf31fec
diff --git a/linux-tt/PKGBUILD b/linux-tt/PKGBUILD
index 0aa4e70f..4a44e640 100644
--- a/linux-tt/PKGBUILD
+++ b/linux-tt/PKGBUILD
@@ -3,26 +3,29 @@
# Contributor: Tobias Powalowski <[email protected]>
# Contributor: Thomas Baechler <[email protected]>
-# ### BUILD OPTIONS
-# # Set these variables to ANYTHING that is not null or choose proper variable to enable them
-
### Selecting CachyOS config
-_cachy_config=${_cachy_config-y}
+# ATTENTION - one of two predefined values should be selected!
+# 'yes' - enable CachyOS config
+# 'no' - disable CachyOS config
+_cachy_config=${_cachy_config-'yes'}
### Selecting the CPU scheduler
-# ATTENTION - one of six predefined values should be selected!
+# ATTENTION - one of seven predefined values should be selected!
# 'bmq' - select 'BitMap Queue CPU scheduler'
# 'pds' - select 'Priority and Deadline based Skip list multiple queue CPU scheduler'
# 'bore' - select 'Burst-Oriented Response Enhancer'
# 'cfs' - select 'Completely Fair Scheduler'
# 'tt' - select 'Task Type Scheduler by Hamad Marri'
# 'hardened' - select 'BORE Scheduler hardened' ## kernel with hardened config and hardening patches with the bore scheduler
-_cpusched=${_cpusched-tt}
+_cpusched=${_cpusched-'tt'}
## Apply some suggested sysctl values from the bore developer
## These are adjusted to BORE
_tune_bore=${_tune_bore-}
+### BUILD OPTIONS
+# Set these variables to ANYTHING that is not null to enable them
+
### Tweak kernel options prior to a build via nconfig
_makenconfig=${_makenconfig-}
@@ -90,14 +93,14 @@ _kyber_disable=${_kyber_disable-y}
# 'standard' - enable multigenerational LRU
# 'stats' - enable multigenerational LRU with stats
# 'none' - disable multigenerational LRU
-_lru_config=${_lru_config-standard}
+_lru_config=${_lru_config-'standard'}
### Enable per-VMA locking
# ATTENTION - one of three predefined values should be selected!
# 'standard' - enable per-VMA locking
# 'stats' - enable per-VMA locking with stats
# 'none' - disable per-VMA locking
-_vma_config=${_vma_config-none}
+_vma_config=${_vma_config-'none'}
### Transparent Hugepages
# ATTENTION - one of two predefined values should be selected!
@@ -105,7 +108,7 @@ _vma_config=${_vma_config-none}
# 'madvise' - madvise, prevent applications from allocating more memory resources than necessary
# More infos here:
# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/performance_tuning_guide/sect-red_hat_enterprise_linux-performance_tuning_guide-configuring_transparent_huge_pages
-_hugepage=${_hugepage-always}
+_hugepage=${_hugepage-'always'}
## Enable DAMON
_damon=${_damon-}
@@ -138,14 +141,12 @@ _zstd_compression=${_zstd_compression-}
# 'normal' - standard compression ratio
# WARNING: the ultra settings can sometimes
# be counterproductive in both size and speed.
-_zstd_level_value=${_zstd_level_value-normal}
+_zstd_level_value=${_zstd_level_value-'normal'}
-# Clang LTO mode, only available with the "llvm" compiler - options are "none", "full" or "thin".
-# ATTENTION - one of three predefined values should be selected!
+# Clang LTO mode, only available with the "llvm" compiler - options are "no", "full" or "thin".
# "full: uses 1 thread for Linking, slow and uses more memory, theoretically with the highest performance gains."
# "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full."
-# "none: disable LTO
-_use_llvm_lto=${_use_llvm_lto-none}
+_use_llvm_lto=${_use_llvm_lto-}
# Use suffix -lto only when requested by the user
# Enabled by default.
@@ -188,7 +189,7 @@ _bcachefs=${_bcachefs-}
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice
_latency_nice=${_latency_nice-}
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" && -n "$_use_lto_suffix" ]]; then
+if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then
pkgsuffix=${_cpusched}-lto
pkgbase=linux-$pkgsuffix
@@ -207,7 +208,7 @@ _stable=${_major}.${_minor}
_srcname=linux-${_stable}
#_srcname=linux-${_major}
pkgdesc='Linux TT scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
_kernver=$pkgver-$pkgrel
arch=('x86_64' 'x86_64_v3')
url="https://github.com/CachyOS/linux-cachyos"
@@ -215,7 +216,7 @@ license=('GPL2')
options=('!strip')
makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch')
# LLVM makedepends
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]]; then
+if [ -n "$_use_llvm_lto" ]; then
makedepends+=(clang llvm lld python)
BUILD_FLAGS=(
CC=clang
@@ -327,9 +328,19 @@ prepare() {
fi
### Selecting CachyOS config
- if [ -n "$_cachy_config" ]; then
+ if [ "$_cachy_config" = "yes" ]; then
echo "Enabling CachyOS config..."
scripts/config -e CACHY
+ elif [ "$_cachy_config" = "no" ]; then
+ echo "Disabling CachyOS config..."
+ scripts/config -d CACHY
+ else
+ if [ -n "$_cachy_config" ]; then
+ error "The value $_cachy_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting CachyOS config failed!"
fi
### Selecting the CPU scheduler
@@ -355,16 +366,31 @@ prepare() {
fi
### Select LLVM level
- [ -z "$_use_llvm_lto" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_use_llvm_lto" in
- thin) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -d LTO_CLANG_FULL -e LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- full) scripts/config -e LTO -e LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG -e ARCH_SUPPORTS_LTO_CLANG_THIN -d LTO_NONE -e HAS_LTO_CLANG -e LTO_CLANG_FULL -d LTO_CLANG_THIN -e HAVE_GCC_PLUGINS;;
- none) scripts/config -e LTO_NONE;;
- *) _die "The value '$_use_llvm_lto' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_use_llvm_lto' LLVM level..."
+ if [ "$_use_llvm_lto" = "thin" ]; then
+ echo "Enabling LLVM THIN LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -d LTO_CLANG_FULL \
+ -e LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ elif [ "$_use_llvm_lto" = "full" ]; then
+ echo "Enabling LLVM FULL LTO..."
+ scripts/config -e LTO \
+ -e LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG \
+ -e ARCH_SUPPORTS_LTO_CLANG_THIN \
+ -d LTO_NONE \
+ -e HAS_LTO_CLANG \
+ -e LTO_CLANG_FULL \
+ -d LTO_CLANG_THIN \
+ -e HAVE_GCC_PLUGINS
+ else
+ scripts/config -e LTO_NONE
+ fi
### Enable GCC FULL LTO
### Disable LTO_CP_CLONE, its experimental
@@ -435,28 +461,75 @@ prepare() {
fi
### Select tick type
- [ -z "$_tickrate" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_tickrate" in
- perodic) scripts/config -d NO_HZ_IDLE -d NO_HZ_FULL -d NO_HZ -d NO_HZ_COMMON -e HZ_PERIODIC;;
- idle) scripts/config -d HZ_PERIODIC -d NO_HZ_FULL -e NO_HZ_IDLE -e NO_HZ -e NO_HZ_COMMON;;
- full) scripts/config -d HZ_PERIODIC -d NO_HZ_IDLE -d CONTEXT_TRACKING_FORCE -e NO_HZ_FULL_NODEF -e NO_HZ_FULL -e NO_HZ -e NO_HZ_COMMON -e CONTEXT_TRACKING;;
- *) _die "The value '$_tickrate' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_tickrate' tick type..."
+ if [ "$_tickrate" = "periodic" ]; then
+ echo "Enabling periodic ticks..."
+ scripts/config -d NO_HZ_IDLE \
+ -d NO_HZ_FULL \
+ -d NO_HZ \
+ -d NO_HZ_COMMON \
+ -e HZ_PERIODIC
+ elif [ "$_tickrate" = "idle" ]; then
+ echo "Enabling idle ticks.."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_FULL \
+ -e NO_HZ_IDLE \
+ -e NO_HZ \
+ -e NO_HZ_COMMON
+ elif [ "$_tickrate" = "full" ]; then
+ echo "Enabling full ticks..."
+ scripts/config -d HZ_PERIODIC \
+ -d NO_HZ_IDLE \
+ -d CONTEXT_TRACKING_FORCE \
+ -e NO_HZ_FULL_NODEF \
+ -e NO_HZ_FULL \
+ -e NO_HZ \
+ -e NO_HZ_COMMON \
+ -e CONTEXT_TRACKING
+ else
+ if [ -n "$_tickrate" ]; then
+ error "The value $_tickrate is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the tick rate failed!"
+ fi
### Select preempt type
- [ -z "$_preempt" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_preempt" in
- full) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -d PREEMPT_VOLUNTARY -e PREEMPT -e PREEMPT_COUNT -e PREEMPTION -e PREEMPT_DYNAMIC;;
- voluntary) scripts/config -e PREEMPT_BUILD -d PREEMPT_NONE -e PREEMPT_VOLUNTARY -d PREEMPT -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_DYNAMIC;;
- server) scripts/config -e PREEMPT_NONE_BUILD -e PREEMPT_NONE -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPTION -d PREEMPT_DYNAMIC;;
- *) _die "The value '$_preempt' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_preempt' preempt type..."
+ if [ "$_preempt" = "full" ]; then
+ echo "Enabling low latency preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -e PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -e PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "voluntary" ]; then
+ echo "Enabling voluntary preempt..."
+ scripts/config -e PREEMPT_BUILD \
+ -d PREEMPT_NONE \
+ -e PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -e PREEMPT_COUNT \
+ -e PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ elif [ "$_preempt" = "server" ]; then
+ echo "Enabling server preempt..."
+ scripts/config -e PREEMPT_NONE_BUILD \
+ -e PREEMPT_NONE \
+ -d PREEMPT_VOLUNTARY \
+ -d PREEMPT \
+ -d PREEMPT_COUNT \
+ -d PREEMPTION \
+ -d PREEMPT_DYNAMIC
+ else
+ if [ -n "$_preempt" ]; then
+ error "The value $_preempt is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting PREEMPT failed!"
+ fi
### Enable O3
if [ -n "$_cc_harder" ]; then
@@ -475,40 +548,68 @@ prepare() {
--set-str DEFAULT_TCP_CONG bbr2
fi
- ### Select LRU config
- [ -z "$_lru_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_lru_config" in
- standard) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -d LRU_GEN_STATS;;
- stats) scripts/config -e LRU_GEN -e LRU_GEN_ENABLED -e LRU_GEN_STATS;;
- none) scripts/config -d LRU_GEN;;
- *) _die "The value '$_lru_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_lru_config' LRU_GEN config..."
+ ### Select LRU config
+ if [ "$_lru_config" = "standard" ]; then
+ echo "Enabling multigenerational LRU..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -d LRU_GEN_STATS
+ elif [ "$_lru_config" = "stats" ]; then
+ echo "Enabling multigenerational LRU with stats..."
+ scripts/config -e LRU_GEN \
+ -e LRU_GEN_ENABLED \
+ -e LRU_GEN_STATS
+ elif [ "$_lru_config" = "none" ]; then
+ echo "Disabling multigenerational LRU..."
+ scripts/config -d LRU_GEN
+ else
+ if [ -n "$_lru_config" ]; then
+ error "The value $_lru_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ error "Enabling multigenerational LRU failed!"
+ exit
+ fi
### Select VMA config
- [ -z "$_vma_config" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_vma_config" in
- standard) scripts/config -e PER_VMA_LOCK -d PER_VMA_LOCK_STATS;;
- stats) scripts/config -e PER_VMA_LOCK -e PER_VMA_LOCK_STATS;;
- none) scripts/config -d PER_VMA_LOCK;;
- *) _die "The value '$_vma_config' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_vma_config' PER_VMA_LOCK config..."
-
- ### Select THP
- [ -z "$_hugepage" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_hugepage" in
- always) scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE -e TRANSPARENT_HUGEPAGE_ALWAYS;;
- madvise) scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS -e TRANSPARENT_HUGEPAGE_MADVISE;;
- *) _die "The value '$_hugepage' is invalid. Choose the correct one again.";;
- esac
+ if [ "$_vma_config" = "standard" ]; then
+ echo "Enabling per-VMA locking..."
+ scripts/config -e PER_VMA_LOCK \
+ -d PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "stats" ]; then
+ echo "Enabling per-VMA locking with stats..."
+ scripts/config -e PER_VMA_LOCK \
+ -e PER_VMA_LOCK_STATS
+ elif [ "$_vma_config" = "none" ]; then
+ echo "Disabling per-VMA locking..."
+ scripts/config -d PER_VMA_LOCK
+ else
+ if [ -n "$_vma_config" ]; then
+ error "The value $_vma_config is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Enabling per-VMA locking failed!"
+ fi
- echo "Selecting '$_hugepage' TRANSPARENT_HUGEPAGE config..."
+ ### Select THP
+ if [ "$_hugepage" = "always" ]; then
+ echo "Enable THP always..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_MADVISE \
+ -e TRANSPARENT_HUGEPAGE_ALWAYS
+ elif [ "$_hugepage" = "madvise" ]; then
+ echo "Enable THP madvise..."
+ scripts/config -d TRANSPARENT_HUGEPAGE_ALWAYS \
+ -e TRANSPARENT_HUGEPAGE_MADVISE
+ else
+ if [ -n "$_hugepage" ]; then
+ error "The value $_hugepage is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Setting THP has failed!"
+ fi
### Enable DAMON
if [ -n "$_damon" ]; then
@@ -608,15 +709,25 @@ prepare() {
fi
### Selecting the ZSTD modules and kernel compression level
- [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again."
-
- case "$_zstd_level_value" in
- ultra) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 -e MODULE_COMPRESS_ZSTD_ULTRA --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 --set-val ZSTD_COMP_VAL 22;;
- normal) scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 -d MODULE_COMPRESS_ZSTD_ULTRA --set-val ZSTD_COMP_VAL 19;;
- *) _die "The value '$_zstd_level_value' is invalid. Choose the correct one again.";;
- esac
-
- echo "Selecting '$_zstd_level_value' ZSTD modules and kernel compression level..."
+ if [ "$_zstd_level_value" = "ultra" ]; then
+ echo "Enabling highest ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 19 \
+ -e MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \
+ --set-val ZSTD_COMP_VAL 22
+ elif [ "$_zstd_level_value" = "normal" ]; then
+ echo "Enabling standard ZSTD modules and kernel compression ratio..."
+ scripts/config --set-val MODULE_COMPRESS_ZSTD_LEVEL 9 \
+ -d MODULE_COMPRESS_ZSTD_ULTRA \
+ --set-val ZSTD_COMP_VAL 19
+ else
+ if [ -n "$_zstd_level_value" ]; then
+ error "The value $_zstd_level_value is invalid. Choose the correct one again."
+ else
+ error "The value is empty. Choose the correct one again."
+ fi
+ _die "Selecting the ZSTD modules and kernel compression level failed!"
+ fi
### Disable DEBUG
if [ -n "$_disable_debug" ]; then
@@ -859,7 +970,7 @@ for _p in "${pkgname[@]}"; do
done
sha256sums=('0be2919ba91cf5873a4cb4d429de78aad0469120d624e333a43b4b011d74d19d'
- '111246473833b7576d33e284becf55dbb3533b657391fa2a3846b0da6d6039c6'
+ 'a9673e76b766f3a71472e39fb6a3e03e5c1e6d91680cb50b0b54af610039a847'
'41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106'
'87929b669f1081d34e27768ee9426da8c97038619d4deee38487f93ca9c9a629'
'd23955f69440adab0e1edd4e372bcf424c4772556a6bca7565ddd087eaf31fec')
diff --git a/linux-tt/config b/linux-tt/config
index e20776ec..1d4bc295 100644
--- a/linux-tt/config
+++ b/linux-tt/config
@@ -1,8 +1,8 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.7 Kernel Configuration
+# Linux/x86 6.1.10 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230111"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=120201
CONFIG_CLANG_VERSION=0
@@ -27,7 +27,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
# General setup
#
-# CONFIG_CACHY is not set
+CONFIG_CACHY=y
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
# CONFIG_WERROR is not set
@@ -552,7 +552,6 @@ CONFIG_HZ_300=y
# CONFIG_HZ_600 is not set
# CONFIG_HZ_750 is not set
# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_2000 is not set
CONFIG_HZ=300
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
@@ -2681,7 +2680,6 @@ CONFIG_DW_XDATA_PCIE=m
CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_XILINX_SDFEC=m
CONFIG_MISC_RTSX=m
-CONFIG_WINESYNC=y
CONFIG_C2PORT=m
CONFIG_C2PORT_DURAMAR_2150=m
@@ -4026,23 +4024,14 @@ CONFIG_RTL8XXXU_UNTESTED=y
CONFIG_RTW88=m
CONFIG_RTW88_CORE=m
CONFIG_RTW88_PCI=m
-CONFIG_RTW88_SDIO=m
-CONFIG_RTW88_USB=m
CONFIG_RTW88_8822B=m
CONFIG_RTW88_8822C=m
CONFIG_RTW88_8723D=m
CONFIG_RTW88_8821C=m
CONFIG_RTW88_8822BE=m
-CONFIG_RTW88_8822BS=m
-CONFIG_RTW88_8822BU=m
CONFIG_RTW88_8822CE=m
-CONFIG_RTW88_8822CS=m
-CONFIG_RTW88_8822CU=m
CONFIG_RTW88_8723DE=m
-CONFIG_RTW88_8723DU=m
CONFIG_RTW88_8821CE=m
-CONFIG_RTW88_8821CS=m
-CONFIG_RTW88_8821CU=m
CONFIG_RTW88_DEBUG=y
CONFIG_RTW88_DEBUGFS=y
CONFIG_RTW89=m
diff --git a/script.sh b/script.sh
index 12f7d62a..e00c32fa 100755
--- a/script.sh
+++ b/script.sh
@@ -25,7 +25,7 @@ mv */*-x86_64_v3.pkg.tar.zst* /home/ptr1337/.docker/build/nginx/www/repo/x86_64_
repoctl update -P cachyos-v3
## LLVM v3 Kernel
-find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_llvm_lto-none/_use_llvm_lto-thin/" {}
+find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_llvm_lto-/_use_llvm_lto-thin/" {}
files=$(find . -name "PKGBUILD")
@@ -45,7 +45,7 @@ repoctl update -P cachyos-v3
## GCC Generic Kernel
find . -name "config" | xargs -I {} sed -i 's/GENERIC_CPU3=y/GENERIC_CPU=y/' {}
-find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_llvm_lto-thin/_use_llvm_lto-none/" {}
+find . -name "PKGBUILD" | xargs -I {} sed -i "s/_use_llvm_lto-thin/_use_llvm_lto-/" {}
files=$(find . -name "PKGBUILD")