From: Krish Sadhukhan <krish.sadhukhan@oracle.com>
To: kvm@vger.kernel.org
Cc: pbonzini@redhat.com, jmattson@google.com, seanjc@google.com
Subject: [PATCH 3/4 v3] KVM: nSVM: Add assembly label to VMRUN instruction
Date: Tue, 23 Feb 2021 14:19:57 -0500 [thread overview]
Message-ID: <20210223191958.24218-4-krish.sadhukhan@oracle.com> (raw)
In-Reply-To: <20210223191958.24218-1-krish.sadhukhan@oracle.com>
Add an assembly label to the VMRUN instruction so that its RIP can be known
to test cases. This will be used by the test in the next patch.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
---
x86/svm.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/x86/svm.c b/x86/svm.c
index a1808c7..77fba8b 100644
--- a/x86/svm.c
+++ b/x86/svm.c
@@ -208,14 +208,15 @@ struct regs get_regs(void)
struct svm_test *v2_test;
-#define ASM_VMRUN_CMD \
+#define ASM_PRE_VMRUN_CMD \
"vmload %%rax\n\t" \
"mov regs+0x80, %%r15\n\t" \
"mov %%r15, 0x170(%%rax)\n\t" \
"mov regs, %%r15\n\t" \
"mov %%r15, 0x1f8(%%rax)\n\t" \
LOAD_GPR_C \
- "vmrun %%rax\n\t" \
+
+#define ASM_POST_VMRUN_CMD \
SAVE_GPR_C \
"mov 0x170(%%rax), %%r15\n\t" \
"mov %%r15, regs+0x80\n\t" \
@@ -232,7 +233,9 @@ int svm_vmrun(void)
regs.rdi = (ulong)v2_test;
asm volatile (
- ASM_VMRUN_CMD
+ ASM_PRE_VMRUN_CMD
+ "vmrun %%rax\n\t" \
+ ASM_POST_VMRUN_CMD
:
: "a" (virt_to_phys(vmcb))
: "memory", "r15");
@@ -240,6 +243,8 @@ int svm_vmrun(void)
return (vmcb->control.exit_code);
}
+extern void *vmrun_rip;
+
static void test_run(struct svm_test *test)
{
u64 vmcb_phys = virt_to_phys(vmcb);
@@ -258,7 +263,10 @@ static void test_run(struct svm_test *test)
"sti \n\t"
"call *%c[PREPARE_GIF_CLEAR](%[test]) \n \t"
"mov %[vmcb_phys], %%rax \n\t"
- ASM_VMRUN_CMD
+ ASM_PRE_VMRUN_CMD
+ ".global vmrun_rip\n\t" \
+ "vmrun_rip: vmrun %%rax\n\t" \
+ ASM_POST_VMRUN_CMD
"cli \n\t"
"stgi"
: // inputs clobbered by the guest:
--
2.27.0
next prev parent reply other threads:[~2021-02-23 20:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 19:19 [PATCH 0/4 v3] nSVM: Test host RFLAGS.TF on VMRUN Krish Sadhukhan
2021-02-23 19:19 ` [PATCH 1/4 v3] KVM: nSVM: Do not advance RIP following VMRUN completion if the latter is single-stepped Krish Sadhukhan
2021-02-23 22:42 ` Sean Christopherson
2021-02-24 21:18 ` Krish Sadhukhan
2021-02-24 21:59 ` Sean Christopherson
2021-03-22 19:00 ` Krish Sadhukhan
2021-02-23 19:19 ` [PATCH 2/4 v3] KVM: X86: Add a utility function to read current RIP Krish Sadhukhan
2021-02-23 19:19 ` Krish Sadhukhan [this message]
2021-02-23 19:19 ` [PATCH 4/4 v3] KVM: nSVM: Test effect of host RFLAGS.TF on VMRUN Krish Sadhukhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210223191958.24218-4-krish.sadhukhan@oracle.com \
--to=krish.sadhukhan@oracle.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.