From f2bc3682f47dca624c65f8e1382af7409ccbf987 Mon Sep 17 00:00:00 2001 From: "P. Jung" Date: Thu, 14 Oct 2021 20:20:05 +0000 Subject: [PATCH] updates/fixes --- .SRCINFO | 26 ++++++++++---------------- PKGBUILD | 37 ++++++++++++++++++++----------------- config | 6 ++++-- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 193b519..09efd42 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux cfs scheduler Kernel by CachyOS and with some other patches and other improvements pkgver = 5.14.12 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -21,13 +21,10 @@ pkgbase = linux-cachyos options = !strip source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.12.tar.xz source = config - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-CK-TIMER.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/arch-patches-v10/0001-arch-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/cfs.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/amd/0006-amd-cppc.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-CK-TIMER.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/misc/0008-remove-LightNVM.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ll-patches/0001-LL-kconfig-add-750Hz-timer-interrupt-kernel-config-o.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ll-patches/0003-sched-core-nr_migrate-256-increases-number-of-tasks-.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-misc.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ll-patches/0004-mm-set-8-megabytes-for-address_space-level-file-read.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/bbr2-patches/0001-bbr2-5.14-introduce-BBRv2.patch @@ -37,7 +34,7 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/futex-xanmod-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/futex2-xanmod-patches-v2/0001-futex2-resync-from-gitlab.collabora.com.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ksmbd-patches-v17/0001-ksmbd-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/hwmon-patches-v2/0001-hwmon-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/hwmon-patches-v4/0001-hwmon-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/lqx-patches/0001-lqx-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/lrng-patches-v2/0001-lrng-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/lru-patches-v4/0001-lru-patches.patch @@ -46,7 +43,7 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zen-patches-v3/0001-zen-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zstd-patches-v2/0001-zstd-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/security-patches/0001-security-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zstd-upstream-patches-v6/0001-zstd-upstream-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/zstd-upstream-patches-v7/0001-zstd-upstream-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/ntfs3-patches-v14/0001-ntfs3-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-ksm.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-cpu-patches.patch @@ -54,14 +51,11 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.14/0001-v4l2loopback.patch source = auto-cpu-optimization.sh md5sums = a52286fe206a3f7664ca5a6c5995b9ed - md5sums = d93835cc970f8c135609081fec836139 - md5sums = 04c5865e765e07cff0649824c2a8d810 + md5sums = a6dbc79077287df2279eaa66d54813ef md5sums = 581faf85cd625c41bbdd0cadbd0e451e - md5sums = 399aa22ffd3279fec95bb95c2e2b8fa9 - md5sums = 430972ae1e936f99d8dc2a1f4fdaf774 + md5sums = 04c5865e765e07cff0649824c2a8d810 md5sums = eb39a5681a153f5a1f5a67e8b9e957a5 - md5sums = f8e172e9ea554bbb1053eb122c3ace35 - md5sums = af7328eb8c72c754e5bc8c7be1ca2f1c + md5sums = 552446adb1a3943570fedbb783115377 md5sums = f0d84fc024b9933bc19db696e0393a4e md5sums = e45c7962a78d6e82a0d3808868cd6ac0 md5sums = 196d6ac961497aa880264b83160eb140 @@ -71,7 +65,7 @@ pkgbase = linux-cachyos md5sums = fd934f7d11131d5a5043e4aea640583b md5sums = 8a96c5e8346bd5b430776ac8a41f96b0 md5sums = f71331c247285499ca42b63d707831a6 - md5sums = 721b2f6181696a8f95355ca1ad31064f + md5sums = 3f3f573e48ed67d7acc0733e99a888a5 md5sums = 6787c78ba3e7b0a34fbba9c50da7e3b4 md5sums = 366c90b64f9582c0733b8fb607a07594 md5sums = 8adcaccbb5c0ebd4bc81144e16b92627 @@ -80,7 +74,7 @@ pkgbase = linux-cachyos md5sums = cfef1423ad1e6aecad63f0d5eacaea37 md5sums = 808981a36c81165953017e5e432c1fa1 md5sums = f6a1c51adfc68fb7b52dc5715a9cb5a7 - md5sums = 6bce25efd0395a4d0a9e0fc52e0d93e4 + md5sums = f818b58bb2c6a30cd6fe88a8bd434b90 md5sums = 0636779d32ba47bda25d3edb5fbd08c9 md5sums = 566435a0444ee45816599f2e0e362c7a md5sums = bb22330e270bf36ccf53cb04d6b496d2 diff --git a/PKGBUILD b/PKGBUILD index 9d3434a..403fe68 100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,7 +20,8 @@ _winesync=y ### Running with a 2000 HZ, 1000HZ, 750Hz or 500HZ tick rate _2k_HZ_ticks= _1k_HZ_ticks= -_750_HZ_ticks=y +_750_HZ_ticks= +_600_HZ_ticks=y _500_HZ_ticks= ### Disable MQ-Deadline I/O scheduler @@ -115,7 +116,7 @@ else pkgbase=linux-cachyos fi pkgver=5.14.12 -pkgrel=1 +pkgrel=2 arch=(x86_64 x86_64_v3) pkgdesc='Linux cfs scheduler Kernel by CachyOS and with some other patches and other improvements' _gittag=v${pkgver%.*}-${pkgver##*.} @@ -132,13 +133,10 @@ _patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5. source=("https://cdn.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver}.tar.xz" "config" # "${_patchsource}/arch-patches/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch" - "${_patchsource}/0001-CK-TIMER.patch" "${_patchsource}/arch-patches-v10/0001-arch-patches.patch" - "${_patchsource}/misc/cfs.patch" - "${_patchsource}/misc/amd/0006-amd-cppc.patch" + "${_patchsource}/0001-CK-TIMER.patch" "${_patchsource}/misc/0008-remove-LightNVM.patch" - "${_patchsource}/ll-patches/0001-LL-kconfig-add-750Hz-timer-interrupt-kernel-config-o.patch" - "${_patchsource}/ll-patches/0003-sched-core-nr_migrate-256-increases-number-of-tasks-.patch" + "${_patchsource}/0001-misc.patch" "${_patchsource}/ll-patches/0004-mm-set-8-megabytes-for-address_space-level-file-read.patch" "${_patchsource}/android-patches/0001-android-export-symbold-and-enable-building-ashmem-an.patch" "${_patchsource}/bbr2-patches/0001-bbr2-5.14-introduce-BBRv2.patch" @@ -148,7 +146,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver "${_patchsource}/futex-xanmod-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch" "${_patchsource}/futex2-xanmod-patches-v2/0001-futex2-resync-from-gitlab.collabora.com.patch" "${_patchsource}/ksmbd-patches-v17/0001-ksmbd-patches.patch" - "${_patchsource}/hwmon-patches-v2/0001-hwmon-patches.patch" + "${_patchsource}/hwmon-patches-v4/0001-hwmon-patches.patch" "${_patchsource}/lqx-patches/0001-lqx-patches.patch" "${_patchsource}/lrng-patches-v2/0001-lrng-patches.patch" "${_patchsource}/lru-patches-v4/0001-lru-patches.patch" @@ -157,7 +155,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver "${_patchsource}/zen-patches-v3/0001-zen-patches.patch" "${_patchsource}/zstd-patches-v2/0001-zstd-patches.patch" "${_patchsource}/security-patches/0001-security-patches.patch" - "${_patchsource}/zstd-upstream-patches-v6/0001-zstd-upstream-patches.patch" + "${_patchsource}/zstd-upstream-patches-v7/0001-zstd-upstream-patches.patch" "${_patchsource}/ntfs3-patches-v14/0001-ntfs3-patches.patch" "${_patchsource}/0001-ksm.patch" "${_patchsource}/0001-cpu-patches.patch" @@ -254,6 +252,14 @@ prepare() { scripts/config --set-val CONFIG_HZ 750 fi + ### Optionally set tickrate to 600HZ + if [ -n "$_600_HZ_ticks" ]; then + echo "Setting tick rate to 600HZ..." + scripts/config --disable CONFIG_HZ_300 + scripts/config --enable CONFIG_HZ_600 + scripts/config --set-val CONFIG_HZ 600 + fi + ### Optionally set tickrate to 500HZ if [ -n "$_500_HZ_ticks" ]; then echo "Setting tick rate to 500HZ..." @@ -612,14 +618,11 @@ _package-headers() { } md5sums=('a52286fe206a3f7664ca5a6c5995b9ed' - 'd93835cc970f8c135609081fec836139' - '04c5865e765e07cff0649824c2a8d810' + 'a6dbc79077287df2279eaa66d54813ef' '581faf85cd625c41bbdd0cadbd0e451e' - '399aa22ffd3279fec95bb95c2e2b8fa9' - '430972ae1e936f99d8dc2a1f4fdaf774' + '04c5865e765e07cff0649824c2a8d810' 'eb39a5681a153f5a1f5a67e8b9e957a5' - 'f8e172e9ea554bbb1053eb122c3ace35' - 'af7328eb8c72c754e5bc8c7be1ca2f1c' + '552446adb1a3943570fedbb783115377' 'f0d84fc024b9933bc19db696e0393a4e' 'e45c7962a78d6e82a0d3808868cd6ac0' '196d6ac961497aa880264b83160eb140' @@ -629,7 +632,7 @@ md5sums=('a52286fe206a3f7664ca5a6c5995b9ed' 'fd934f7d11131d5a5043e4aea640583b' '8a96c5e8346bd5b430776ac8a41f96b0' 'f71331c247285499ca42b63d707831a6' - '721b2f6181696a8f95355ca1ad31064f' + '3f3f573e48ed67d7acc0733e99a888a5' '6787c78ba3e7b0a34fbba9c50da7e3b4' '366c90b64f9582c0733b8fb607a07594' '8adcaccbb5c0ebd4bc81144e16b92627' @@ -638,7 +641,7 @@ md5sums=('a52286fe206a3f7664ca5a6c5995b9ed' 'cfef1423ad1e6aecad63f0d5eacaea37' '808981a36c81165953017e5e432c1fa1' 'f6a1c51adfc68fb7b52dc5715a9cb5a7' - '6bce25efd0395a4d0a9e0fc52e0d93e4' + 'f818b58bb2c6a30cd6fe88a8bd434b90' '0636779d32ba47bda25d3edb5fbd08c9' '566435a0444ee45816599f2e0e362c7a' 'bb22330e270bf36ccf53cb04d6b496d2' diff --git a/config b/config index 259b43b..7450e1b 100755 --- a/config +++ b/config @@ -130,8 +130,9 @@ CONFIG_BPF_PRELOAD_UMD=m CONFIG_BPF_LSM=y # end of BPF subsystem -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_NONE_BEHAVIOUR is not set +# CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR is not set +CONFIG_PREEMPT_BEHAVIOUR=y CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y CONFIG_PREEMPTION=y @@ -532,6 +533,7 @@ CONFIG_EFI_MIXED=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set 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