Skip to contentSkip to conversation

x86/compressed/64: Add identity mappings for setup_data entries

PATCH New Michael Roth 1 participant 1 message Jul 6, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/compressed/64: Add identity mappings for setup_data entries

The decompressed kernel initially relies on the identity map set up by the boot/compressed kernel for accessing things like boot_params. With the recent introduction of SEV-SNP support, the decompressed kernel also needs to access the setup_data entries pointed to by boot_params->hdr.setup_data. This can lead to a crash during early boot due to these entries not currently being included in the initial identity map.

Fix this by including mappings for the setup_data entries in the initial identity map.

Fixes b190a043c49a ("x86/sev: Add SEV-SNP feature detection/setup")
---
 arch/x86/boot/compressed/ident_map_64.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/x86/boot/compressed/ident_map_64.c +12 -0
index 44c350d627c7..e2249ec93229 100644
@@ -110,6 +110,7 @@ void kernel_add_identity_map(unsigned long start, unsigned long end)
 void initialize_identity_maps(void *rmode)
 {
 	unsigned long cmdline;
+	struct setup_data *sd;
 
 	/* Exclude the encryption mask from __PHYSICAL_MASK */
 	physical_mask &= ~sme_me_mask;
@@ -163,6 +164,17 @@ void initialize_identity_maps(void *rmode)
 	cmdline = get_cmd_line_ptr();
 	kernel_add_identity_map(cmdline, cmdline + COMMAND_LINE_SIZE);
 
+	/*
+	 * Also map the setup_data entries passed via boot_params in case they
+	 * need to be accessed by uncompressed kernel via the identity mapping.
+	 */
+	sd = (struct setup_data *)boot_params->hdr.setup_data;
+	while (sd) {
+		kernel_add_identity_map((unsigned long)sd,
+					(unsigned long)sd + sizeof(*sd) + sd->len);
+		sd = (struct setup_data *)sd->next;
+	}
+
 	sev_prep_identity_maps(top_level_pgt);
 
 	/* Load the new page-table. */
Signature · 1 line
2.25.1