Commit 129c48cd authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: selftests: restore special vmmcall code layout needed by the harness 



Commit 8fda37cf ("KVM: selftests: Stuff RAX/RCX with 'safe' values
in vmmcall()/vmcall()", 2022-11-21) broke the svm_nested_soft_inject_test
because it placed a "pop rbp" instruction after vmmcall.  While this is
correct and mimics what is done in the VMX case, this particular test
expects a ud2 instruction right after the vmmcall, so that it can skip
over it in the L1 part of the test.

Inline a suitably-modified version of vmmcall() to restore the
functionality of the test.

Fixes: 8fda37cf ("KVM: selftests: Stuff RAX/RCX with 'safe' values in vmmcall()/vmcall()"
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20221130181147.9911-1-pbonzini@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 02d9a04d

tools/testing/selftests/kvm/x86_64/svm_nested_soft_inject_test.c

+11 −2
Original line number Diff line number Diff line
@@ -41,8 +41,17 @@ static void guest_int_handler(struct ex_regs *regs) 
static void l2_guest_code_int(void)

{

	GUEST_ASSERT_1(int_fired == 1, int_fired);

	vmmcall();

	ud2();



	/*

         * Same as the vmmcall() function, but with a ud2 sneaked after the

         * vmmcall.  The caller injects an exception with the return address

         * increased by 2, so the "pop rbp" must be after the ud2 and we cannot

	 * use vmmcall() directly.

         */

	__asm__ __volatile__("push %%rbp; vmmcall; ud2; pop %%rbp"

                             : : "a"(0xdeadbeef), "c"(0xbeefdead)

                             : "rbx", "rdx", "rsi", "rdi", "r8", "r9",

                               "r10", "r11", "r12", "r13", "r14", "r15");



	GUEST_ASSERT_1(bp_fired == 1, bp_fired);

	hlt();