Commit 4df29d2b authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Vasily Gorbik
Browse files

s390/smp: rework absolute lowcore access 



Temporary unsetting of the prefix page in memcpy_absolute() routine
poses a risk of executing code path with unexpectedly disabled prefix
page. This rework avoids the prefix page uninstalling and disabling
of normal and machine check interrupts when accessing the absolute
zero memory.

Although memcpy_absolute() routine can access the whole memory, it is
only used to update the absolute zero lowcore. This rework therefore
introduces a new mechanism for the absolute zero lowcore access and
scraps memcpy_absolute() routine for good.

Instead, an area is reserved in the virtual memory that is used for
the absolute lowcore access only. That area holds an array of 8KB
virtual mappings - one per CPU. Whenever a CPU is brought online, the
corresponding item is mapped to the real address of the previously
installed prefix page.

The absolute zero lowcore access works like this: a CPU calls the
new primitive get_abs_lowcore() to obtain its 8KB mapping as a
pointer to the struct lowcore. Virtual address references to that
pointer get translated to the real addresses of the prefix page,
which in turn gets swapped with the absolute zero memory addresses
due to prefixing. Once the pointer is not needed it must be released
with put_abs_lowcore() primitive:

	struct lowcore *abs_lc;
	unsigned long flags;

	abs_lc = get_abs_lowcore(&flags);
	abs_lc->... = ...;
	put_abs_lowcore(abs_lc, flags);

To ensure the described mechanism works large segment- and region-
table entries must be avoided for the 8KB mappings. Failure to do
so results in usage of Region-Frame Absolute Address (RFAA) or
Segment-Frame Absolute Address (SFAA) large page fields. In that
case absolute addresses would be used to address the prefix page
instead of the real ones and the prefixing would get bypassed.

Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 6cbd7cc2

arch/s390/boot/startup.c

+4 −1
Original line number Diff line number Diff line
@@ -10,11 +10,13 @@ 
#include <asm/sclp.h>

#include <asm/diag.h>

#include <asm/uv.h>

#include <asm/abs_lowcore.h>

#include "decompressor.h"

#include "boot.h"

#include "uv.h"



unsigned long __bootdata_preserved(__kaslr_offset);

unsigned long __bootdata_preserved(__abs_lowcore);

unsigned long __bootdata(__amode31_base);

unsigned long __bootdata_preserved(VMALLOC_START);

unsigned long __bootdata_preserved(VMALLOC_END);
@@ -180,7 +182,8 @@ static void setup_kernel_memory_layout(void) 
	/* force vmalloc and modules below kasan shadow */

	vmax = min(vmax, KASAN_SHADOW_START);

#endif

	MODULES_END = vmax;

	__abs_lowcore = round_down(vmax - ABS_LOWCORE_MAP_SIZE, sizeof(struct lowcore));

	MODULES_END = round_down(__abs_lowcore, _SEGMENT_SIZE);

	MODULES_VADDR = MODULES_END - MODULES_LEN;

	VMALLOC_END = MODULES_VADDR;

arch/s390/include/asm/abs_lowcore.h

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

#ifndef _ASM_S390_ABS_LOWCORE_H

#define _ASM_S390_ABS_LOWCORE_H



#include <asm/lowcore.h>



#define ABS_LOWCORE_MAP_SIZE	(NR_CPUS * sizeof(struct lowcore))



extern unsigned long __abs_lowcore;

extern bool abs_lowcore_mapped;



struct lowcore *get_abs_lowcore(unsigned long *flags);

void put_abs_lowcore(struct lowcore *lc, unsigned long flags);

int abs_lowcore_map(int cpu, struct lowcore *lc, bool alloc);

void abs_lowcore_unmap(int cpu);



#endif /* _ASM_S390_ABS_LOWCORE_H */

arch/s390/include/asm/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -1777,6 +1777,9 @@ static inline swp_entry_t __swp_entry(unsigned long type, unsigned long offset) 


extern int vmem_add_mapping(unsigned long start, unsigned long size);

extern void vmem_remove_mapping(unsigned long start, unsigned long size);

extern int __vmem_map_4k_page(unsigned long addr, unsigned long phys, pgprot_t prot, bool alloc);

extern int vmem_map_4k_page(unsigned long addr, unsigned long phys, pgprot_t prot);

extern void vmem_unmap_4k_page(unsigned long addr);

extern int s390_enable_sie(void);

extern int s390_enable_skey(void);

extern void s390_reset_cmma(struct mm_struct *mm);

arch/s390/include/asm/processor.h

+0 −15
Original line number Diff line number Diff line
@@ -307,21 +307,6 @@ static __always_inline void __noreturn disabled_wait(void) 
#define ARCH_LOW_ADDRESS_LIMIT	0x7fffffffUL



extern int memcpy_real(void *, unsigned long, size_t);

extern void memcpy_absolute(void *, void *, size_t);



#define put_abs_lowcore(member, x) do {					\

	unsigned long __abs_address = offsetof(struct lowcore, member);	\

	__typeof__(((struct lowcore *)0)->member) __tmp = (x);		\

									\

	memcpy_absolute(__va(__abs_address), &__tmp, sizeof(__tmp));	\

} while (0)



#define get_abs_lowcore(x, member) do {					\

	unsigned long __abs_address = offsetof(struct lowcore, member);	\

	__typeof__(((struct lowcore *)0)->member) *__ptr = &(x);	\

									\

	memcpy_absolute(__ptr, __va(__abs_address), sizeof(*__ptr));	\

} while (0)



extern int s390_isolate_bp(void);

extern int s390_isolate_bp_guest(void);

arch/s390/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ obj-y += sysinfo.o lgr.o os_info.o machine_kexec.o 
obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o

obj-y	+= entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o

obj-y	+= nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o

obj-y	+= smp.o text_amode31.o stacktrace.o

obj-y	+= smp.o text_amode31.o stacktrace.o abs_lowcore.o



extra-y				+= head64.o vmlinux.lds