From b165d48f129d82c4edbf84f0bacee28c7415a2e2 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 2 Jun 2022 02:11:42 +0200 Subject: [PATCH] 5.18.1-4 --- .SRCINFO | 22 ++++++++++--------- PKGBUILD | 27 +++++++++++++---------- config | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 86 insertions(+), 30 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4f866b6..e7b2fd6 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 = 2 + pkgrel = 4 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -27,6 +27,7 @@ pkgbase = linux-cachyos source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.18.1.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 source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-amd-perf.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-arch.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-bbr2.patch @@ -44,20 +45,21 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.18/0001-zram-entropy-calculation.patch source = auto-cpu-optimization.sh sha256sums = 83d14126c660186a7a1774a4a5c29d38e170fa5e52cfd2d08fd344dcf1f57d22 - sha256sums = 1f846f3f08d97322fbb97045d768ab4bf90020ae77ead1407e05d5b463c31f16 - sha256sums = e08fb439ba424c9c8db8f41fe9328dd3e30d4405094b6972dcce3863f04a9f46 - sha256sums = 9824cd3a41db040bf28d6538aa4805f869333139cbcf43e0422e1b42f5401270 + sha256sums = 4c29c60f2a466df0be5b75a267611a2bf8f2f83b8cd69b0c262321d32e50147a + sha256sums = 4ad6f3aedcf2b39d7e44b7f03639e0afee8267ea256192a0555dd973f09400a9 + sha256sums = e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65 + sha256sums = 85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae sha256sums = 2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2 sha256sums = 56f58801a73e6d930d7680806dc734b50b69617a0eef96244627d7a946b62efd - sha256sums = 09d2b3d6b919091f0f313609bdfd7603bfaa8765f0edeaf15efca2aec78284eb - sha256sums = 3e217f0cb056bd823b0d593e5fb66e6acd891a21e1ba6343b7b976c4f9075521 + sha256sums = 3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d + sha256sums = e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521 sha256sums = c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c sha256sums = 30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7 - sha256sums = abc95e53c38673adb1be0f961c1ce1b5fdc22d150149bffae4b70a21201bc726 - sha256sums = fa8beb48c2e78f5337c6b08d1b6b6575bd01e2f34673d4056f35a1b28165d1ce + sha256sums = 75aabb11608394725b8f38a7d813a12e6fb1a521a48eb3c078df80419c2675c7 + sha256sums = 1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00 sha256sums = c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd - sha256sums = 17e8ec78d3df7a1965d3b1667c3323479e94c15a6d3fe59ba17cd73f06a21394 - sha256sums = 65a1a31af7923f5f99b11fe45305f176d75904e05addff168d09517c403e45e1 + sha256sums = 781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425 + sha256sums = 99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79 sha256sums = d2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e sha256sums = 8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19 sha256sums = efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb diff --git a/PKGBUILD b/PKGBUILD index 6f380a5..c081a0e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -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=2 +pkgrel=4 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -160,7 +160,11 @@ if [ "$_cpusched" = "cacule-rdb" ]; then source+=("${_patchsource}/sched/0001-cacULE-5.18.patch") fi if [ "$_cpusched" = "bore" ]; then - source+=("${_patchsource}/sched/0001-bore-sched.patch") + source+=("${_patchsource}/sched/0001-bore-sched.patch" + "${_patchsource}/0001-migrate.patch") +fi +if [ "$_cpusched" = "cfs" ]; then + source+=("${_patchsource}/0001-migrate.patch") fi source+=( "${_patchsource}/0001-amd-perf.patch" @@ -704,20 +708,21 @@ for _p in "${pkgname[@]}"; do done sha256sums=('83d14126c660186a7a1774a4a5c29d38e170fa5e52cfd2d08fd344dcf1f57d22' - '1f846f3f08d97322fbb97045d768ab4bf90020ae77ead1407e05d5b463c31f16' - 'e08fb439ba424c9c8db8f41fe9328dd3e30d4405094b6972dcce3863f04a9f46' - '9824cd3a41db040bf28d6538aa4805f869333139cbcf43e0422e1b42f5401270' + '4c29c60f2a466df0be5b75a267611a2bf8f2f83b8cd69b0c262321d32e50147a' + '4ad6f3aedcf2b39d7e44b7f03639e0afee8267ea256192a0555dd973f09400a9' + 'e8179f661dc9ba2ad89455f0c7e952e9dd9b4d6445476384cbac2730cdd46b65' + '85eeddbd0b1fdb44333c450e6d93e370dcd7e230cecccce47667aaa746bea3ae' '2bfe45a67732a97cea01bf760a8f9fb297057c2488eb9e61720a0bb26c9b11e2' '56f58801a73e6d930d7680806dc734b50b69617a0eef96244627d7a946b62efd' - '09d2b3d6b919091f0f313609bdfd7603bfaa8765f0edeaf15efca2aec78284eb' - '3e217f0cb056bd823b0d593e5fb66e6acd891a21e1ba6343b7b976c4f9075521' + '3754c1ad6bc2fb4e73e9d77137e9f245b3be1a73a05685f0ca03f4c086e5d04d' + 'e2266d499cebdd5d195a044048ae4a13755f1d3edb3ece2c3f8837228b4cd521' 'c2bf57d37db1f93c5f3eeff2e2957f01618f4786613c13755f9ae6989d2b745c' '30fd4ca078cb1eee0bc4005700da4d15515a577ccdb96ea7922040aa9086d6b7' - 'abc95e53c38673adb1be0f961c1ce1b5fdc22d150149bffae4b70a21201bc726' - 'fa8beb48c2e78f5337c6b08d1b6b6575bd01e2f34673d4056f35a1b28165d1ce' + '75aabb11608394725b8f38a7d813a12e6fb1a521a48eb3c078df80419c2675c7' + '1d9c83de97d541f5a7ae4612a96c05aea8ce38de5471cc21fd2197dbd6644d00' 'c1aae07261bafc711c2d66e26c2c30e444e11509cacc7aec148dc021761294cd' - '17e8ec78d3df7a1965d3b1667c3323479e94c15a6d3fe59ba17cd73f06a21394' - '65a1a31af7923f5f99b11fe45305f176d75904e05addff168d09517c403e45e1' + '781cd26d7b0794d11f103ada94140061117c628471a4c49f0228f22f0a6cf425' + '99b18e00ca3e038481a23f4c83bc285a1ad0e209d049a8476c8f997627aaea79' 'd2c542b3d44ef11364248c550d20ec7b52261cd98ee5191c24d59c9e0a69392e' '8edf9b9b1a9c26cc4d6dfaf5f14c06b197a04c5bbb8459dd292c033aa2534d19' 'efe8558b63feb0e76b61d69952c5300ad54c951d9044101be7c01932a54fb4fb' diff --git a/config b/config index 67fcb06..8dd808d 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.0 Kernel Configuration +# Linux/x86 5.18.2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -25,6 +25,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # # General setup # +CONFIG_CACHY=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set @@ -171,7 +172,8 @@ CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 CONFIG_RCU_BOOST=y CONFIG_RCU_BOOST_DELAY=500 -# CONFIG_RCU_NOCB_CPU is not set +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_DEFAULT_ALL=y # CONFIG_TASKS_TRACE_RCU_READ_MB is not set # end of RCU Subsystem @@ -387,12 +389,49 @@ CONFIG_PARAVIRT_CLOCK=y CONFIG_JAILHOUSE_GUEST=y CONFIG_ACRN_GUEST=y # CONFIG_MK8 is not set +# CONFIG_MK8SSE3 is not set +# CONFIG_MK10 is not set +# CONFIG_MBARCELONA is not set +# CONFIG_MBOBCAT is not set +# CONFIG_MJAGUAR is not set +# CONFIG_MBULLDOZER is not set +# CONFIG_MPILEDRIVER is not set +# CONFIG_MSTEAMROLLER is not set +# CONFIG_MEXCAVATOR is not set +# CONFIG_MZEN is not set +# CONFIG_MZEN2 is not set +# CONFIG_MZEN3 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set +# CONFIG_MNEHALEM is not set +# CONFIG_MWESTMERE is not set +# CONFIG_MSILVERMONT is not set +# CONFIG_MGOLDMONT is not set +# CONFIG_MGOLDMONTPLUS is not set +# CONFIG_MSANDYBRIDGE is not set +# CONFIG_MIVYBRIDGE is not set +# CONFIG_MHASWELL is not set +# CONFIG_MBROADWELL is not set +# CONFIG_MSKYLAKE is not set +# CONFIG_MSKYLAKEX is not set +# CONFIG_MCANNONLAKE is not set +# CONFIG_MICELAKE is not set +# CONFIG_MCASCADELAKE is not set +# CONFIG_MCOOPERLAKE is not set +# CONFIG_MTIGERLAKE is not set +# CONFIG_MSAPPHIRERAPIDS is not set +# CONFIG_MROCKETLAKE is not set +# CONFIG_MALDERLAKE 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_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y @@ -436,6 +475,7 @@ CONFIG_PERF_EVENTS_INTEL_RAPL=m CONFIG_PERF_EVENTS_INTEL_CSTATE=m CONFIG_PERF_EVENTS_AMD_POWER=m CONFIG_PERF_EVENTS_AMD_UNCORE=m +CONFIG_PERF_EVENTS_AMD_BRS=y # end of Performance monitoring CONFIG_X86_16BIT=y @@ -895,7 +935,7 @@ CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y CONFIG_MODPROBE_PATH="/sbin/modprobe" CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y -# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set +CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_DEV_BSG_COMMON=y @@ -998,6 +1038,9 @@ 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=0 +CONFIG_CLEAN_MIN_KBYTES=0 CONFIG_HAVE_FAST_GUP=y CONFIG_NUMA_KEEP_MEMINFO=y CONFIG_MEMORY_ISOLATION=y @@ -1086,17 +1129,18 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_SECRETMEM=y CONFIG_ANON_VMA_NAME=y +# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set # # Data Access Monitoring # -CONFIG_DAMON=y -CONFIG_DAMON_VADDR=y -CONFIG_DAMON_PADDR=y -CONFIG_DAMON_SYSFS=y -CONFIG_DAMON_DBGFS=y -CONFIG_DAMON_RECLAIM=y +# CONFIG_DAMON is not set # end of Data Access Monitoring + +# CONFIG_ARCH_SUPPORTS_SPECULATIVE_PAGE_FAULT is not set +# CONFIG_SPECULATIVE_PAGE_FAULT is not set # end of Memory Management options CONFIG_NET=y @@ -2588,6 +2632,7 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_PCI_ENDPOINT_TEST=m CONFIG_XILINX_SDFEC=m CONFIG_MISC_RTSX=m +CONFIG_WINESYNC=y CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -5079,7 +5124,9 @@ CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775_CORE=m CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NCT6775_I2C=m CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NPCM7XX=m @@ -10745,6 +10792,7 @@ CONFIG_DEBUG_WX=y CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y # CONFIG_PTDUMP_DEBUGFS is not set +# CONFIG_SPECULATIVE_PAGE_FAULT_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set @@ -10764,6 +10812,7 @@ CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y