Skip to content

Commit

Permalink
s390/boot: disable Secure Execution in dump mode
Browse files Browse the repository at this point in the history
A dump kernel is neither required nor able to support Secure Execution.

Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
  • Loading branch information
Alexander Egorenkov authored and Heiko Carstens committed Jul 27, 2021
1 parent c5cf505 commit 42c8943
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/s390/boot/startup.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ void startup_kernel(void)
sclp_early_read_info();
setup_boot_command_line();
parse_boot_command_line();
sanitize_prot_virt_host();
setup_ident_map_size(detect_memory());
setup_vmalloc_size();
setup_kernel_memory_layout();
Expand Down
8 changes: 8 additions & 0 deletions arch/s390/boot/uv.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
#include <asm/uv.h>
#include <asm/boot_data.h>
#include <asm/facility.h>
#include <asm/sections.h>

#include "boot.h"
#include "uv.h"

/* will be used in arch/s390/kernel/uv.c */
Expand Down Expand Up @@ -71,4 +73,10 @@ void adjust_to_uv_max(unsigned long *vmax)
if (has_uv_sec_stor_limit())
*vmax = min_t(unsigned long, *vmax, uv_info.max_sec_stor_addr);
}

void sanitize_prot_virt_host(void)
{
if (OLDMEM_BASE || (ipl_block_valid && is_ipl_block_dump()))
prot_virt_host = 0;
}
#endif
2 changes: 2 additions & 0 deletions arch/s390/boot/uv.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

#if IS_ENABLED(CONFIG_KVM)
void adjust_to_uv_max(unsigned long *vmax);
void sanitize_prot_virt_host(void);
#else
static inline void adjust_to_uv_max(unsigned long *vmax) {}
static inline void sanitize_prot_virt_host(void) {}
#endif

#if defined(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) || IS_ENABLED(CONFIG_KVM)
Expand Down

0 comments on commit 42c8943

Please sign in to comment.