diff --git a/.SRCINFO b/.SRCINFO index 5ffb5a4c9424..1d75b85c9e73 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-bore pkgdesc = Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.11.0 - pkgrel = 5 + pkgver = 6.11.1 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 license = GPL-2.0-only @@ -18,16 +18,16 @@ pkgbase = linux-cachyos-bore options = !strip options = !debug options = !lto - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.11.1.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.11/sched/0001-bore-cachy.patch - b2sums = e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab - b2sums = b338ac759eaa3ff4c3fd34bea73fd4dbca1513d35b5a9e44cff1ac8ecb6d29f3db81e85a529fe854a20bc92aff19d215e578a47180242c9951879dd40f79e329 + b2sums = ac9927d74542a2d244b9d683920363ec2dbbe851ae0e069b278f1a0ba82c58b00f0f0312104b46f1b8c06585c2e6acb7eb1e63bd28499891f629c00f9a32f6b5 + b2sums = cd69b5c9fca0788936a96b4e64f4d56f6e70818591587062b5ef4ae98e401d15ffddb910cdc2a1c70516c183bb2b4f2be955d7b1e1fec9bb37e632064068abae b2sums = b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667 - b2sums = 9eb3b415c780a04ceb820531acbf0994df0f626af1f3a3186845e178d39602d132b09668ea2073a11d20abf394f2e479d765b3de06afca3ce22a99738d5c7f32 - b2sums = 0f506ee8089c3824ce70b077c2c3094115744e4f08441f94e333f3aba42da5b4429818c00333b613175b59e5eb0d02187c57acc59e11879a6fe9b96e6278c6a1 + b2sums = cdefbe6df1fbf6da4b38042e1304996be508ba303d4193bab63f40e94a37755ac7597cda4b25c142d46a88841352d01ced7959bbfc7225e1ae58246df9b174c7 + b2sums = 49c1ba4652e5be2135c8b45c545bf964b8f9dcf143ebd4616f4b7d925a96b27d903c8a7d1032bef136366094d46f2e1d9ee28d8193b87b62b889dd52e2171b68 pkgname = linux-cachyos-bore pkgdesc = The Linux BORE + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index c40ad3e64947..9ef621aa5e20 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler @@ -49,6 +51,9 @@ _NUMAdisable=${_NUMAdisable-} # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg=${_localmodcfg-} +# Path to the list of used modules +_localmodcfg_path=${_localmodcfg_path-"$HOME/.config/modprobed.db"} + # Use the current kernel's .config file # Enabling this option will use the .config of the RUNNING kernel rather than # the ARCH defaults. Useful when the package gets updated and you already went @@ -59,10 +64,6 @@ _use_current=${_use_current-} ### Enable KBUILD_CFLAGS -O3 _cc_harder=${_cc_harder-y} -### Enable KBUILD_CFLAGS -Os -## DO NOT SET, THIS IS FOR INTERNAL CI USE ONLY. -_cc_size=${_cc_size-} - ### Set this to your number of threads you have in your machine otherwise it will default to 320 _nr_cpus=${_nr_cpus-} @@ -150,17 +151,17 @@ elif [ -n "$_use_llvm_lto" ] || [[ "$_use_lto_suffix" = "n" ]]; then pkgbase="linux-$_pkgsuffix" fi _major=6.11 -_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 + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=5 +pkgrel=1 _kernver="$pkgver-$pkgrel" _kernuname="${pkgver}-${_pkgsuffix}" arch=('x86_64') @@ -216,16 +217,17 @@ fi # NVIDIA pre-build module support if [ -n "$_build_nvidia" ]; then source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch") fi if [ -n "$_build_nvidia_open" ]; then source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz" - "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch" - "${_patchsource}/misc/nvidia/nvidia-open-gcc-ibt-sls.patch" - "${_patchsource}/misc/nvidia/fix-zen5.patch" - "${_patchsource}/misc/nvidia/6.11-fbdev.patch") + "${_patchsource}/misc/nvidia/0001-Make-modeset-and-fbdev-default-enabled.patch" + "${_patchsource}/misc/nvidia/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" + "${_patchsource}/misc/nvidia/0003-Add-IBT-Support.patch" + "${_patchsource}/misc/nvidia/0004-6.11-Add-fix-for-fbdev.patch" + "${_patchsource}/misc/nvidia/0005-6.12-drm_outpull_pill-changed-check.patch") fi ## List of CachyOS schedulers @@ -257,7 +259,7 @@ export KBUILD_BUILD_HOST=cachyos export KBUILD_BUILD_USER="$pkgbase" export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_die() { error "$@" ; exit; } +_die() { error "$@" ; exit 1; } prepare() { cd "$_srcname" @@ -269,12 +271,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = make-modeset-fbdev-default.patch ]] && continue - [[ $src = nvidia-open-gcc-ibt-sls.patch ]] && continue - [[ $src = fix-zen5.patch ]] && continue - [[ $src = 6.11-fbdev.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -286,16 +286,16 @@ prepare() { ### Select CPU optimization if [ -n "$_processor_opt" ]; then MARCH="${_processor_opt^^}" - MARCH2=${MARCH} - if [[ ! "$MARCH" =~ GENERIC* ]]; then - MARCH2="M${MARCH}" - else - MARCH2="${MARCH/V/CPU}" + if [ "$MARCH" != "GENERIC" ]; then + if [[ "$MARCH" =~ GENERIC_V[1-4] ]]; then + X86_64_LEVEL="${MARCH//GENERIC_V}" + scripts/config --set-val X86_64_VERSION "${X86_64_LEVEL}" + else + scripts/config -k -d CONFIG_GENERIC_CPU + scripts/config -k -e "CONFIG_M${MARCH}" + fi fi - - scripts/config -k -d CONFIG_GENERIC_CPU - scripts/config -k -e "CONFIG_${MARCH2}" fi ### Use autooptimization @@ -428,11 +428,20 @@ prepare() { -e CC_OPTIMIZE_FOR_PERFORMANCE_O3 fi - ### Enable Os - if [ -n "$_cc_size" ] && [ -z "$_cc_harder" ]; then - echo "Enabling KBUILD_CFLAGS -Os..." + ### CI-only stuff + if [[ -n "$CI" || -n "$GITHUB_RUN_ID" ]]; then + echo "Detected build inside CI" scripts/config -d CC_OPTIMIZE_FOR_PERFORMANCE \ - -e CONFIG_CC_OPTIMIZE_FOR_SIZE + -d CC_OPTIMIZE_FOR_PERFORMANCE_O3 \ + -e CONFIG_CC_OPTIMIZE_FOR_SIZE \ + -d SLUB_DEBUG \ + -d PM_DEBUG \ + -d PM_ADVANCED_DEBUG \ + -d PM_SLEEP_DEBUG \ + -d ACPI_DEBUG \ + -d LATENCYTOP \ + -d SCHED_DEBUG \ + -d DEBUG_PREEMPT fi ### Enable bbr3 @@ -478,9 +487,9 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - if [ -e "$HOME/.config/modprobed.db" ]; then + if [ -e "$_localmodcfg_path" ]; then echo "Running Steven Rostedt's make localmodconfig now" - make "${BUILD_FLAGS[@]}" LSMOD="$HOME/.config/modprobed.db" localmodconfig + make "${BUILD_FLAGS[@]}" LSMOD="${_localmodcfg_path}" localmodconfig else _die "No modprobed.db data found" fi @@ -518,19 +527,21 @@ prepare() { sh "${_nv_pkg}.run" --extract-only # Use fbdev and modeset as default - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_pkg}/kernel" # Fix broken fbdev on 6.11 - patch -Np2 -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" + patch -Np2 -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_pkg}/kernel" fi if [ -n "$_build_nvidia_open" ]; then - patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" + patch -Np1 -i "${srcdir}/0001-Make-modeset-and-fbdev-default-enabled.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open" # Fix for https://bugs.archlinux.org/task/74886 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/nvidia-open-gcc-ibt-sls.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0003-Add-IBT-Support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix for Zen5 error print in dmesg - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/fix-zen5.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch" -d "${srcdir}/${_nv_open_pkg}" # Fix broken fbdev on 6.11 - patch -Np1 --no-backup-if-mismatch -i "${srcdir}/6.11-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0004-6.11-Add-fix-for-fbdev.patch" -d "${srcdir}/${_nv_open_pkg}" + # Fix for 6.12 Module Compilation + patch -Np1 --no-backup-if-mismatch -i "${srcdir}/0005-6.12-drm_outpull_pill-changed-check.patch" -d "${srcdir}/${_nv_open_pkg}" fi } @@ -539,15 +550,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -555,13 +565,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi @@ -769,8 +773,8 @@ for _p in "${pkgname[@]}"; do }" done -b2sums=('e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab' - 'b338ac759eaa3ff4c3fd34bea73fd4dbca1513d35b5a9e44cff1ac8ecb6d29f3db81e85a529fe854a20bc92aff19d215e578a47180242c9951879dd40f79e329' +b2sums=('ac9927d74542a2d244b9d683920363ec2dbbe851ae0e069b278f1a0ba82c58b00f0f0312104b46f1b8c06585c2e6acb7eb1e63bd28499891f629c00f9a32f6b5' + 'cd69b5c9fca0788936a96b4e64f4d56f6e70818591587062b5ef4ae98e401d15ffddb910cdc2a1c70516c183bb2b4f2be955d7b1e1fec9bb37e632064068abae' 'b1e964389424d43c398a76e7cee16a643ac027722b91fe59022afacb19956db5856b2808ca0dd484f6d0dfc170482982678d7a9a00779d98cd62d5105200a667' - '9eb3b415c780a04ceb820531acbf0994df0f626af1f3a3186845e178d39602d132b09668ea2073a11d20abf394f2e479d765b3de06afca3ce22a99738d5c7f32' - '0f506ee8089c3824ce70b077c2c3094115744e4f08441f94e333f3aba42da5b4429818c00333b613175b59e5eb0d02187c57acc59e11879a6fe9b96e6278c6a1') + 'cdefbe6df1fbf6da4b38042e1304996be508ba303d4193bab63f40e94a37755ac7597cda4b25c142d46a88841352d01ced7959bbfc7225e1ae58246df9b174c7' + '49c1ba4652e5be2135c8b45c545bf964b8f9dcf143ebd4616f4b7d925a96b27d903c8a7d1032bef136366094d46f2e1d9ee28d8193b87b62b889dd52e2171b68') diff --git a/config b/config index dd0d017d40d9..eea8071d747b 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.11.0 Kernel Configuration +# Linux/x86 6.11.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.1 20240910" CONFIG_CC_IS_GCC=y @@ -230,9 +230,11 @@ CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y +CONFIG_GROUP_SCHED_WEIGHT=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_CFS_BANDWIDTH=y # CONFIG_RT_GROUP_SCHED is not set +CONFIG_EXT_GROUP_SCHED=y CONFIG_SCHED_MM_CID=y CONFIG_UCLAMP_TASK_GROUP=y CONFIG_CGROUP_PIDS=y @@ -432,8 +434,8 @@ CONFIG_INTEL_TDX_GUEST=y # CONFIG_MZEN4 is not set # CONFIG_MZEN5 is not set # CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set # CONFIG_MATOM is not set +# CONFIG_MCORE2 is not set # CONFIG_MNEHALEM is not set # CONFIG_MWESTMERE is not set # CONFIG_MSILVERMONT is not set @@ -457,11 +459,10 @@ CONFIG_INTEL_TDX_GUEST=y # CONFIG_MMETEORLAKE is not set # CONFIG_MEMERALDRAPIDS is not set CONFIG_GENERIC_CPU=y -# CONFIG_GENERIC_CPU2 is not set -# CONFIG_GENERIC_CPU3 is not set -# CONFIG_GENERIC_CPU4 is not set # CONFIG_MNATIVE_INTEL is not set # CONFIG_MNATIVE_AMD is not set +CONFIG_SUPPORT_MARCH_CODEVERS=y +CONFIG_X86_64_VERSION=1 CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_USE_PPRO_CHECKSUM=y