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>
84 lines
2.2 KiB
C
84 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ARM_KEXEC_H
|
|
#define _ARM_KEXEC_H
|
|
|
|
/* Maximum physical address we can use pages from */
|
|
#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
|
|
/* Maximum address we can reach in physical address mode */
|
|
#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
|
|
/* Maximum address we can use for the control code buffer */
|
|
#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
|
|
|
|
#define KEXEC_CONTROL_PAGE_SIZE 4096
|
|
|
|
#define KEXEC_ARCH KEXEC_ARCH_ARM
|
|
|
|
#define KEXEC_ARM_ATAGS_OFFSET 0x1000
|
|
#define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#define ARCH_HAS_KIMAGE_ARCH
|
|
struct kimage_arch {
|
|
u32 kernel_r2;
|
|
};
|
|
|
|
/**
|
|
* crash_setup_regs() - save registers for the panic kernel
|
|
* @newregs: registers are saved here
|
|
* @oldregs: registers to be saved (may be %NULL)
|
|
*
|
|
* Function copies machine registers from @oldregs to @newregs. If @oldregs is
|
|
* %NULL then current registers are stored there.
|
|
*/
|
|
static inline void crash_setup_regs(struct pt_regs *newregs,
|
|
struct pt_regs *oldregs)
|
|
{
|
|
if (oldregs) {
|
|
memcpy(newregs, oldregs, sizeof(*newregs));
|
|
} else {
|
|
__asm__ __volatile__ (
|
|
"stmia %[regs_base], {r0-r12}\n\t"
|
|
"mov %[_ARM_sp], sp\n\t"
|
|
"str lr, %[_ARM_lr]\n\t"
|
|
"adr %[_ARM_pc], 1f\n\t"
|
|
"mrs %[_ARM_cpsr], cpsr\n\t"
|
|
"1:"
|
|
: [_ARM_pc] "=r" (newregs->ARM_pc),
|
|
[_ARM_cpsr] "=r" (newregs->ARM_cpsr),
|
|
[_ARM_sp] "=r" (newregs->ARM_sp),
|
|
[_ARM_lr] "=o" (newregs->ARM_lr)
|
|
: [regs_base] "r" (&newregs->ARM_r0)
|
|
: "memory"
|
|
);
|
|
}
|
|
}
|
|
|
|
static inline unsigned long phys_to_boot_phys(phys_addr_t phys)
|
|
{
|
|
return phys_to_idmap(phys);
|
|
}
|
|
#define phys_to_boot_phys phys_to_boot_phys
|
|
|
|
static inline phys_addr_t boot_phys_to_phys(unsigned long entry)
|
|
{
|
|
return idmap_to_phys(entry);
|
|
}
|
|
#define boot_phys_to_phys boot_phys_to_phys
|
|
|
|
static inline unsigned long page_to_boot_pfn(struct page *page)
|
|
{
|
|
return page_to_pfn(page) + (arch_phys_to_idmap_offset >> PAGE_SHIFT);
|
|
}
|
|
#define page_to_boot_pfn page_to_boot_pfn
|
|
|
|
static inline struct page *boot_pfn_to_page(unsigned long boot_pfn)
|
|
{
|
|
return pfn_to_page(boot_pfn - (arch_phys_to_idmap_offset >> PAGE_SHIFT));
|
|
}
|
|
#define boot_pfn_to_page boot_pfn_to_page
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* _ARM_KEXEC_H */
|