c26ccbaeb8
commit 3e35142ef99fe6b4fe5d834ad43ee13cca10a2dc upstream.
Since commit d1bcae833b32f1 ("ELF: Don't generate unused section
symbols") [1], binutils (v2.36+) started dropping section symbols that
it thought were unused. This isn't an issue in general, but with
kexec_file.c, gcc is placing kexec_arch_apply_relocations[_add] into a
separate .text.unlikely section and the section symbol ".text.unlikely"
is being dropped. Due to this, recordmcount is unable to find a non-weak
symbol in .text.unlikely to generate a relocation record against.
Address this by dropping the weak attribute from these functions.
Instead, follow the existing pattern of having architectures #define the
name of the function they want to override in their headers.
[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=d1bcae833b32f1
[akpm@linux-foundation.org: arch/s390/include/asm/kexec.h needs linux/module.h]
Link: https://lkml.kernel.org/r/20220519091237.676736-1-naveen.n.rao@linux.vnet.ibm.com
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
97 lines
2.6 KiB
C
97 lines
2.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Copyright IBM Corp. 2005
|
|
*
|
|
* Author(s): Rolf Adelsberger <adelsberger@de.ibm.com>
|
|
*
|
|
*/
|
|
|
|
#ifndef _S390_KEXEC_H
|
|
#define _S390_KEXEC_H
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/page.h>
|
|
#include <asm/setup.h>
|
|
/*
|
|
* KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
|
|
* I.e. Maximum page that is mapped directly into kernel memory,
|
|
* and kmap is not required.
|
|
*/
|
|
|
|
/* 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 pages */
|
|
/* Not more than 2GB */
|
|
#define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)
|
|
|
|
/* Allocate control page with GFP_DMA */
|
|
#define KEXEC_CONTROL_MEMORY_GFP GFP_DMA
|
|
|
|
/* Maximum address we can use for the crash control pages */
|
|
#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT (-1UL)
|
|
|
|
/* Allocate one page for the pdp and the second for the code */
|
|
#define KEXEC_CONTROL_PAGE_SIZE 4096
|
|
|
|
/* Alignment of crashkernel memory */
|
|
#define KEXEC_CRASH_MEM_ALIGN HPAGE_SIZE
|
|
|
|
/* The native architecture */
|
|
#define KEXEC_ARCH KEXEC_ARCH_S390
|
|
|
|
/* Allow kexec_file to load a segment to 0 */
|
|
#define KEXEC_BUF_MEM_UNKNOWN -1
|
|
|
|
/* Provide a dummy definition to avoid build failures. */
|
|
static inline void crash_setup_regs(struct pt_regs *newregs,
|
|
struct pt_regs *oldregs) { }
|
|
|
|
struct kimage;
|
|
struct s390_load_data {
|
|
/* Pointer to the kernel buffer. Used to register cmdline etc.. */
|
|
void *kernel_buf;
|
|
|
|
/* Load address of the kernel_buf. */
|
|
unsigned long kernel_mem;
|
|
|
|
/* Parmarea in the kernel buffer. */
|
|
struct parmarea *parm;
|
|
|
|
/* Total size of loaded segments in memory. Used as an offset. */
|
|
size_t memsz;
|
|
|
|
struct ipl_report *report;
|
|
};
|
|
|
|
int s390_verify_sig(const char *kernel, unsigned long kernel_len);
|
|
void *kexec_file_add_components(struct kimage *image,
|
|
int (*add_kernel)(struct kimage *image,
|
|
struct s390_load_data *data));
|
|
int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val,
|
|
unsigned long addr);
|
|
|
|
#define ARCH_HAS_KIMAGE_ARCH
|
|
|
|
struct kimage_arch {
|
|
void *ipl_buf;
|
|
};
|
|
|
|
extern const struct kexec_file_ops s390_kexec_image_ops;
|
|
extern const struct kexec_file_ops s390_kexec_elf_ops;
|
|
|
|
#ifdef CONFIG_KEXEC_FILE
|
|
struct purgatory_info;
|
|
int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
|
|
Elf_Shdr *section,
|
|
const Elf_Shdr *relsec,
|
|
const Elf_Shdr *symtab);
|
|
#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add
|
|
#endif
|
|
#endif /*_S390_KEXEC_H */
|