From: Wanpeng Li <kernellwp@gmail.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>
Subject: [PATCH 2/2] KVM: VMX: Add Force Emulation Prefix for "emulate the next instruction"
Date: Mon, 26 Mar 2018 19:12:15 -0700 [thread overview]
Message-ID: <1522116735-4861-3-git-send-email-wanpengli@tencent.com> (raw)
In-Reply-To: <1522116735-4861-1-git-send-email-wanpengli@tencent.com>
From: Wanpeng Li <wanpengli@tencent.com>
This patch introduces a Force Emulation Prefix (ud2a; .ascii "kvm") for
"emulate the next instruction", the codes will be executed by emulator
instead of processor, for testing purposes.
A testcase here:
#include <stdio.h>
#include <string.h>
#define HYPERVISOR_INFO 0x40000000
#define CPUID(idx, eax, ebx, ecx, edx)\
asm volatile (\
"ud2a; .ascii \"kvm\"; 1: cpuid" \
:"=b" (*ebx), "=a" (*eax),"=c" (*ecx), "=d" (*edx)\
:"0"(idx) );
void main()
{
unsigned int eax,ebx,ecx,edx;
char string[13];
CPUID(HYPERVISOR_INFO, &eax, &ebx, &ecx, &edx);
*(unsigned int *)(string+0) = ebx;
*(unsigned int *)(string+4) = ecx;
*(unsigned int *)(string+8) = edx;
string[12] = 0;
if (strncmp(string, "KVMKVMKVM\0\0\0",12) == 0)
printf("kvm guest\n");
else
printf("bare hardware\n");
}
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
arch/x86/kvm/vmx.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 0f99833..90abed8 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -108,6 +108,9 @@ module_param_named(enable_shadow_vmcs, enable_shadow_vmcs, bool, S_IRUGO);
static bool __read_mostly nested = 0;
module_param(nested, bool, S_IRUGO);
+static bool __read_mostly fep = 0;
+module_param(fep, bool, S_IRUGO);
+
static u64 __read_mostly host_xss;
static bool __read_mostly enable_pml = 1;
@@ -6218,8 +6221,21 @@ static int handle_machine_check(struct kvm_vcpu *vcpu)
static int handle_ud(struct kvm_vcpu *vcpu)
{
enum emulation_result er;
+ int emulation_type = EMULTYPE_TRAP_UD;
+
+ if (fep) {
+ char sig[5]; /* ud2; .ascii "kvm" */
+ struct x86_exception e;
+
+ kvm_read_guest_virt(&vcpu->arch.emulate_ctxt,
+ kvm_get_linear_rip(vcpu), sig, sizeof(sig), &e);
+ if (memcmp(sig, "\xf\xbkvm", sizeof(sig)) == 0) {
+ emulation_type = 0;
+ kvm_rip_write(vcpu, kvm_rip_read(vcpu) + sizeof(sig));
+ }
+ }
- er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
+ er = emulate_instruction(vcpu, emulation_type);
if (er == EMULATE_USER_EXIT)
return 0;
if (er != EMULATE_DONE)
--
2.7.4
next prev parent reply other threads:[~2018-03-27 2:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 2:12 [PATCH 0/2] " Wanpeng Li
2018-03-27 2:12 ` [PATCH 1/2] KVM: VMX: Introduce handle_ud() Wanpeng Li
2018-03-27 4:38 ` Konrad Rzeszutek Wilk
2018-03-27 2:12 ` Wanpeng Li [this message]
2018-03-27 4:40 ` [PATCH 2/2] KVM: VMX: Add Force Emulation Prefix for "emulate the next instruction" Konrad Rzeszutek Wilk
2018-03-27 4:55 ` Konrad Rzeszutek Wilk
2018-03-27 5:03 ` Wanpeng Li
2018-03-27 5:18 ` Konrad Rzeszutek Wilk
2018-03-27 7:25 ` Paolo Bonzini
2018-03-27 7:29 ` Wanpeng Li
2018-03-27 5:09 ` Wanpeng Li
2018-03-27 7:52 Liran Alon
2018-03-27 8:19 ` Paolo Bonzini
2018-03-27 9:09 ` Wanpeng Li
2018-03-27 8:26 Liran Alon
2018-03-27 9:05 ` Nikita Leshenko
2018-03-27 9:15 ` Paolo Bonzini
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=1522116735-4861-3-git-send-email-wanpengli@tencent.com \
--to=kernellwp@gmail.com \
--cc=andrew.cooper3@citrix.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®