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 v7 9/9] x86: spp: Add SPP protection check in emulation.
Date: Tue, 19 Nov 2019 16:49:49 +0800 [thread overview]
Message-ID: <20191119084949.15471-10-weijiang.yang@intel.com> (raw)
In-Reply-To: <20191119084949.15471-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 | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fa114b5db672..71f5a8ae76cf 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5525,6 +5525,36 @@ 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;
+ kvm_skip_emulated_instruction(vcpu);
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
static int emulator_read_write_onepage(unsigned long addr, void *val,
unsigned int bytes,
struct x86_exception *exception,
@@ -5555,6 +5585,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;
@@ -6616,6 +6649,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 EMULATE_USER_EXIT;
+
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-19 8:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 8:49 [PATCH v7 0/9] Enable Sub-Page Write Protection Support Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 1/9] Documentation: Introduce EPT based Subpage Protection and related ioctls Yang Weijiang
2019-11-21 10:02 ` Paolo Bonzini
2019-11-22 16:17 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 2/9] vmx: spp: Add control flags for Sub-Page Protection(SPP) Yang Weijiang
2019-11-21 10:04 ` Paolo Bonzini
2019-11-21 15:34 ` Yang Weijiang
2019-11-21 16:02 ` Paolo Bonzini
2019-11-22 15:23 ` Yang Weijiang
2019-11-22 15:55 ` Paolo Bonzini
2019-11-22 16:24 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 3/9] mmu: spp: Add SPP Table setup functions Yang Weijiang
2019-11-21 10:32 ` Paolo Bonzini
2019-11-21 14:57 ` Yang Weijiang
2019-11-21 10:38 ` Paolo Bonzini
2019-11-21 14:55 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 4/9] mmu: spp: Add functions to create/destroy SPP bitmap block Yang Weijiang
2019-11-21 10:43 ` Paolo Bonzini
2019-11-21 14:45 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 5/9] x86: spp: Introduce user-space SPP IOCTLs Yang Weijiang
2019-11-21 10:03 ` Paolo Bonzini
2019-11-22 16:20 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 6/9] vmx: spp: Set up SPP paging table at vmentry/vmexit Yang Weijiang
2019-11-21 10:18 ` Paolo Bonzini
2019-11-21 15:22 ` Yang Weijiang
2019-11-21 16:08 ` Paolo Bonzini
2019-11-22 15:25 ` Yang Weijiang
2019-11-21 10:32 ` Paolo Bonzini
2019-11-21 15:04 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 7/9] mmu: spp: Enable Lazy mode SPP protection Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 8/9] mmu: spp: Handle SPP protected pages when VM memory changes Yang Weijiang
2019-11-21 10:32 ` Paolo Bonzini
2019-11-21 15:01 ` Yang Weijiang
2019-11-19 8:49 ` Yang Weijiang [this message]
2019-11-21 10:43 ` [PATCH v7 0/9] Enable Sub-Page Write Protection Support Paolo Bonzini
2019-11-21 14:36 ` 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=20191119084949.15471-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).