From: Yang Weijiang <weijiang.yang@intel.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
pbonzini@redhat.com, jmattson@google.com,
sean.j.christopherson@intel.com
Cc: yu.c.zhang@linux.intel.com, alazar@bitdefender.com,
edwin.zhai@intel.com, Yang Weijiang <weijiang.yang@intel.com>
Subject: [PATCH v8 09/10] x86: spp: Add SPP protection check in emulation
Date: Sat, 30 Nov 2019 01:27:08 +0800 [thread overview]
Message-ID: <20191129172709.11347-10-weijiang.yang@intel.com> (raw)
In-Reply-To: <20191129172709.11347-1-weijiang.yang@intel.com>
In instruction/mmio emulation cases, if the target write memroy
is SPP protected, exit to user-space to handle it as if it's
caused by SPP induced EPT violation due to guest write.
Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
---
arch/x86/kvm/x86.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index f38571d09d5e..3e636d963e68 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5569,6 +5569,37 @@ static const struct read_write_emulator_ops write_emultor = {
.write = true,
};
+static bool is_emulator_spp_protected(struct kvm_vcpu *vcpu,
+ gpa_t gpa,
+ unsigned int bytes)
+{
+ gfn_t gfn, start_gfn, end_gfn;
+ struct kvm *kvm = vcpu->kvm;
+ struct kvm_memory_slot *slot;
+ u32 access;
+
+ if (!kvm->arch.spp_active)
+ return false;
+
+ start_gfn = gpa >> PAGE_SHIFT;
+ end_gfn = (gpa + bytes) >> PAGE_SHIFT;
+ for (gfn = start_gfn; gfn <= end_gfn; gfn++) {
+ slot = gfn_to_memslot(kvm, gfn);
+ if (slot) {
+ access = *gfn_to_subpage_wp_info(slot, gfn);
+ if (access != FULL_SPP_ACCESS) {
+ vcpu->run->exit_reason = KVM_EXIT_SPP;
+ vcpu->run->spp.addr = gfn;
+ vcpu->run->spp.ins_len =
+ kvm_x86_ops->get_inst_len(vcpu);
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
static int emulator_read_write_onepage(unsigned long addr, void *val,
unsigned int bytes,
struct x86_exception *exception,
@@ -5599,6 +5630,9 @@ static int emulator_read_write_onepage(unsigned long addr, void *val,
return X86EMUL_PROPAGATE_FAULT;
}
+ if (write && is_emulator_spp_protected(vcpu, gpa, bytes))
+ return X86EMUL_UNHANDLEABLE;
+
if (!ret && ops->read_write_emulate(vcpu, gpa, val, bytes))
return X86EMUL_CONTINUE;
@@ -6660,6 +6694,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
return EMULATE_DONE;
if (r == EMULATION_FAILED) {
+ if (vcpu->run->exit_reason == KVM_EXIT_SPP)
+ return 0;
+
if (reexecute_instruction(vcpu, cr2, write_fault_to_spt,
emulation_type))
return EMULATE_DONE;
--
2.17.2
next prev parent reply other threads:[~2019-11-29 17:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 17:26 [PATCH v8 00/10] Enable Sub-Page Write Protection Support Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 01/10] Documentation: Introduce EPT based Subpage Protection and related APIs Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 02/10] vmx: spp: Add control flags for Sub-Page Protection(SPP) Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 03/10] mmu: spp: Add SPP Table setup functions Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 04/10] mmu: spp: Add functions to operate SPP access bitmap Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 05/10] x86: spp: Introduce user-space SPP IOCTLs Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 06/10] vmx: spp: Set up SPP paging table at vmentry/vmexit Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 07/10] mmu: spp: Enable Lazy mode SPP protection Yang Weijiang
2019-11-29 17:27 ` [PATCH v8 08/10] mmu: spp: Handle SPP protected pages when VM memory changes Yang Weijiang
2019-11-29 17:27 ` Yang Weijiang [this message]
2019-11-29 17:27 ` [PATCH v8 10/10] kvm: selftests: selftest for Sub-Page protection Yang Weijiang
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=20191129172709.11347-10-weijiang.yang@intel.com \
--to=weijiang.yang@intel.com \
--cc=alazar@bitdefender.com \
--cc=edwin.zhai@intel.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=yu.c.zhang@linux.intel.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;
as well as URLs for NNTP newsgroup(s).