dccf78d39f
Ignat Korchagin complained that a potential config regression was introduced by commit89cde45591
("kexec: consolidate kexec and crash options into kernel/Kconfig.kexec"). Before the commit, CONFIG_CRASH_DUMP has no dependency on CONFIG_KEXEC. After the commit, CRASH_DUMP selects KEXEC. That enforces system to have CONFIG_KEXEC=y as long as CONFIG_CRASH_DUMP=Y which people may not want. In Ignat's case, he sets CONFIG_CRASH_DUMP=y, CONFIG_KEXEC_FILE=y and CONFIG_KEXEC=n because kexec_load interface could have security issue if kernel/initrd has no chance to be signed and verified. CRASH_DUMP has select of KEXEC because Eric, author of above commit, met a LKP report of build failure when posting patch of earlier version. Please see below link to get detail of the LKP report: https://lore.kernel.org/all/3e8eecd1-a277-2cfb-690e-5de2eb7b988e@oracle.com/T/#u In fact, that LKP report is triggered because arm's <asm/kexec.h> is wrapped in CONFIG_KEXEC ifdeffery scope. That is wrong. CONFIG_KEXEC controls the enabling/disabling of kexec_load interface, but not kexec feature. Removing the wrongly added CONFIG_KEXEC ifdeffery scope in <asm/kexec.h> of arm allows us to drop the select KEXEC for CRASH_DUMP. Meanwhile, change arch/arm/kernel/Makefile to let machine_kexec.o relocate_kernel.o depend on KEXEC_CORE. Link: https://lkml.kernel.org/r/20231128054457.659452-1-bhe@redhat.com Fixes:89cde45591
("kexec: consolidate kexec and crash options into kernel/Kconfig.kexec") Signed-off-by: Baoquan He <bhe@redhat.com> Reported-by: Ignat Korchagin <ignat@cloudflare.com> Tested-by: Ignat Korchagin <ignat@cloudflare.com> [compile-time only] Tested-by: Alexander Gordeev <agordeev@linux.ibm.com> Reviewed-by: Eric DeVolder <eric_devolder@yahoo.com> Tested-by: Eric DeVolder <eric_devolder@yahoo.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
110 lines
3.4 KiB
Makefile
110 lines
3.4 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
|
|
AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
|
|
|
|
ifdef CONFIG_FUNCTION_TRACER
|
|
CFLAGS_REMOVE_ftrace.o = -pg
|
|
CFLAGS_REMOVE_insn.o = -pg
|
|
CFLAGS_REMOVE_patch.o = -pg
|
|
CFLAGS_REMOVE_unwind.o = -pg
|
|
endif
|
|
|
|
CFLAGS_REMOVE_return_address.o = -pg
|
|
|
|
# Object file lists.
|
|
|
|
obj-y := elf.o entry-common.o irq.o opcodes.o \
|
|
process.o ptrace.o reboot.o io.o \
|
|
setup.o signal.o sigreturn_codes.o \
|
|
stacktrace.o sys_arm.o time.o traps.o
|
|
|
|
KASAN_SANITIZE_stacktrace.o := n
|
|
KASAN_SANITIZE_traps.o := n
|
|
|
|
ifneq ($(CONFIG_ARM_UNWIND),y)
|
|
obj-$(CONFIG_FRAME_POINTER) += return_address.o
|
|
endif
|
|
|
|
obj-$(CONFIG_ATAGS) += atags_parse.o
|
|
obj-$(CONFIG_ATAGS_PROC) += atags_proc.o
|
|
obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
|
|
|
|
ifeq ($(CONFIG_CPU_V7M),y)
|
|
obj-y += entry-v7m.o v7m.o
|
|
else
|
|
obj-y += entry-armv.o
|
|
endif
|
|
|
|
obj-$(CONFIG_MMU) += bugs.o
|
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
|
obj-$(CONFIG_ISA_DMA_API) += dma.o
|
|
obj-$(CONFIG_FIQ) += fiq.o fiqasm.o
|
|
obj-$(CONFIG_MODULES) += armksyms.o module.o
|
|
obj-$(CONFIG_ARM_MODULE_PLTS) += module-plts.o
|
|
obj-$(CONFIG_PCI) += bios32.o isa.o
|
|
obj-$(CONFIG_ARM_CPU_SUSPEND) += sleep.o suspend.o
|
|
obj-$(CONFIG_HIBERNATION) += hibernate.o
|
|
obj-$(CONFIG_SMP) += smp.o
|
|
ifdef CONFIG_MMU
|
|
obj-$(CONFIG_SMP) += smp_tlb.o
|
|
endif
|
|
obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o
|
|
obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o
|
|
obj-$(CONFIG_ARM_ARCH_TIMER) += arch_timer.o
|
|
obj-$(CONFIG_FUNCTION_TRACER) += entry-ftrace.o
|
|
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o patch.o
|
|
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o patch.o
|
|
obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o
|
|
obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o
|
|
# Main staffs in KPROBES are in arch/arm/probes/ .
|
|
obj-$(CONFIG_KPROBES) += patch.o insn.o
|
|
obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o
|
|
obj-$(CONFIG_ARM_THUMBEE) += thumbee.o
|
|
obj-$(CONFIG_KGDB) += kgdb.o patch.o
|
|
obj-$(CONFIG_ARM_UNWIND) += unwind.o
|
|
obj-$(CONFIG_HAVE_TCM) += tcm.o
|
|
obj-$(CONFIG_OF) += devtree.o
|
|
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
|
obj-$(CONFIG_SWP_EMULATE) += swp_emulate.o
|
|
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
|
|
|
|
obj-$(CONFIG_CPU_XSCALE) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o
|
|
obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o
|
|
obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o
|
|
obj-$(CONFIG_IWMMXT) += iwmmxt.o
|
|
obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o
|
|
obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_xscale.o perf_event_v6.o \
|
|
perf_event_v7.o
|
|
AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt
|
|
obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o
|
|
obj-$(CONFIG_VDSO) += vdso.o
|
|
obj-$(CONFIG_EFI) += efi.o
|
|
obj-$(CONFIG_PARAVIRT) += paravirt.o
|
|
|
|
obj-y += head$(MMUEXT).o
|
|
obj-$(CONFIG_DEBUG_LL) += debug.o
|
|
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
|
obj-$(CONFIG_ARM_PATCH_PHYS_VIRT) += phys2virt.o
|
|
|
|
# This is executed very early using a temporary stack when no memory allocator
|
|
# nor global data is available. Everything has to be allocated on the stack.
|
|
CFLAGS_head-inflate-data.o := $(call cc-option,-Wframe-larger-than=10240)
|
|
obj-$(CONFIG_XIP_DEFLATED_DATA) += head-inflate-data.o
|
|
|
|
obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o
|
|
ifeq ($(CONFIG_ARM_PSCI),y)
|
|
obj-$(CONFIG_SMP) += psci_smp.o
|
|
endif
|
|
|
|
obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o
|
|
|
|
obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) += spectre.o
|
|
|
|
extra-y := vmlinux.lds
|