From: David Edmondson <david.edmondson@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Sean Christopherson <seanjc@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Joerg Roedel <joro@8bytes.org>,
Wanpeng Li <wanpengli@tencent.com>,
Borislav Petkov <bp@alien8.de>, Jim Mattson <jmattson@google.com>,
Ingo Molnar <mingo@redhat.com>,
Joao Martins <joao.m.martins@oracle.com>,
David Edmondson <david.edmondson@oracle.com>
Subject: [PATCH 1/6] KVM: x86: add an emulation_reason to x86_emulate_instruction()
Date: Mon, 12 Apr 2021 14:09:32 +0100 [thread overview]
Message-ID: <20210412130938.68178-2-david.edmondson@oracle.com> (raw)
In-Reply-To: <20210412130938.68178-1-david.edmondson@oracle.com>
From: Joao Martins <joao.m.martins@oracle.com>
Emulation can happen for a variety of reasons, yet on error we have no
idea exactly what triggered it. Expand x86_emulate_instruction() to
carry an @emulation_reason argument.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Edmondson <david.edmondson@oracle.com>
---
arch/x86/kvm/mmu/mmu.c | 4 ++--
arch/x86/kvm/x86.c | 7 ++++---
arch/x86/kvm/x86.h | 3 ++-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 951dae4e7175..515ff790b7c5 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -5056,8 +5056,8 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,
if (!mmio_info_in_cache(vcpu, cr2_or_gpa, direct) && !is_guest_mode(vcpu))
emulation_type |= EMULTYPE_ALLOW_RETRY_PF;
emulate:
- return x86_emulate_instruction(vcpu, cr2_or_gpa, emulation_type, insn,
- insn_len);
+ return x86_emulate_instruction(vcpu, cr2_or_gpa, emulation_type, 0,
+ insn, insn_len);
}
EXPORT_SYMBOL_GPL(kvm_mmu_page_fault);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index eca63625aee4..87e76f3aee64 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7445,7 +7445,8 @@ int x86_decode_emulated_instruction(struct kvm_vcpu *vcpu, int emulation_type,
EXPORT_SYMBOL_GPL(x86_decode_emulated_instruction);
int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
- int emulation_type, void *insn, int insn_len)
+ int emulation_type, int emulation_reason,
+ void *insn, int insn_len)
{
int r;
struct x86_emulate_ctxt *ctxt = vcpu->arch.emulate_ctxt;
@@ -7604,14 +7605,14 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
int kvm_emulate_instruction(struct kvm_vcpu *vcpu, int emulation_type)
{
- return x86_emulate_instruction(vcpu, 0, emulation_type, NULL, 0);
+ return x86_emulate_instruction(vcpu, 0, emulation_type, 0, NULL, 0);
}
EXPORT_SYMBOL_GPL(kvm_emulate_instruction);
int kvm_emulate_instruction_from_buffer(struct kvm_vcpu *vcpu,
void *insn, int insn_len)
{
- return x86_emulate_instruction(vcpu, 0, 0, insn, insn_len);
+ return x86_emulate_instruction(vcpu, 0, 0, 0, insn, insn_len);
}
EXPORT_SYMBOL_GPL(kvm_emulate_instruction_from_buffer);
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 9035e34aa156..5686436c99da 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -276,7 +276,8 @@ void kvm_fixup_and_inject_pf_error(struct kvm_vcpu *vcpu, gva_t gva, u16 error_c
int x86_decode_emulated_instruction(struct kvm_vcpu *vcpu, int emulation_type,
void *insn, int insn_len);
int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
- int emulation_type, void *insn, int insn_len);
+ int emulation_type, int emulation_reason,
+ void *insn, int insn_len);
fastpath_t handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vcpu);
extern u64 host_xcr0;
--
2.30.2
next prev parent reply other threads:[~2021-04-12 13:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 13:09 [PATCH 0/6] KVM: x86: Make the cause of instruction emulation available to user-space David Edmondson
2021-04-12 13:09 ` David Edmondson [this message]
2021-04-12 13:09 ` [PATCH 2/6] KVM: x86: pass emulation_reason to handle_emulation_failure() David Edmondson
2021-04-12 13:09 ` [PATCH 3/6] KVM: x86: add emulation_reason to kvm_emulate_instruction() David Edmondson
2021-04-12 13:09 ` [PATCH 4/6] KVM: x86: pass a proper reason " David Edmondson
2021-04-12 13:09 ` [PATCH 5/6] KVM: SVM: pass a proper reason in kvm_emulate_instruction() David Edmondson
2021-04-12 16:04 ` Sean Christopherson
2021-04-13 10:53 ` David Edmondson
2021-04-13 18:45 ` Aaron Lewis
2021-04-14 12:25 ` David Edmondson
2021-04-12 13:09 ` [PATCH 6/6] KVM: VMX: " David Edmondson
2021-04-12 18:34 ` [PATCH 0/6] KVM: x86: Make the cause of instruction emulation available to user-space Jim Mattson
2021-04-13 10:54 ` David Edmondson
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=20210412130938.68178-2-david.edmondson@oracle.com \
--to=david.edmondson@oracle.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=joao.m.martins@oracle.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).