From a7a76a601ffcd6368ed65b8d7a9dbabd1e0ae3a3 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Mon, 6 Jun 2022 19:07:37 +0200 Subject: [PATCH] 5.18.1-1 --- .SRCINFO | 24 +++++++++++++++--------- PKGBUILD | 35 ++++++++++++++++++++--------------- config | 23 +++++++++++++++++++++-- 3 files changed, 56 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e7b2fd6..ab52313 100755 --- 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.18.1 - pkgrel = 4 + pkgver = 5.18.2 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -24,7 +24,7 @@ pkgbase = linux-cachyos makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.1.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.2.tar.xz source = config source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/sched/0001-bore-sched.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-migrate.patch @@ -36,28 +36,32 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-cpu.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fixes.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-fs-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-futex-winesync.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hwmon.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-hardening.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-kbuild.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lrng.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-lru-le9-spf.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-ksm.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch source = auto-cpu-optimization.sh - sha256sums = 83d14126c660186a7a1774a4a5c29d38e170fa5e52cfd2d08fd344dcf1f57d22 - sha256sums = 4c29c60f2a466df0be5b75a267611a2bf8f2f83b8cd69b0c262321d32e50147a - sha256sums = 4ad6f3aedcf2b39d7e44b7f03639e0afee8267ea256192a0555dd973f09400a9 + sha256sums = ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2 + sha256sums = fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90 + sha256sums = 7a6dfa314da62e69f87c816cf407e0bff2673d3359ff29732a93c64a821f0851 sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65 sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2 - sha256sums = 56f58801a73e6d930d7680806dc734b50b69617a0eef96244627d7a946b62efd + sha256sums = dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232 sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521 sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7 - sha256sums = 75aabb11608394725b8f38a7d813a12e6fb1a521a48eb3c078df80419c2675c7 + sha256sums = 4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117 + sha256sums = 08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232 sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00 sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd + sha256sums = a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2 sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425 sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79 sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e @@ -70,12 +74,14 @@ pkgname = linux-cachyos depends = coreutils depends = kmod depends = initramfs - optdepends = crda: to set the correct wireless channels of your country + optdepends = wireless-regdb: to set the correct wireless channels of your country optdepends = linux-firmware: firmware images needed for some devices optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig + optdepends = uksmd: Userspace KSM helper daemon provides = VIRTUALBOX-GUEST-MODULES provides = WIREGUARD-MODULE provides = KSMBD-MODULE + provides = UKSMD-BUILTIN pkgname = linux-cachyos-headers pkgdesc = Headers and scripts for building modules for the Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel diff --git a/PKGBUILD b/PKGBUILD index c081a0e..2362120 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -71,7 +71,7 @@ _kyber_disable=y _lru_enable=y ## Enable DAMON -_damon=y +_damon= ## enable SPECULATIVE_PAGE_FAULT _spf_enable=y @@ -117,7 +117,7 @@ else pkgbase=linux-cachyos fi _major=5.18 -_minor=1 +_minor=2 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -128,7 +128,7 @@ _srcname=linux-${_stable} #_srcname=linux-${_major} arch=(x86_64 x86_64_v3) pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=4 +pkgrel=1 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -175,8 +175,10 @@ source+=( "${_patchsource}/0001-cpu.patch" "${_patchsource}/0001-Extend-DAMOS-for-Proactive-LRU-lists-Sorting.patch" "${_patchsource}/0001-fixes.patch" + "${_patchsource}/0001-fs-patches.patch" "${_patchsource}/0001-futex-winesync.patch" "${_patchsource}/0001-hwmon.patch" + "${_patchsource}/0001-hardening.patch" "${_patchsource}/0001-kbuild.patch" "${_patchsource}/0001-lrng.patch" "${_patchsource}/0001-lru-le9-spf.patch" @@ -511,7 +513,9 @@ prepare() { --set-str ZRAM_DEF_COMP zstd \ --disable ZSWAP_COMPRESSOR_DEFAULT_LZ4 \ --enable ZSWAP_COMPRESSOR_DEFAULT_ZSTD \ - --set-str ZSWAP_COMPRESSOR_DEFAULT zstd + --set-str ZSWAP_COMPRESSOR_DEFAULT zstd \ + --enable ZRAM_ENTROPY \ + --set-val ZRAM_ENTROPY_THRESHOLD 100000 fi if [ -n "$_disable_debug" ]; then @@ -531,8 +535,6 @@ prepare() { --disable DEBUG_PREEMPT fi - echo "Enable ZRAM_ENTROPY" - scripts/config --enable ZRAM_ENTROPY echo "Enable USER_NS_UNPRIVILEGED" scripts/config --enable USER_NS echo "Enable WINE FASTSYNC" @@ -589,10 +591,11 @@ build() { _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') - provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE) + optdepends=('wireless-regdb: 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' + 'uksmd: Userspace KSM helper daemon') + provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE UKSMD-BUILTIN) cd $_srcname @@ -707,20 +710,22 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('83d14126c660186a7a1774a4a5c29d38e170fa5e52cfd2d08fd344dcf1f57d22' - '4c29c60f2a466df0be5b75a267611a2bf8f2f83b8cd69b0c262321d32e50147a' - '4ad6f3aedcf2b39d7e44b7f03639e0afee8267ea256192a0555dd973f09400a9' +sha256sums=('ef9ff2dfa5416a03e7e5fd9c308aaec385fe8ff9f4a62d957b167843849659a2' + 'fbff2747a1d8916f2de80455fb40f0ce1bf9d5df5dca7157234242b5b286fc90' + '7a6dfa314da62e69f87c816cf407e0bff2673d3359ff29732a93c64a821f0851' 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65' '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae' '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2' - '56f58801a73e6d930d7680806dc734b50b69617a0eef96244627d7a946b62efd' + 'dc2898751118804bc3f36b5a6928a2927d04919ce41c0ce013009f5564d6d232' '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d' 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521' 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c' '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7' - '75aabb11608394725b8f38a7d813a12e6fb1a521a48eb3c078df80419c2675c7' + '4fde226af6680d151143c30143d1594d2b2994350ba1e4726f1768584df2a117' + '08bde51de2d012219628bf1831a475115266cf4a6969be8064e719140cc9c232' '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00' 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd' + 'a2701625ea310c809fd7ecdf96c43a51ba28ed1dd8583fdbc06897a0a18230e2' '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425' '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79' 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e' diff --git a/config b/config index 8dd808d..c786253 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.2 Kernel Configuration +# Linux/x86 5.18.1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -194,6 +194,8 @@ CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=5 # 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 @@ -248,7 +250,9 @@ CONFIG_RD_LZO=y CONFIG_RD_LZ4=y CONFIG_RD_ZSTD=y CONFIG_BOOT_CONFIG=y +# CONFIG_CC_OPTIMIZE_BASAL is not set CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3 is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_LD_ORPHAN_WARN=y CONFIG_SYSCTL=y @@ -518,7 +522,7 @@ CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_X86_UMIP=y CONFIG_CC_HAS_IBT=y -CONFIG_X86_KERNEL_IBT=y +# CONFIG_X86_KERNEL_IBT is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_TSX_MODE_OFF is not set # CONFIG_X86_INTEL_TSX_MODE_ON is not set @@ -674,6 +678,7 @@ CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # 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_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -895,6 +900,7 @@ CONFIG_ARCH_HAS_ELFCORE_COMPAT=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_DYNAMIC_SIGFRAME=y CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y +CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y # # GCOV-based kernel profiling @@ -1395,6 +1401,7 @@ CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_FULLCONENAT=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m @@ -1556,6 +1563,7 @@ CONFIG_IP_NF_TARGET_SYNPROXY=m CONFIG_IP_NF_NAT=m CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_FULLCONENAT=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_CLUSTERIP=m @@ -1767,6 +1775,7 @@ CONFIG_NET_SCH_DEFAULT=y CONFIG_DEFAULT_FQ_CODEL=y # CONFIG_DEFAULT_FQ_PIE is not set # CONFIG_DEFAULT_SFQ is not set +CONFIG_DEFAULT_CAKE=y # CONFIG_DEFAULT_PFIFO_FAST is not set CONFIG_DEFAULT_NET_SCH="fq_codel" @@ -2840,6 +2849,7 @@ 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 @@ -4373,6 +4383,7 @@ 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 @@ -4522,6 +4533,7 @@ CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYUSB=m CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y +# CONFIG_LRNG is not set # end of Character devices # @@ -4570,6 +4582,7 @@ CONFIG_I2C_ISCH=m CONFIG_I2C_ISMT=m CONFIG_I2C_PIIX4=m CONFIG_I2C_CHT_WC=m +CONFIG_I2C_NCT6775=m CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_NVIDIA_GPU=m @@ -10278,6 +10291,12 @@ CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization + +CONFIG_RANDSTRUCT_NONE is not set +# CONFIG_RANDSTRUCT_FULL is not set +CONFIG_RANDSTRUCT_PERFORMANCE=y +CONFIG_RANDSTRUCT=y +CONFIG_GCC_PLUGIN_RANDSTRUCT=y # end of Kernel hardening options # end of Security options