Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61f3f8fc authored by Philipp Rudo's avatar Philipp Rudo Committed by Martin Schwidefsky
Browse files

s390/purgatory: Reduce purgatory size 



The purgatory is compiled into the vmlinux and keept in memory all the time
during runtime. Thus any section not needed to load the purgatory
unnecessarily bloats up its foot print in file- and memorysize. Reduce the
purgatory size by stripping the unneeded sections from the purgatory.

This reduces the purgatories size by ~33%.

Signed-off-by: default avatarPhilipp Rudo <prudo@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 729829d7

arch/s390/purgatory/Makefile

+10 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ OBJECT_FILES_NON_STANDARD := y 


purgatory-y := head.o purgatory.o string.o sha256.o mem.o



targets += $(purgatory-y) purgatory.ro kexec-purgatory.c

targets += $(purgatory-y) purgatory.lds purgatory purgatory.ro kexec-purgatory.c

PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))



$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
@@ -16,8 +16,6 @@ $(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE 
$(obj)/string.o: $(srctree)/arch/s390/lib/string.c FORCE

	$(call if_changed_rule,cc_o_c)



LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib

LDFLAGS_purgatory.ro += -z nodefaultlib

KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes

KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare

KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding
@@ -25,9 +23,17 @@ KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common 
KBUILD_CFLAGS += $(call cc-option,-fno-PIE)

KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))



$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE

LDFLAGS_purgatory := -r --no-undefined -nostdlib -z nodefaultlib -T

$(obj)/purgatory: $(obj)/purgatory.lds $(PURGATORY_OBJS) FORCE

		$(call if_changed,ld)



OBJCOPYFLAGS_purgatory.ro := -O elf64-s390

OBJCOPYFLAGS_purgatory.ro += --remove-section='*debug*'

OBJCOPYFLAGS_purgatory.ro += --remove-section='.comment'

OBJCOPYFLAGS_purgatory.ro += --remove-section='.note.*'

$(obj)/purgatory.ro: $(obj)/purgatory FORCE

		$(call if_changed,objcopy)



quiet_cmd_bin2c = BIN2C   $@

      cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@

arch/s390/purgatory/purgatory.lds.S

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#include <asm-generic/vmlinux.lds.h>



OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")

OUTPUT_ARCH(s390:64-bit)



ENTRY(purgatory_start)



SECTIONS

{

	. = 0;

	.head.text : {

		_head = . ;

		HEAD_TEXT

		_ehead = . ;

	}

	.text :	{

		_text = .;	/* Text */

		*(.text)

		*(.text.*)

		_etext = . ;

	}

	.rodata : {

		_rodata = . ;

		*(.rodata)	 /* read-only data */

		*(.rodata.*)

		_erodata = . ;

	}

	.data :	{

		_data = . ;

		*(.data)

		*(.data.*)

		_edata = . ;

	}



	. = ALIGN(256);

	.bss : {

		_bss = . ;

		*(.bss)

		*(.bss.*)

		*(COMMON)

		. = ALIGN(8);	/* For convenience during zeroing */

		_ebss = .;

	}

	_end = .;



	/* Sections to be discarded */

	/DISCARD/ : {

		*(.eh_frame)

		*(*__ksymtab*)

		*(___kcrctab*)

	}

}