Commit 65d9a9a6 authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Mimi Zohar
Browse files

kexec_file: drop weak attribute from functions 

As requested
(http://lkml.kernel.org/r/87ee0q7b92.fsf@email.froward.int.ebiederm.org),
this series converts weak functions in kexec to use the #ifdef approach.

Quoting the 3e35142e ("kexec_file: drop weak attribute from
arch_kexec_apply_relocations[_add]") changelog:

: 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.

This patch (of 2);

Drop __weak attribute from functions in kexec_file.c:
- arch_kexec_kernel_image_probe()
- arch_kimage_file_post_load_cleanup()
- arch_kexec_kernel_image_load()
- arch_kexec_locate_mem_hole()
- arch_kexec_kernel_verify_sig()

arch_kexec_kernel_image_load() calls into kexec_image_load_default(), so
drop the static attribute for the latter.

arch_kexec_kernel_verify_sig() is not overridden by any architecture, so
drop the __weak attribute.

Link: https://lkml.kernel.org/r/cover.1656659357.git.naveen.n.rao@linux.vnet.ibm.com
Link: https://lkml.kernel.org/r/2cd7ca1fe4d6bb6ca38e3283c717878388ed6788.1656659357.git.naveen.n.rao@linux.vnet.ibm.com


Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Suggested-by: default avatarEric Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
parent c808a6ec

arch/arm64/include/asm/kexec.h

+3 −1
Original line number Diff line number Diff line
@@ -115,7 +115,9 @@ extern const struct kexec_file_ops kexec_image_ops; 


struct kimage;



extern int arch_kimage_file_post_load_cleanup(struct kimage *image);

int arch_kimage_file_post_load_cleanup(struct kimage *image);

#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup



extern int load_other_segments(struct kimage *image,

		unsigned long kernel_load_addr, unsigned long kernel_size,

		char *initrd, unsigned long initrd_len,

arch/powerpc/include/asm/kexec.h

+9 −0
Original line number Diff line number Diff line
@@ -120,6 +120,15 @@ int setup_purgatory(struct kimage *image, const void *slave_code, 
#ifdef CONFIG_PPC64

struct kexec_buf;



int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, unsigned long buf_len);

#define arch_kexec_kernel_image_probe arch_kexec_kernel_image_probe



int arch_kimage_file_post_load_cleanup(struct kimage *image);

#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup



int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf);

#define arch_kexec_locate_mem_hole arch_kexec_locate_mem_hole



int load_crashdump_segments_ppc64(struct kimage *image,

				  struct kexec_buf *kbuf);

int setup_purgatory_ppc64(struct kimage *image, const void *slave_code,

arch/s390/include/asm/kexec.h

+3 −0
Original line number Diff line number Diff line
@@ -92,5 +92,8 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi, 
				     const Elf_Shdr *relsec,

				     const Elf_Shdr *symtab);

#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add



int arch_kimage_file_post_load_cleanup(struct kimage *image);

#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup

#endif

#endif /*_S390_KEXEC_H */

arch/x86/include/asm/kexec.h

+6 −0
Original line number Diff line number Diff line
@@ -193,6 +193,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi, 
				     const Elf_Shdr *relsec,

				     const Elf_Shdr *symtab);

#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add



void *arch_kexec_kernel_image_load(struct kimage *image);

#define arch_kexec_kernel_image_load arch_kexec_kernel_image_load



int arch_kimage_file_post_load_cleanup(struct kimage *image);

#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup

#endif

#endif

include/linux/kexec.h

+38 −6
Original line number Diff line number Diff line
@@ -188,21 +188,53 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name, 
				   void *buf, unsigned int size,

				   bool get_value);

void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name);

void *kexec_image_load_default(struct kimage *image);



#ifndef arch_kexec_kernel_image_probe

static inline int

arch_kexec_kernel_image_probe(struct kimage *image, void *buf, unsigned long buf_len)

{

	return kexec_image_probe_default(image, buf, buf_len);

}

#endif



#ifndef arch_kimage_file_post_load_cleanup

static inline int arch_kimage_file_post_load_cleanup(struct kimage *image)

{

	return kexec_image_post_load_cleanup_default(image);

}

#endif



#ifndef arch_kexec_kernel_image_load

static inline void *arch_kexec_kernel_image_load(struct kimage *image)

{

	return kexec_image_load_default(image);

}

#endif



/* Architectures may override the below functions */

int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,

				  unsigned long buf_len);

void *arch_kexec_kernel_image_load(struct kimage *image);

int arch_kimage_file_post_load_cleanup(struct kimage *image);

#ifdef CONFIG_KEXEC_SIG

int arch_kexec_kernel_verify_sig(struct kimage *image, void *buf,

				 unsigned long buf_len);

#endif

int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf);



extern int kexec_add_buffer(struct kexec_buf *kbuf);

int kexec_locate_mem_hole(struct kexec_buf *kbuf);



#ifndef arch_kexec_locate_mem_hole

/**

 * arch_kexec_locate_mem_hole - Find free memory to place the segments.

 * @kbuf:                       Parameters for the memory search.

 *

 * On success, kbuf->mem will have the start address of the memory region found.

 *

 * Return: 0 on success, negative errno on error.

 */

static inline int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf)

{

	return kexec_locate_mem_hole(kbuf);

}

#endif



/* Alignment required for elf header segment */

#define ELF_CORE_HEADER_ALIGN   4096