257a2956f5
commit b0e901280d9860a0a35055f220e8e457f300f40a upstream.
Commit 6e7b64b9dd6d ("elfcore: fix building with clang") introduces
special handling for two architectures, ia64 and User Mode Linux.
However, the wrong name, i.e., CONFIG_UM, for the intended Kconfig
symbol for User-Mode Linux was used.
Although the directory for User Mode Linux is ./arch/um; the Kconfig
symbol for this architecture is called CONFIG_UML.
Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:
UM
Referencing files: include/linux/elfcore.h
Similar symbols: UML, NUMA
Correct the name of the config to the intended one.
[akpm@linux-foundation.org: fix um/x86_64, per Catalin]
Link: https://lkml.kernel.org/r/20211006181119.2851441-1-catalin.marinas@arm.com
Link: https://lkml.kernel.org/r/YV6pejGzLy5ppEpt@arm.com
Link: https://lkml.kernel.org/r/20211006082209.417-1-lukas.bulwahn@gmail.com
Fixes: 6e7b64b9dd6d ("elfcore: fix building with clang")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Barret Rhoden <brho@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _LINUX_ELFCORE_H
|
|
#define _LINUX_ELFCORE_H
|
|
|
|
#include <linux/user.h>
|
|
#include <linux/bug.h>
|
|
#include <linux/sched/task_stack.h>
|
|
|
|
#include <asm/elf.h>
|
|
#include <uapi/linux/elfcore.h>
|
|
|
|
struct coredump_params;
|
|
|
|
static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *regs)
|
|
{
|
|
#ifdef ELF_CORE_COPY_REGS
|
|
ELF_CORE_COPY_REGS((*elfregs), regs)
|
|
#else
|
|
BUG_ON(sizeof(*elfregs) != sizeof(*regs));
|
|
*(struct pt_regs *)elfregs = *regs;
|
|
#endif
|
|
}
|
|
|
|
static inline void elf_core_copy_kernel_regs(elf_gregset_t *elfregs, struct pt_regs *regs)
|
|
{
|
|
#ifdef ELF_CORE_COPY_KERNEL_REGS
|
|
ELF_CORE_COPY_KERNEL_REGS((*elfregs), regs);
|
|
#else
|
|
elf_core_copy_regs(elfregs, regs);
|
|
#endif
|
|
}
|
|
|
|
static inline int elf_core_copy_task_regs(struct task_struct *t, elf_gregset_t* elfregs)
|
|
{
|
|
#if defined (ELF_CORE_COPY_TASK_REGS)
|
|
return ELF_CORE_COPY_TASK_REGS(t, elfregs);
|
|
#elif defined (task_pt_regs)
|
|
elf_core_copy_regs(elfregs, task_pt_regs(t));
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
extern int dump_fpu (struct pt_regs *, elf_fpregset_t *);
|
|
|
|
static inline int elf_core_copy_task_fpregs(struct task_struct *t, struct pt_regs *regs, elf_fpregset_t *fpu)
|
|
{
|
|
#ifdef ELF_CORE_COPY_FPREGS
|
|
return ELF_CORE_COPY_FPREGS(t, fpu);
|
|
#else
|
|
return dump_fpu(regs, fpu);
|
|
#endif
|
|
}
|
|
|
|
#ifdef ELF_CORE_COPY_XFPREGS
|
|
static inline int elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
|
|
{
|
|
return ELF_CORE_COPY_XFPREGS(t, xfpu);
|
|
}
|
|
#endif
|
|
|
|
#if (defined(CONFIG_UML) && defined(CONFIG_X86_32)) || defined(CONFIG_IA64)
|
|
/*
|
|
* These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out
|
|
* extra segments containing the gate DSO contents. Dumping its
|
|
* contents makes post-mortem fully interpretable later without matching up
|
|
* the same kernel and hardware config to see what PC values meant.
|
|
* Dumping its extra ELF program headers includes all the other information
|
|
* a debugger needs to easily find how the gate DSO was being used.
|
|
*/
|
|
extern Elf_Half elf_core_extra_phdrs(void);
|
|
extern int
|
|
elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset);
|
|
extern int
|
|
elf_core_write_extra_data(struct coredump_params *cprm);
|
|
extern size_t elf_core_extra_data_size(void);
|
|
#else
|
|
static inline Elf_Half elf_core_extra_phdrs(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static inline int elf_core_write_extra_data(struct coredump_params *cprm)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static inline size_t elf_core_extra_data_size(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _LINUX_ELFCORE_H */
|