From 99870b69f0f8bc82b75fd000bb11f91893b16ebb Mon Sep 17 00:00:00 2001 From: "P. Jung" Date: Wed, 12 Jan 2022 17:13:01 +0100 Subject: [PATCH] 5.16.0-2-fixes --- .SRCINFO | 120 ++- PKGBUILD | 241 +++--- config | 2417 ++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 1705 insertions(+), 1073 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 095cb94583aa..d04f21caaa41 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-bmq pkgdesc = Linux BMQ scheduler Kernel by CachyOS and with some other patches and other improvements - pkgver = 5.15.13 - pkgrel = 1 + pkgver = 5.16.0 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -19,71 +19,61 @@ pkgbase = linux-cachyos-bmq makedepends = tar makedepends = xz options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.13.tar.xz + source = https://git.kernel.org/torvalds/t/linux-5.16.tar.gz source = config - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-prjc.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-arch-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-cfi.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-lru-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/0001-amdpstate.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/amd-sched.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/AMD/0001-amd64-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-bbr2.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-block-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-cpu-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-misc.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-btrfs-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-clearlinux-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-intel-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-ntfs3.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-prjc-fixes.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-futex-wait.v-fsync-winesync.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-hwmon-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-ksmbd-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-pf-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-page-table-check.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-lqx-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-lrng-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-v4l2loopback.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-security-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-spectre-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-xanmod-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-net-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-sbitmap-patches.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15/0001-zstd.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/sched/0001-prjc.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-MG-LRU-v6.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-amd64-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-block-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-blk-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-pm.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-anbox.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-bbr2-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-btrfs.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-lrng.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cfi.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-cpu.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-page-table-check.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-clearlinux.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-f2fs-xfs-ext4-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-misc.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-fixes.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-futex-winesync.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-hwmon.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-ksmbd.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-rcu.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zstd-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-zen-patches.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/0001-v4l2loopback.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16/next/0003-folio-io.patch source = auto-cpu-optimization.sh - md5sums = 4423a9fc25fcaa9e562c0f28e03960b3 - md5sums = 788dcd568f1c00441ad9746706e4f1bc - md5sums = 25fe602949e5b92d08df96e55e418d7a - md5sums = ef9fa3407854cea8e78112c25bb72e41 - md5sums = e3fa8507aed6ef3ce37e62f18fe9b7e1 - md5sums = 1f3becd94390729d940a60b1e9b872b1 - md5sums = 9ce207e47ad186b612050bd83641a697 - md5sums = dccfe71705b24d3fb1f51aaf2016216d - md5sums = 53f037488a66667220c263f92ded333d - md5sums = 2a8097ba46be56fbbe3967e9c34c9a0b - md5sums = 56ceaed8bfb44eca93298ccc5fe11ca7 - md5sums = 67764a5824b567b49bcce19c01d4e1b3 - md5sums = 018c728c9e744a99bb9b589028b8a1f6 - md5sums = a5de61b14e9ff7bfb4cb6548b6ee1c93 - md5sums = 41887f2f959068e41756f4c39671ca79 - md5sums = b04c8a3f01b3dfba1410e2c26ec7d975 - md5sums = 8cf507777e20cd4d75a0627eef10c10d - md5sums = 4ade58369428890eacc90a68ddf6f20b - md5sums = 8c354c3d1962ec6785db7f0c3fbbab03 - md5sums = b6b2c2c6b4761aa5a8dea6ac0add8736 - md5sums = c8546d67979e5f33f819284c11daa9c5 - md5sums = 08c84362cb916b30d9c77e35b1b3bc54 + md5sums = 5c6acbcc119ab680a32264c865ea70e1 + md5sums = f9425b75de74d70497781f8c8448c27f + md5sums = 3b05d6069ddcff7dec9c3a216ae48825 + md5sums = d16ccc4f52eb0bc08893dc66a7caa154 + md5sums = dbdb6754a1f5b3ccf26321843a070406 + md5sums = f717c0a238353f443a6f0633a59ee8ca + md5sums = 194c8e20ad30973c32159cb23f3be4c9 + md5sums = 2faaa79055263c1cdeeaa2896e641696 + md5sums = 80e419d6847d4122a23a141fd3a40e52 + md5sums = d194311161f8f44755e532db738f4a2d + md5sums = e9dff9b551b8fa7c0b47ae5ac0b16365 + md5sums = 9f86c3b9e6271cfc4440864a6857b256 + md5sums = b61fd5f488e44208fc97bfa6a274aebb + md5sums = d4c38ce51fb9a69aa92ad9b9e0199122 md5sums = 7d28f804d6b74f9a22ad30d67af5a669 - md5sums = 2130bb325438a2fc880593c5e345521f - md5sums = b09b84168822521426f197610727618b - md5sums = d9a892f66631615a72bdc93ee7397afa - md5sums = bc64b1d1a9c95b07c28457f7214ebf81 - md5sums = 8d390345afa36c56fa15bf4f4edad9a2 - md5sums = 102fd2533e85eaecb4255df77d3e2901 - md5sums = 03bb361f5f900cc9fd1159eda5e4f0ff - md5sums = 7530840f2eb439f64307dd3157beb28e - md5sums = 940d98858e6e59ecc07da50e05f6bc3d + md5sums = a687c26c262ccb9ad7cb54697a1476bc + md5sums = 8ef0e994f61bcd8d2188588f42805005 + md5sums = 80920e501b9b87bfe587edff445e6efe + md5sums = f574f1c40fa2d07602e77418b863e144 + md5sums = 28dcc1fe3029c6c316773bbcbe82954d + md5sums = 2160aabf2b9798907d36c4d246937d71 + md5sums = 12ad5085b7f01793980f137f2c9451cb + md5sums = 167a4267269e6a709c54e7b9ea8bf8d5 + md5sums = bf58290793d3a095ef95fb1fac2de89a + md5sums = de6db1147385c058b2e94df3c1739fdf + md5sums = cb9384ce179d08be6c90df6d0a0977a1 + md5sums = 9956af4381a21744369bf81d76d3142d md5sums = 21c98f19e883879dd3336c1fa143fd31 pkgname = linux-cachyos-bmq @@ -99,5 +89,5 @@ pkgname = linux-cachyos-bmq pkgname = linux-cachyos-bmq-headers pkgdesc = Headers and scripts for building modules for the Linux BMQ scheduler Kernel by CachyOS and with some other patches and other improvements - depends = linux-cachyos-bmq=5.15.13 + depends = linux-cachyos-bmq=5.16.0 depends = pahole diff --git a/PKGBUILD b/PKGBUILD index 50456d0a8c5a..8ddc3301258a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -59,7 +59,7 @@ _mq_deadline_disable=y _kyber_disable=y ### Enable protect file mappings under memory pressure -_mm_protect=y +_mm_protect= ### Enable multigenerational LRU _lru_enable=y @@ -84,7 +84,7 @@ _use_optimization_select= # ATTENTION - one of two predefined values should be selected! # 'ultra' - highest compression ratio # 'normal' - standard compression ratio -_zstd_level='normal' +_zstd_level='ultra' ### Selecting the ZSTD module compression level # If you want to use ZSTD compression, @@ -121,14 +121,19 @@ if [ -n "$_use_llvm_lto" ]; then else pkgbase=linux-cachyos-bmq fi -_major=5.15 -_minor=13 +_major=5.16 +_minor=0 +#_minorc=$((_minor+1)) +#_rcver=rc8 pkgver=${_major}.${_minor} -_srcname=linux-${pkgver} +#_stable=${_major}.${_minor} +_stable=${_major} +_stablerc=${_major}-${_rcver} +_srcname=linux-${_stable} +#_srcname=linux-${_major} arch=(x86_64 x86_64_v3) pkgdesc='Linux BMQ scheduler Kernel by CachyOS and with some other patches and other improvements' -_srcname=linux-${pkgver} -pkgrel=1 +pkgrel=2 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -141,45 +146,42 @@ fi if [ -n "$_use_llvm_lto" ]; then makedepends+=(clang llvm lld python) fi -_caculepatches="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/CacULE" -_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.15" +_patchsource="https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.16" source=( - "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz" + "https://git.kernel.org/torvalds/t/linux-${_stable}.tar.gz" "config" - "${_patchsource}/0001-prjc.patch" - "${_patchsource}/0001-arch-patches.patch" - "${_patchsource}/0001-cfi.patch" - "${_patchsource}/0001-lru-patches.patch" - "${_patchsource}/AMD/0001-amdpstate.patch" - "${_patchsource}/AMD/amd-sched.patch" - "${_patchsource}/AMD/0001-amd64-patches.patch" - "${_patchsource}/0001-bbr2.patch" + "${_patchsource}/sched/0001-prjc.patch" + # "${_patchsource}/sched/0001-cacULE-5.16-full.patch" + # "${_patchsource}/sched/0001-bore-sched.patch" + # "${_patchsource}/sched/0001-tt.patch" + "${_patchsource}/0001-MG-LRU-v6.patch" + "${_patchsource}/0001-amd64-patches.patch" "${_patchsource}/0001-block-patches.patch" - "${_patchsource}/0001-cpu-patches.patch" - "${_patchsource}/0001-misc.patch" - "${_patchsource}/0001-btrfs-patches.patch" - "${_patchsource}/0001-clearlinux-patches.patch" - "${_patchsource}/0001-intel-patches.patch" - "${_patchsource}/0001-ntfs3.patch" - "${_patchsource}/0001-prjc-fixes.patch" -# "${_patchsource}/0001-fixes-miscellaneous.patch" - "${_patchsource}/0001-futex-wait.v-fsync-winesync.patch" - "${_patchsource}/0001-hwmon-patches.patch" - "${_patchsource}/0001-ksmbd-patches.patch" - "${_patchsource}/0001-pf-patches.patch" + "${_patchsource}/0001-blk-patches.patch" + "${_patchsource}/0001-pm.patch" + "${_patchsource}/0001-anbox.patch" + "${_patchsource}/0001-bbr2-patches.patch" + "${_patchsource}/0001-btrfs.patch" + "${_patchsource}/0001-lrng.patch" + "${_patchsource}/0001-cfi.patch" + "${_patchsource}/0001-cpu.patch" "${_patchsource}/0001-page-table-check.patch" - "${_patchsource}/0001-lqx-patches.patch" - "${_patchsource}/0001-lrng-patches.patch" + "${_patchsource}/0001-clearlinux.patch" + "${_patchsource}/0001-f2fs-xfs-ext4-patches.patch" + "${_patchsource}/0001-misc.patch" + "${_patchsource}/0001-fixes.patch" + "${_patchsource}/0001-futex-winesync.patch" + "${_patchsource}/0001-hwmon.patch" + "${_patchsource}/0001-ksmbd.patch" + "${_patchsource}/0001-rcu.patch" + "${_patchsource}/0001-zstd-patches.patch" + "${_patchsource}/0001-zen-patches.patch" "${_patchsource}/0001-v4l2loopback.patch" - "${_patchsource}/0001-security-patches.patch" - "${_patchsource}/0001-spectre-patches.patch" - "${_patchsource}/0001-xanmod-patches.patch" - "${_patchsource}/0001-net-patches.patch" - "${_patchsource}/0001-sbitmap-patches.patch" - "${_patchsource}/0001-zstd.patch" + "${_patchsource}/next/0003-folio-io.patch" "auto-cpu-optimization.sh" ) + #if [ -n "$_use_pgo" ]; then # source+=("${_patchsource}/0001-PGO.patch") #fi @@ -241,52 +243,49 @@ prepare() { "${srcdir}"/auto-cpu-optimization.sh fi - if [ -n "$_use_optimization_select" ]; then source "${startdir}"/configure cpu_arch fi - ### Selecting the CPU scheduler - if [ "$_cpusched" = "bmq" ]; then - echo "Selecting BMQ CPU scheduler..." - scripts/config --enable CONFIG_SCHED_BMQ - scripts/config --disable CONFIG_SCHED_PDS - elif [ "$_cpusched" = "pds" ]; then - echo "Selecting PDS CPU scheduler..." - scripts/config --disable CONFIG_SCHED_BMQ - scripts/config --enable CONFIG_SCHED_PDS - elif [ "$_cpusched" = "cacule" ]; then - echo "Selecting CacULE scheduler..." - scripts/config --disable CONFIG_SCHED_ALT - scripts/config --enable CONFIG_CACULE_SCHED - elif [ "$_cpusched" = "cacule-rdb" ]; then - echo "Selecting CacULE-RDB scheduler..." - scripts/config --disable CONFIG_SCHED_ALT - scripts/config --enable CONFIG_CACULE_SCHED - scripts/config --enable CONFIG_CACULE_RDB - scripts/config --set-val CONFIG_RDB_INTERVAL 19 - elif [ "$_cpusched" = "tt" ]; then - echo "Enable TT CPU scheduler..." - scripts/config --enable CONFIG_TT_SCHED - scripts/config --enable CONFIG_TT_ACCOUNTING_STATS - elif [ "$_cpusched" = "bore" ]; then - echo "Selecting BORE Scheduler..." - scripts/config --disable CONFIG_SCHED_ALT - elif [ "$_cpusched" = "cfs" ]; then - echo "Selecting Completely Fair Scheduler..." - scripts/config --disable CONFIG_SCHED_ALT - else - if [ -n "$_cpusched" ]; then - error "The value $_cpusched is invalid. Choose the correct one again." - else - error "The value is empty. Choose the correct one again." - fi - error "Selecting the CPU scheduler failed!" - exit - fi - + if [ "$_cpusched" = "bmq" ]; then + echo "Selecting BMQ CPU scheduler..." + scripts/config --enable CONFIG_SCHED_BMQ + scripts/config --disable CONFIG_SCHED_PDS + elif [ "$_cpusched" = "pds" ]; then + echo "Selecting PDS CPU scheduler..." + scripts/config --disable CONFIG_SCHED_BMQ + scripts/config --enable CONFIG_SCHED_PDS + elif [ "$_cpusched" = "cacule" ]; then + echo "Selecting CacULE scheduler..." + scripts/config --disable CONFIG_SCHED_ALT + scripts/config --enable CONFIG_CACULE_SCHED + elif [ "$_cpusched" = "cacule-rdb" ]; then + echo "Selecting CacULE-RDB scheduler..." + scripts/config --disable CONFIG_SCHED_ALT + scripts/config --enable CONFIG_CACULE_SCHED + scripts/config --enable CONFIG_CACULE_RDB + scripts/config --set-val CONFIG_RDB_INTERVAL 19 + elif [ "$_cpusched" = "tt" ]; then + echo "Enable TT CPU scheduler..." + scripts/config --enable CONFIG_TT_SCHED + scripts/config --enable CONFIG_TT_ACCOUNTING_STATS + elif [ "$_cpusched" = "bore" ]; then + echo "Selecting BORE Scheduler..." + scripts/config --disable CONFIG_SCHED_ALT + elif [ "$_cpusched" = "cfs" ]; then + echo "Selecting Completely Fair Scheduler..." + scripts/config --disable CONFIG_SCHED_ALT + else + if [ -n "$_cpusched" ]; then + error "The value $_cpusched is invalid. Choose the correct one again." + else + error "The value is empty. Choose the correct one again." + fi + error "Selecting the CPU scheduler failed!" + exit + fi if [ -n "$_use_cfi" ] && [ -n "$_use_llvm_lto" ]; then echo "Enabling CFI" @@ -299,12 +298,6 @@ prepare() { scripts/config --disable CONFIG_LTO_NONE fi -# if [ -n "$_use_pgo" ]; then -# scripts/config --enable CONFIG_ARCH_SUPPORTS_PGO_CLANG -# scripts/config --enable DEBUG_FS -# scripts/config --enable CONFIG_PGO_CLANG -# fi - ### Optionally set tickrate to 1000 if [ -n "$_1k_HZ_ticks" ]; then echo "Setting tick rate to 1k..." @@ -514,9 +507,6 @@ prepare() { echo "Enabling KBUILD_CFLAGS -O3..." scripts/config --disable CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE scripts/config --enable CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 - scripts/config --module CONFIG_IP_NF_TARGET_FULLCONENAT - scripts/config --module CONFIG_NETFILTER_XT_TARGET_FULLCONENAT - ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db @@ -555,10 +545,11 @@ _package() { pkgdesc="The $pkgdesc kernel and modules" depends=('coreutils' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country' - 'linux-firmware: firmware images needed for some devices' - 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig') + 'linux-firmware: firmware images needed for some devices' + 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig') provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE) + cd $_srcname local kernver="$(