Skip to contentSkip to conversation

x86: efi: set up the IDT before accessing MSRs.

PATCH In review Vasant Karasulli 2 participants 4 messages Aug 23, 2022 – Oct 21, 2022 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: efi: set up the IDT before accessing MSRs.

Reading or writing MSR_IA32_APICBASE is typically an intercepted operation and causes #VC exception when the test is launched as an SEV-ES guest.

So calling pre_boot_apic_id() and reset_apic() before the IDT is set up in setup_idt() and load_idt() might cause problems.

Hence move percpu data setup and reset_apic() call after setup_idt() and load_idt().

Fixes 3c50214c97f173f5e0f82c7f248a7c62707d8748 (x86: efi: Provide percpu storage)
---
 lib/x86/setup.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
lib/x86/setup.c +12 -8
index 7df0256..712e292 100644
@@ -192,8 +192,6 @@ static void setup_segments64(void)
 	write_gs(KERNEL_DS);
 	write_ss(KERNEL_DS);
 
-	/* Setup percpu base */
-	wrmsr(MSR_GS_BASE, (u64)&__percpu_data[pre_boot_apic_id()]);
 
 	/*
 	 * Update the code segment by putting it on the stack before the return
@@ -322,7 +320,7 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo)
 		}
 		return status;
 	}
-
+
 	status = setup_rsdp(efi_bootinfo);
 	if (status != EFI_SUCCESS) {
 		printf("Cannot find RSDP in EFI system table\n");
@@ -344,14 +342,20 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo)
 	}
 
 	setup_gdt_tss();
-	/*
-	 * GS.base, which points at the per-vCPU data, must be configured prior
-	 * to resetting the APIC, which sets the per-vCPU APIC ops.
-	 */
 	setup_segments64();
-	reset_apic();
 	setup_idt();
 	load_idt();
+	/*
+	 * Load GS.base with the per-vCPU data.  This must be done after
+	 * loading the IDT as reading the APIC ID may #VC when running
+	 * as an SEV-ES guest
+	 */
+	wrmsr(MSR_GS_BASE, (u64)&__percpu_data[pre_boot_apic_id()]);
+	/*
+	 * Resetting the APIC sets the per-vCPU APIC ops and so must be
+	 * done after loading GS.base with the per-vCPU data.
+	 */
+	reset_apic();
 	mask_pic_interrupts();
 	setup_page_table();
 	enable_apic();

--
2.34.1

reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Vasant Karasulli

Reading or writing MSR_IA32_APICBASE is typically an intercepted operation and causes #VC exception when the test is launched as an SEV-ES guest.

So calling pre_boot_apic_id() and reset_apic() before the IDT is set up in setup_idt() and load_idt() might cause problems.

Quoted 6 lines

Hence move percpu data setup and reset_apic() call after setup_idt() and load_idt().

Fixes 3c50214c97f173f5e0f82c7f248a7c62707d8748 (x86: efi: Provide percpu storage)

---

Quoted 17 lines
 lib/x86/setup.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
lib/x86/setup.c +0 -2
index 7df0256..712e292 100644
@@ -192,8 +192,6 @@ static void setup_segments64(void)
 	write_gs(KERNEL_DS);
 	write_ss(KERNEL_DS);
 
-	/* Setup percpu base */
-	wrmsr(MSR_GS_BASE, (u64)&__percpu_data[pre_boot_apic_id()]);
 
 	/*
 	 * Update the code segment by putting it on the stack before the return

lib/x86/setup.c efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo) · line 323

Quoted 5 lines
lib/x86/setup.c +1 -1
@@ -322,7 +320,7 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo)
 		}
 		return status;
 	}
-
+

Huh. This causes a conflict for me. My local repo has a tab here that is presumably being removed, but this patch doesn't have anything. If I manually add back the tab, all is well. I suspect your client may be stripping trailing whitespace.

#2 lore raw

Hi Sean,

Quoted 16 lines
Quoted 14 lines
 lib/x86/setup.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
lib/x86/setup.c +0 -2
index 7df0256..712e292 100644
@@ -192,8 +192,6 @@ static void setup_segments64(void)
 	write_gs(KERNEL_DS);
 	write_ss(KERNEL_DS);
 
-	/* Setup percpu base */
-	wrmsr(MSR_GS_BASE, (u64)&__percpu_data[pre_boot_apic_id()]);
 
Quoted 13 lines

lib/x86/setup.c efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo) · line 323

Quoted 8 lines
lib/x86/setup.c +1 -1
 	/*
 	 * Update the code segment by putting it on the stack before the return
@@ -322,7 +320,7 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo)
 		}
 		return status;
 	}
-
+

Huh. This causes a conflict for me. My local repo has a tab here that is presumably being removed, but this patch doesn't have anything. If I manually add back the tab, all is well. I suspect your client may be stripping trailing whitespace.

Yes, I think my client was stripping trailing whitespaces. Do you want me to send a new version of the patch with that formatting?

Thanks,
Vasant Karasulli
Kernel generalist
www.suse.com<http://www.suse.com>
[https://www.suse.com/assets/img/social-platforms-suse-logo.png]<http://www.suse.com/>
SUSE - Open Source Solutions for Enterprise Servers & Cloud<http://www.suse.com/>
Modernize your infrastructure with SUSE Linux Enterprise servers, cloud technology for IaaS, and SUSE's software-defined storage. www.suse.com

#3 lore raw
Quoted 32 lines · Vasant Karasulli

Hi Sean,

Quoted 16 lines
Quoted 14 lines
 lib/x86/setup.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
lib/x86/setup.c +0 -2
index 7df0256..712e292 100644
@@ -192,8 +192,6 @@ static void setup_segments64(void)
 	write_gs(KERNEL_DS);
 	write_ss(KERNEL_DS);
 
-	/* Setup percpu base */
-	wrmsr(MSR_GS_BASE, (u64)&__percpu_data[pre_boot_apic_id()]);
 
Quoted 13 lines

lib/x86/setup.c efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo) · line 323

Quoted 8 lines
lib/x86/setup.c +1 -1
 	/*
 	 * Update the code segment by putting it on the stack before the return
@@ -322,7 +320,7 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo)
 		}
 		return status;
 	}
-
+

Huh. This causes a conflict for me. My local repo has a tab here that is presumably being removed, but this patch doesn't have anything. If I manually add back the tab, all is well. I suspect your client may be stripping trailing whitespace.

Quoted 2 lines

Yes, I think my client was stripping trailing whitespaces. Do you want me to send a new version of the patch with that formatting?

No need, I'll put together a KUT PULL request next unless Paolo beats me to the punch.