Skip to contentSkip to conversation

s390x: Add BSS clearing for non ELF boot

PATCH David Hildenbrand 1 participant 1 message Dec 7, 2018 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 14 lines · Janosch Frank

When doing an IPL normal the memory will not be zeroed and hence the BSS section can have any value. We need to clear it by ourselves.

---
 s390x/cstart64.S | 23 ++++++++++++++++++++++-
 s390x/flat.lds   |  2 ++
 2 files changed, 24 insertions(+), 1 deletion(-)
s390x/cstart64.S +0 -0
index 7886f35..0246e18 100644

s390x/cstart64.S start: · line 44

Quoted 8 lines
s390x/cstart64.S +5 -0
@@ -37,6 +37,24 @@ start:
 	/* setup initial PSW mask + control registers*/
 	larl	%r1, initial_psw
 	lpswe	0(%r1)
+init_clear_bss:
+	larl 	%r2, __bss_start
+	larl 	%r3, __bss_end
+	slgr 	%r3, %r2		# Get sizeof bss
+	ltgr 	%r3,%r3			# bss empty?> +	jz 	init_psw_cont		# Yes, jump to init_psw_cont

do we actually need these two instructions? If we should ever not have a bss, things are already pretty shaky :D

(we could even enforce a BSS size > 0 in flat.lds)

Quoted 49 lines
s390x/cstart64.S +16 -1
+	aghi 	%r3,-1
+	srlg 	%r4,%r3,8		# Calc number of 256 byte chunks
+	ltgr 	%r4,%r4
+	lgr 	%r1,%r2
+	jz	remainder		# If none, clear remaining bytes
+loop:
+	xc	0(256,%r1), 0(%r1)	# Clear 256 byte chunks via xor
+	la	%r1, 256(%r1)
+	brctg 	%r4, loop
+remainder:
+	larl	%r2, memsetxc
+	ex 	%r3, 0(%r2)
 init_psw_cont:
 	/* setup pgm interrupt handler */
 	larl	%r1, pgm_int_psw
@@ -69,6 +87,9 @@ init_psw_cont:
 	/* call exit() */
 	j exit
 
+memsetxc:
+	xc 0(1,%r1),0(%r1)
+
 	.macro SAVE_REGS
 	/* save grs 0-15 */
 	stmg	%r0, %r15, GEN_LC_SW_INT_GRS
@@ -157,7 +178,7 @@ svc_int:
 
 	.align	8
 initial_psw:
-	.quad	0x0000000180000000, init_psw_cont
+	.quad	0x0000000180000000, init_clear_bss
 pgm_int_psw:
 	.quad	0x0000000180000000, pgm_int
 ext_int_psw:
s390x/flat.lds +2 -0
index 7cfd9f9..fb229ce 100644
@@ -35,7 +35,9 @@ SECTIONS
 	. = ALIGN(16);
 	.rodata : { *(.rodata) *(.rodata.*) }
 	. = ALIGN(16);
+	__bss_start = .;
 	.bss : { *(.bss) }
+	__bss_end = .;
 	. = ALIGN(64K);
 	edata = .;
 	. += 64K;
Signature · 3 lines
Thanks,

David / dhildenb