diff --git a/.SRCINFO b/.SRCINFO index 64bcbf9..811ef4b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements - pkgver = 5.19.0 - pkgrel = 2 + pkgver = 5.19.1 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -21,15 +21,15 @@ pkgbase = linux-cachyos makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.1.tar.xz source = config source = auto-cpu-optimization.sh - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.19/all/0001-cachyos-base-all.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.19/sched/0001-bore.patch - sha256sums = ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 - sha256sums = 4df524b3253ed3b197c6db24771525902fd8978d2eeabcb2a3a4305c4afc7327 + source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/5.19/all/0001-cachyos-base-all.patch + source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/5.19/sched/0001-bore.patch + sha256sums = f4e27b926ea2c66b808db1f5706254cf92a8899e2108eedb0c3a7d12499aea55 + sha256sums = 6b0338cb4adcc48b0c9db4b2e9d861562fd1e096144c65fc35b93c788ed97eb3 sha256sums = ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f - sha256sums = 200d69d6188e6d54099959a8efffd17c52732b5a64465d947517edea6c2896f1 + sha256sums = 1d42d128d1a3d414e6fd2b8cf5b5f8867061f749644e8e5600526ac47a770fad sha256sums = 0fe7f1698639df033709c6d32e651d378fc6e320dfc6387f8aee83d9ed0231a8 pkgname = linux-cachyos diff --git a/PKGBUILD b/PKGBUILD index 2997754..2116d60 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 && Piotr Gorski # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler @@ -21,6 +21,15 @@ _cpusched='bore' ### Tweak kernel options prior to a build via nconfig _makenconfig= +### Tweak kernel options prior to a build via menuconfig +_makemenuconfig= + +### Tweak kernel options prior to a build via xconfig +_makexconfig= + +### Tweak kernel options prior to a build via gconfig +_makegconfig= + # NUMA is optimized for multi-socket motherboards. # A single multi-core CPU actually runs slower with NUMA enabled. # See, https://bugs.archlinux.org/task/31187 @@ -100,6 +109,14 @@ _disable_debug=y ## Enable zram/zswap ZSTD compression _zstd_compression=y +### Selecting the ZSTD kernel and modules compression level +# ATTENTION - one of two predefined values should be selected! +# 'ultra' - highest compression ratio +# 'normal' - standard compression ratio +# WARNING: the ultra settings can sometimes +# be counterproductive in both size and speed. +_zstd_level_value='normal' + # 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." @@ -131,17 +148,17 @@ else pkgbase=linux-$pkgsuffix fi _major=5.19 -_minor=0 +_minor=1 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -#_stable=${_major}.${_minor} -_stable=${_major} +_stable=${_major}.${_minor} +#_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=1 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -163,7 +180,7 @@ if [ -n "$_build_zfs" ]; then makedepends+=(git) fi -_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/${_major}" +_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}" source=( "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz" "config" @@ -390,10 +407,7 @@ prepare() { if [ -n "$_per_gov" ]; then echo "Setting performance governor..." scripts/config --disable CPU_FREQ_DEFAULT_GOV_SCHEDUTIL \ - --enable CPU_FREQ_DEFAULT_GOV_PERFORMANCE \ - --enable PCIEASPM \ - --enable PCIEASPM_PERFORMANCE \ - --enable PCIE_BUS_PERFORMANCE + --enable CPU_FREQ_DEFAULT_GOV_PERFORMANCE fi ### Select tick type @@ -594,12 +608,39 @@ prepare() { --disable LRNG_SELFTEST_PANIC fi - ### Enable ZSTD swap/zram compression - if [ -n "$_zstd_swap_compression" ]; then - echo "Enabling zram ZSTD compression..." - scripts/config --disable CONFIG_ZSWAP_DEFAULT_ON \ - --enable ZRAM_ENTROPY \ - --set-val ZRAM_ENTROPY_THRESHOLD 100000 + ### Enable zram/zswap ZSTD compression + if [ -n "$_zstd_compression" ]; then + echo "Enabling zram/swap ZSTD compression..." + scripts/config --disable CONFIG_ZRAM_DEF_COMP_LZORLE \ + --enable CONFIG_ZRAM_DEF_COMP_ZSTD \ + --set-str CONFIG_ZRAM_DEF_COMP zstd \ + --disable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 \ + --enable CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD \ + --set-str CONFIG_ZSWAP_COMPRESSOR_DEFAULT zstd \ + --enable CONFIG_ZRAM_ENTROPY \ + --set-val CONFIG_ZRAM_ENTROPY_THRESHOLD 100000 + fi + + ### Selecting the 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 CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 19 \ + --enable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA \ + --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL_ULTRA 22 \ + --set-val CONFIG_ZSTD_COMP_VAL 22 + elif [ "$_zstd_level_value" = "normal" ]; then + echo "Enabling standard ZSTD modules and kernel compression ratio..." + scripts/config --set-val CONFIG_MODULE_COMPRESS_ZSTD_LEVEL 9 \ + --disable CONFIG_MODULE_COMPRESS_ZSTD_ULTRA \ + --set-val CONFIG_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 + error "Selecting the ZSTD modules and kernel compression level failed!" + exit fi ### Disable DEBUG @@ -666,6 +707,15 @@ prepare() { ### Running make nconfig [[ -z "$_makenconfig" ]] || make ${BUILD_FLAGS[*]} nconfig + ### Running make menuconfig + [[ -z "$_makemenuconfig" ]] || make ${BUILD_FLAGS[*]} menuconfig + + ### Running make xconfig + [[ -z "$_makexconfig" ]] || make ${BUILD_FLAGS[*]} xconfig + + ### Running make gconfig + [[ -z "$_makegconfig" ]] || make ${BUILD_FLAGS[*]} gconfig + ### Save configuration for later reuse echo "Save configuration for later reuse..." cat .config > "${startdir}/config-${pkgver}-${pkgrel}${pkgbase#linux}" @@ -834,8 +884,8 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8' - '4df524b3253ed3b197c6db24771525902fd8978d2eeabcb2a3a4305c4afc7327' +sha256sums=('f4e27b926ea2c66b808db1f5706254cf92a8899e2108eedb0c3a7d12499aea55' + '6b0338cb4adcc48b0c9db4b2e9d861562fd1e096144c65fc35b93c788ed97eb3' 'ce8bf7807b45a27eed05a5e1de5a0bf6293a3bbc2085bacae70cd1368f368d1f' - '200d69d6188e6d54099959a8efffd17c52732b5a64465d947517edea6c2896f1' + '1d42d128d1a3d414e6fd2b8cf5b5f8867061f749644e8e5600526ac47a770fad' '0fe7f1698639df033709c6d32e651d378fc6e320dfc6387f8aee83d9ed0231a8') diff --git a/config b/config index 093e3f8..99cc847 100644 --- a/config +++ b/config @@ -2,14 +2,14 @@ # Automatically generated file; DO NOT EDIT. # Linux/x86 5.19.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.1 20220730" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120100 +CONFIG_GCC_VERSION=120101 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23800 +CONFIG_AS_VERSION=23900 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23800 +CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -40,6 +40,7 @@ CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_HAVE_KERNEL_UNCOMPRESSED=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set @@ -47,6 +48,14 @@ CONFIG_HAVE_KERNEL_ZSTD=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_KERNEL_ZSTD=y +# CONFIG_KERNEL_UNCOMPRESSED is not set + +# +# ZSTD compression options +# +CONFIG_ZSTD_COMP_VAL=19 +# end of ZSTD compression options + CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="cachyos" CONFIG_SYSVIPC=y @@ -102,10 +111,10 @@ CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set +# CONFIG_NO_HZ_IDLE is not set +CONFIG_NO_HZ_FULL=y CONFIG_CONTEXT_TRACKING=y -CONFIG_CONTEXT_TRACKING_FORCE=y +# CONFIG_CONTEXT_TRACKING_FORCE is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100 @@ -141,8 +150,8 @@ CONFIG_SCHED_CORE=y # # CPU/Task time and stats accounting # -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +CONFIG_VIRT_CPU_ACCOUNTING=y +CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_SCHED_AVG_IRQ=y CONFIG_BSD_PROCESS_ACCT=y @@ -542,6 +551,7 @@ CONFIG_ARCH_HAS_KEXEC_PURGATORY=y CONFIG_KEXEC_SIG=y # CONFIG_KEXEC_SIG_FORCE is not set CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y +CONFIG_KEXEC_PURGATORY_SKIP_SIG=y CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 @@ -957,6 +967,14 @@ CONFIG_MODULE_SIG_HASH="sha512" # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS_XZ is not set CONFIG_MODULE_COMPRESS_ZSTD=y + +# +# ZSTD module compression options +# +CONFIG_MODULE_COMPRESS_ZSTD_LEVEL=9 +# CONFIG_MODULE_COMPRESS_ZSTD_ULTRA is not set +# end of ZSTD module compression options + CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y CONFIG_MODPROBE_PATH="/sbin/modprobe" CONFIG_MODULES_TREE_LOOKUP=y @@ -1063,14 +1081,14 @@ CONFIG_COREDUMP=y CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y -CONFIG_ZSWAP_DEFAULT_ON=y +# CONFIG_ZSWAP_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set -# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4" +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set @@ -1098,9 +1116,6 @@ CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_ANON_MIN_KBYTES=0 -CONFIG_CLEAN_LOW_KBYTES=524288 -CONFIG_CLEAN_MIN_KBYTES=0 CONFIG_HAVE_FAST_GUP=y CONFIG_NUMA_KEEP_MEMINFO=y CONFIG_MEMORY_ISOLATION=y @@ -2609,15 +2624,17 @@ CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m -CONFIG_ZRAM_DEF_COMP_LZORLE=y -# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZORLE is not set +CONFIG_ZRAM_DEF_COMP_ZSTD=y # CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_842 is not set -CONFIG_ZRAM_DEF_COMP="lzo-rle" +CONFIG_ZRAM_DEF_COMP="zstd" CONFIG_ZRAM_WRITEBACK=y # CONFIG_ZRAM_MEMORY_TRACKING is not set +CONFIG_ZRAM_ENTROPY=y +CONFIG_ZRAM_ENTROPY_THRESHOLD=100000 CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 CONFIG_BLK_DEV_DRBD=m @@ -4432,7 +4449,6 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_NR_TTY_DEVICES=63 CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y @@ -8247,6 +8263,7 @@ CONFIG_LEDS_TRIGGER_NETDEV=m CONFIG_LEDS_TRIGGER_PATTERN=m CONFIG_LEDS_TRIGGER_AUDIO=m CONFIG_LEDS_TRIGGER_TTY=m +CONFIG_LEDS_TRIGGER_BLKDEV=m # # Simple LED drivers