Skip to contentSkip to conversation

svm: Add SMI handler for svm_intr_intercept_mix_smi test

PATCH Applied Ryosuke Yasuoka 2 participants 2 messages Aug 20 – Sep 8 KVM

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 svm: Add SMI handler for svm_intr_intercept_mix_smi test

L1 intercepts L2's SMI and the SMI is still pending at L0. When L1 re-enables GIF via stgi(), L0 delivers the SMI to L1.

If SMBASE has not been relocated and no SMI handler has been installed, L1 enters SMM and executes garbage at the default entry point, causing an abort.

Install a trivial SMI handler at the default SMBASE entry point so L1 can return from SMM.

---
Changes in v2:
- Update commit messages and comments based on Maxim feedback.
- No code updates
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 x86/svm_tests.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
x86/svm_tests.c +28 -0
index ccbab1d0..639da786 100644
@@ -3543,8 +3543,36 @@ static void svm_intr_intercept_mix_smi_guest(struct svm_test *test)
 	report(0, "must not reach here");
 }
 
+#define SMBASE	0x30000
+#define SMBASE_ENTRY	(SMBASE + 0x8000)
+#define RSM_OPCODE	0xaa0f
+
+/*
+ * Install a trivial SMI handler at the default SMBASE entry point as a
+ * fallback for when SMBASE has not been relocated and no SMI handler has
+ * been installed. Without this, entering SMM executes garbage at the
+ * default entry point and aborts.
+ *
+ * If running with a firmware that supports SMM, it will relocate SMBASE
+ * and install its own handler, so the handler installed here will be
+ * safely ignored.
+ *
+ * The default SMBASE (0x30000) region is safe to write to: flat.lds places
+ * all sections starting at 4MB, and the page allocator starts after edata.
+ */
+static void install_smi_handler(void)
+{
+	WRITE_ONCE(*(u16 *)SMBASE_ENTRY, RSM_OPCODE);
+}
+
 static void svm_intr_intercept_mix_smi(void)
 {
+	/*
+	 * L1 intercepts L2's SMI and the SMI is still pending at L0.
+	 * When L1 re-enables GIF via stgi(), L0 delivers the SMI to L1.
+	 */
+	install_smi_handler();
+
 	vmcb_set_intercept(INTERCEPT_SMI);
 	vmcb->control.int_ctl &= ~V_INTR_MASKING_MASK;
 	test_set_guest(svm_intr_intercept_mix_smi_guest);

---
base-commit: 033ab80d18bca31a6e428b877518883c90c3a2aa
change-id: 20260820-add_smi_handler-063b3d117141

Best regards,

Signature · 1 line
Ryosuke Yasuoka <[email protected]>
maintainer Applied
#1 lore raw
Quoted 9 lines · Ryosuke Yasuoka

L1 intercepts L2's SMI and the SMI is still pending at L0. When L1 re-enables GIF via stgi(), L0 delivers the SMI to L1.

If SMBASE has not been relocated and no SMI handler has been installed, L1 enters SMM and executes garbage at the default entry point, causing an abort.

Install a trivial SMI handler at the default SMBASE entry point so L1 can return from SMM.

Applied, with an extra note that you can't have multiple processors using the same SMBASE area at the same time.

Paolo

Quoted 59 lines

---
Changes in v2:
- Update commit messages and comments based on Maxim feedback.
- No code updates
- Link to v1: https://lore.kernel.org/r/[email protected]

---
  x86/svm_tests.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
x86/svm_tests.c +28 -1
index ccbab1d0..639da786 100644
@@ -3543,8 +3543,36 @@ static void svm_intr_intercept_mix_smi_guest(struct svm_test *test)
  	report(0, "must not reach here");
  }
 
+#define SMBASE	0x30000
+#define SMBASE_ENTRY	(SMBASE + 0x8000)
+#define RSM_OPCODE	0xaa0f
+
+/*
+ * Install a trivial SMI handler at the default SMBASE entry point as a
+ * fallback for when SMBASE has not been relocated and no SMI handler has
+ * been installed. Without this, entering SMM executes garbage at the
+ * default entry point and aborts.
+ *
+ * If running with a firmware that supports SMM, it will relocate SMBASE
+ * and install its own handler, so the handler installed here will be
+ * safely ignored.
+ *
+ * The default SMBASE (0x30000) region is safe to write to: flat.lds places
+ * all sections starting at 4MB, and the page allocator starts after edata.
+ */
+static void install_smi_handler(void)
+{
+	WRITE_ONCE(*(u16 *)SMBASE_ENTRY, RSM_OPCODE);
+}
+
  static void svm_intr_intercept_mix_smi(void)
  {
+	/*
+	 * L1 intercepts L2's SMI and the SMI is still pending at L0.
+	 * When L1 re-enables GIF via stgi(), L0 delivers the SMI to L1.
+	 */
+	install_smi_handler();
+
  	vmcb_set_intercept(INTERCEPT_SMI);
  	vmcb->control.int_ctl &= ~V_INTR_MASKING_MASK;
  	test_set_guest(svm_intr_intercept_mix_smi_guest);
 
---

base-commit: 033ab80d18bca31a6e428b877518883c90c3a2aa
change-id: 20260820-add_smi_handler-063b3d117141

Best regards,