diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2020-09-11 11:38:21 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2020-09-16 14:08:47 +0200 |
| commit | 1d6671ae46e52e383bc6eea8d33bdd32ae61b323 (patch) | |
| tree | 1996bcba464031af7c7ed546fbc2ab1e933fe837 /arch/s390/boot | |
| parent | s390/kasan: avoid unnecessary moving of vmemmap (diff) | |
| download | linux-1d6671ae46e52e383bc6eea8d33bdd32ae61b323.tar.xz linux-1d6671ae46e52e383bc6eea8d33bdd32ae61b323.zip | |
s390/protvirt: parse prot_virt option in the decompressor
To make early kernel address space layout definition possible parse
prot_virt option in the decompressor and pass it to the uncompressed
kernel. This enables kasan to take ultravisor secure storage limit into
consideration and pre-define vmalloc position correctly.
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/boot')
| -rw-r--r-- | arch/s390/boot/ipl_parm.c | 8 | ||||
| -rw-r--r-- | arch/s390/boot/uv.c | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c index ae230ebd6420..92ebc4a58fe2 100644 --- a/arch/s390/boot/ipl_parm.c +++ b/arch/s390/boot/ipl_parm.c @@ -254,6 +254,14 @@ void parse_boot_command_line(void) if (!strcmp(param, "nokaslr")) kaslr_enabled = 0; + +#if IS_ENABLED(CONFIG_KVM) + if (!strcmp(param, "prot_virt")) { + rc = kstrtobool(val, &enabled); + if (!rc && enabled) + prot_virt_host = 1; + } +#endif } } diff --git a/arch/s390/boot/uv.c b/arch/s390/boot/uv.c index f887a479cdc7..a15c033f53ca 100644 --- a/arch/s390/boot/uv.c +++ b/arch/s390/boot/uv.c @@ -7,6 +7,9 @@ #ifdef CONFIG_PROTECTED_VIRTUALIZATION_GUEST int __bootdata_preserved(prot_virt_guest); #endif +#if IS_ENABLED(CONFIG_KVM) +int __bootdata_preserved(prot_virt_host); +#endif struct uv_info __bootdata_preserved(uv_info); void uv_query_info(void) |