From 60446108f88b718b81c5814e15fb4e627eecce3d Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Fri, 7 Oct 2022 14:17:29 +0200 Subject: [PATCH] Add lto suffix flag Signed-off-by: Piotr Gorski --- .SRCINFO | 4 ++-- PKGBUILD | 12 +++++++++--- config | 2 ++ config-rt | 47 +++++++++++++++++++---------------------------- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5e5f181..a665691 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -29,8 +29,8 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/sched/0001-bore.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.0/misc/0001-Add-latency-priority-for-CFS-class.patch sha256sums = 5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e - sha256sums = 61479bd23bafaad89512ef9cdd420b40797da40691503ee89ae188cb51bb4924 - sha256sums = f0e02c04001b39a79344a114daceda589658f79035ad8d912c3d3528c13d35ca + sha256sums = 94579d96177a5eb8ef4227dd10f70d999e2f17acb182fe7cb3b659a5c50a9cc5 + sha256sums = fe22c8635aaa0d17742c3bcb943692782902c3eb8c213adfe47bb5dd517021e9 sha256sums = e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e sha256sums = 8180568fa32a598c9643cb757daa4a8b59b4d888917aa086f82f4929dcaea3d5 sha256sums = fbb8f5f7f90d1801a420b724411a2c7011c34653f841fd777340649aebf57ba8 diff --git a/PKGBUILD b/PKGBUILD index e9e1ce2..bf7ff3d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -138,6 +138,12 @@ _zstd_level_value=${_zstd_level_value-'normal'} # "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full." _use_llvm_lto=${_use_llvm_lto-} +# Use suffix -lto only when requested by the user +# Enabled by default. +# If you do not want the suffix -lto remove the "y" sign next to the flag. +# https://github.com/CachyOS/linux-cachyos/issues/36 +_use_lto_suffix=${_use_lto_suffix-y} + # KCFI is a proposed forward-edge control-flow integrity scheme for # Clang, which is more suitable for kernel use than the existing CFI # scheme used by CONFIG_CFI_CLANG. KCFI doesn't require LTO, doesn't @@ -180,7 +186,7 @@ _nest=${_nest-} # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/tree/feature/latency-nice _latency_nice=${_latency_nice-y} -if [ -n "$_use_llvm_lto" ]; then +if [[ -n "$_use_llvm_lto" && -n "$_use_lto_suffix" ]]; then pkgsuffix=cachyos-lto pkgbase=linux-$pkgsuffix @@ -1021,8 +1027,8 @@ for _p in "${pkgname[@]}"; do done sha256sums=('5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e' - '61479bd23bafaad89512ef9cdd420b40797da40691503ee89ae188cb51bb4924' - 'f0e02c04001b39a79344a114daceda589658f79035ad8d912c3d3528c13d35ca' + '94579d96177a5eb8ef4227dd10f70d999e2f17acb182fe7cb3b659a5c50a9cc5' + 'fe22c8635aaa0d17742c3bcb943692782902c3eb8c213adfe47bb5dd517021e9' 'e1d45b5842079a5f0f53d7ea2d66ffa3f1497766f3ccffcf13ed00f1ac67f95e' '8180568fa32a598c9643cb757daa4a8b59b4d888917aa086f82f4929dcaea3d5' 'fbb8f5f7f90d1801a420b724411a2c7011c34653f841fd777340649aebf57ba8' diff --git a/config b/config index e5f9c50..0596cac 100644 --- a/config +++ b/config @@ -41,6 +41,7 @@ CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_HAVE_KERNEL_UNCOMPRESSED=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set @@ -48,6 +49,7 @@ CONFIG_HAVE_KERNEL_ZSTD=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_KERNEL_ZSTD=y +# CONFIG_KERNEL_UNCOMPRESSED is not set CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="cachyos" CONFIG_SYSVIPC=y diff --git a/config-rt b/config-rt index 6960af4..4ab8869 100644 --- a/config-rt +++ b/config-rt @@ -13,7 +13,6 @@ CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y -CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y @@ -42,6 +41,7 @@ CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y CONFIG_HAVE_KERNEL_ZSTD=y +CONFIG_HAVE_KERNEL_UNCOMPRESSED=y # CONFIG_KERNEL_GZIP is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set @@ -49,6 +49,14 @@ CONFIG_HAVE_KERNEL_ZSTD=y # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_KERNEL_ZSTD=y +# CONFIG_KERNEL_UNCOMPRESSED is not set + +# +# ZSTD compression options +# +CONFIG_ZSTD_COMP_VAL=19 +# end of ZSTD compression options + CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_HOSTNAME="cachyos" CONFIG_SYSVIPC=y @@ -302,6 +310,7 @@ CONFIG_IO_URING=y CONFIG_ADVISE_SYSCALLS=y CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y CONFIG_KALLSYMS_BASE_RELATIVE=y @@ -464,7 +473,7 @@ CONFIG_BOOT_VESA_SUPPORT=y CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_END=512 CONFIG_NR_CPUS_DEFAULT=64 -CONFIG_NR_CPUS=320 +CONFIG_NR_CPUS=128 CONFIG_SCHED_CLUSTER=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y @@ -693,7 +702,6 @@ CONFIG_TPS68470_PMIC_OPREGION=y CONFIG_ACPI_VIOT=y CONFIG_ACPI_PRMT=y CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_PRMT=y # # CPU Frequency scaling @@ -879,8 +887,8 @@ CONFIG_LTO_NONE=y # CONFIG_LTO_CLANG_FULL is not set # CONFIG_LTO_CLANG_THIN is not set CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y +CONFIG_HAVE_CONTEXT_TRACKING_USER=y +CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_MOVE_PUD=y @@ -939,7 +947,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y CONFIG_ARCH_HAS_ELFCORE_COMPAT=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y -CONFIG_ARCH_PCP_RSS_USE_CPUMASK=y CONFIG_DYNAMIC_SIGFRAME=y CONFIG_HAVE_ARCH_NODE_DEV_GROUP=y CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y @@ -1175,7 +1182,6 @@ CONFIG_PAGE_IDLE_FLAG=y CONFIG_IDLE_PAGE_TRACKING=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y -CONFIG_ARCH_HAS_VM_GET_PAGE_PROT=y CONFIG_ARCH_HAS_PTE_DEVMAP=y CONFIG_ARCH_HAS_ZONE_DMA_SET=y CONFIG_ZONE_DMA=y @@ -1202,8 +1208,6 @@ CONFIG_PTE_MARKER_UFFD_WP=y # CONFIG_LRU_GEN is not set # CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set -CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y -# CONFIG_PER_VMA_LOCK is not set # # Data Access Monitoring @@ -2315,6 +2319,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +CONFIG_HMEM_REPORTING=y # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_SYS_HYPERVISOR=y CONFIG_GENERIC_CPU_AUTOPROBE=y @@ -2379,7 +2384,6 @@ CONFIG_GOOGLE_VPD=m # # EFI (Extensible Firmware Interface) Support # -# CONFIG_EFI_VARS is not set CONFIG_EFI_ESRT=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y @@ -2585,8 +2589,6 @@ CONFIG_ZRAM_DEF_COMP_ZSTD=y CONFIG_ZRAM_DEF_COMP="zstd" CONFIG_ZRAM_WRITEBACK=y # CONFIG_ZRAM_MEMORY_TRACKING is not set -CONFIG_ZRAM_ENTROPY=y -CONFIG_ZRAM_ENTROPY_THRESHOLD=100000 CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 CONFIG_BLK_DEV_DRBD=m @@ -3132,7 +3134,6 @@ CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m -CONFIG_NET_DSA_MICROCHIP_KSZ9477=m CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m CONFIG_NET_DSA_MICROCHIP_KSZ_SPI=m CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI=m @@ -3148,7 +3149,6 @@ CONFIG_NET_DSA_SJA1105_VL=y CONFIG_NET_DSA_XRS700X=m CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m -CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_REALTEK=m # CONFIG_NET_DSA_REALTEK_MDIO is not set # CONFIG_NET_DSA_REALTEK_SMI is not set @@ -3875,7 +3875,6 @@ CONFIG_IWLWIFI_DEBUGFS=y CONFIG_IWLWIFI_DEVICE_TRACING=y # end of Debugging Options -CONFIG_IWLMEI=m CONFIG_WLAN_VENDOR_INTERSIL=y CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -6492,9 +6491,10 @@ CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_XC5000=m +# end of Customize TV tuners # -# DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers' +# Customise DVB Frontends # # @@ -8355,7 +8355,6 @@ CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP3952=m CONFIG_LEDS_LP50XX=m CONFIG_LEDS_LP8788=m -CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA955X_GPIO=y CONFIG_LEDS_PCA963X=m @@ -8479,12 +8478,6 @@ CONFIG_INFINIBAND_QIB=m CONFIG_INFINIBAND_QIB_DCA=y CONFIG_INFINIBAND_USNIC=m CONFIG_INFINIBAND_VMWARE_PVRDMA=m -CONFIG_INFINIBAND_USNIC=m -CONFIG_INFINIBAND_BNXT_RE=m -CONFIG_INFINIBAND_HFI1=m -# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set -# CONFIG_SDMA_VERBOSITY is not set -CONFIG_INFINIBAND_QEDR=m CONFIG_INFINIBAND_RDMAVT=m CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m @@ -10018,8 +10011,8 @@ CONFIG_ND_PFN=m CONFIG_NVDIMM_PFN=y CONFIG_NVDIMM_DAX=y CONFIG_DAX=y +CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_HMEM_DEVICES=y -CONFIG_DEV_DAX_KMEM=m CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y CONFIG_RAVE_SP_EEPROM=m @@ -10942,6 +10935,7 @@ CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=y CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y @@ -11038,7 +11032,6 @@ CONFIG_MEMREGION=y CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_COPY_MC=y CONFIG_ARCH_STACKWALK=y -CONFIG_STACK_HASH_ORDER=20 CONFIG_SBITMAP=y CONFIG_PARMAN=m CONFIG_OBJAGG=m @@ -11144,7 +11137,6 @@ CONFIG_DEBUG_WX=y CONFIG_GENERIC_PTDUMP=y CONFIG_PTDUMP_CORE=y # CONFIG_PTDUMP_DEBUGFS is not set -# CONFIG_PER_VMA_LOCK_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SHRINKER_DEBUG is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y @@ -11163,7 +11155,6 @@ 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 @@ -11240,6 +11231,7 @@ CONFIG_DEBUG_LIST=y # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures # CONFIG_DEBUG_CREDENTIALS is not set @@ -11346,7 +11338,6 @@ CONFIG_IO_STRICT_DEVMEM=y # # x86 Debugging # -CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_EARLY_PRINTK_USB=y # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y