KVM: selftests: Add vmgexit helper

pratiksampat · sean-jc · commit c4e1a848d721 · 2025-05-02T12:32:32.000-07:00
Abstract rep vmmcall coded into the vmgexit helper for the sev library. No functional change intended. Signed-off-by: Pratik R. Sampat <prsampat@amd.com> Reviewed-by: Pankaj Gupta <pankaj.gupta@amd.com> Link: https://lore.kernel.org/r/20250305230000.231025-4-prsampat@amd.com Signed-off-by: Sean Christopherson <seanjc@google.com>
diff --git a/tools/testing/selftests/kvm/include/x86/sev.h b/tools/testing/selftests/kvm/include/x86/sev.h
@@ -71,6 +71,11 @@ kvm_static_assert(SEV_RET_SUCCESS == 0);
 void sev_vm_init(struct kvm_vm *vm);
 void sev_es_vm_init(struct kvm_vm *vm);
 
+static inline void vmgexit(void)
+{
+	__asm__ __volatile__("rep; vmmcall");
+}
+
 static inline void sev_register_encrypted_memory(struct kvm_vm *vm,
 						 struct userspace_mem_region *region)
 {
diff --git a/tools/testing/selftests/kvm/x86/sev_smoke_test.c b/tools/testing/selftests/kvm/x86/sev_smoke_test.c
@@ -27,7 +27,7 @@ static void guest_sev_es_code(void)
 	 * force "termination" to signal "done" via the GHCB MSR protocol.
 	 */
 	wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ);
-	__asm__ __volatile__("rep; vmmcall");
+	vmgexit();
 }
 
 static void guest_sev_code(void)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static void guest_sev_es_code(void)`
`27`	`27`	`* force "termination" to signal "done" via the GHCB MSR protocol.`
`28`	`28`	`*/`
`29`	`29`	`wrmsr(MSR_AMD64_SEV_ES_GHCB, GHCB_MSR_TERM_REQ);`
`30`		`- __asm__ __volatile__("rep; vmmcall");`
	`30`	`+ vmgexit();`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`static void guest_sev_code(void)`