# git rev-parse -q --verify 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8^{commit} 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 already have revision, skipping fetch # git checkout -q -f -B kisskb 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # git clean -qxdf # < git log -1 # commit 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # Merge: b136f68eb00d 9843231c9726 # Author: Linus Torvalds # Date: Sun Mar 24 11:13:56 2024 -0700 # # Merge tag 'x86-urgent-2024-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 fixes from Thomas Gleixner: # # - Ensure that the encryption mask at boot is properly propagated on # 5-level page tables, otherwise the PGD entry is incorrectly set to # non-encrypted, which causes system crashes during boot. # # - Undo the deferred 5-level page table setup as it cannot work with # memory encryption enabled. # # - Prevent inconsistent XFD state on CPU hotplug, where the MSR is reset # to the default value but the cached variable is not, so subsequent # comparisons might yield the wrong result and as a consequence the # result prevents updating the MSR. # # - Register the local APIC address only once in the MPPARSE enumeration # to prevent triggering the related WARN_ONs() in the APIC and topology # code. # # - Handle the case where no APIC is found gracefully by registering a # fake APIC in the topology code. That makes all related topology # functions work correctly and does not affect the actual APIC driver # code at all. # # - Don't evaluate logical IDs during early boot as the local APIC IDs # are not yet enumerated and the invoked function returns an error # code. Nothing requires the logical IDs before the final CPUID # enumeration takes place, which happens after the enumeration. # # - Cure the fallout of the per CPU rework on UP which misplaced the # copying of boot_cpu_data to per CPU data so that the final update to # boot_cpu_data got lost which caused inconsistent state and boot # crashes. # # - Use copy_from_kernel_nofault() in the kprobes setup as there is no # guarantee that the address can be safely accessed. # # - Reorder struct members in struct saved_context to work around another # kmemleak false positive # # - Remove the buggy code which tries to update the E820 kexec table for # setup_data as that is never passed to the kexec kernel. # # - Update the resource control documentation to use the proper units. # # - Fix a Kconfig warning observed with tinyconfig # # * tag 'x86-urgent-2024-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/boot/64: Move 5-level paging global variable assignments back # x86/boot/64: Apply encryption mask to 5-level pagetable update # x86/cpu: Add model number for another Intel Arrow Lake mobile processor # x86/fpu: Keep xfd_state in sync with MSR_IA32_XFD # Documentation/x86: Document that resctrl bandwidth control units are MiB # x86/mpparse: Register APIC address only once # x86/topology: Handle the !APIC case gracefully # x86/topology: Don't evaluate logical IDs during early boot # x86/cpu: Ensure that CPU info updates are propagated on UP # kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address # x86/pm: Work around false positive kmemleak report in msr_build_context() # x86/kexec: Do not update E820 kexec table for setup_data # x86/config: Fix warning for 'make ARCH=x86_64 tinyconfig' # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14246:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14250:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14252:warning: override: reassigning to symbol UML_NET_SLIP .config:14257:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: error: no previous prototype for ‘foo’ [-Werror=missing-prototypes] 9 | void foo(void) | ^~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:117: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1197: prepare0] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:00:09.141031