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 8/9] mmu: spp: Handle SPP protected pages when VM memory changes
Date: Tue, 19 Nov 2019 16:49:48 +0800 [thread overview]
Message-ID: <20191119084949.15471-9-weijiang.yang@intel.com> (raw)
In-Reply-To: <20191119084949.15471-1-weijiang.yang@intel.com>
Host page swapping/migration may change the translation in
EPT leaf entry, if the target page is SPP protected,
re-enable SPP protection in MMU notifier. If SPPT shadow
page is reclaimed, the level1 pages don't have rmap to clear.
Signed-off-by: Yang Weijiang <weijiang.yang@intel.com>
---
arch/x86/kvm/mmu.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 9c5be402a0b2..7e9959a4a12b 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1828,6 +1828,24 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
new_spte &= ~PT_WRITABLE_MASK;
new_spte &= ~SPTE_HOST_WRITEABLE;
+ /*
+ * if it's EPT leaf entry and the physical page is
+ * SPP protected, then re-enable SPP protection for
+ * the page.
+ */
+ if (kvm->arch.spp_active &&
+ level == PT_PAGE_TABLE_LEVEL) {
+ struct kvm_subpage spp_info = {0};
+ int i;
+
+ spp_info.base_gfn = gfn;
+ spp_info.npages = 1;
+ i = kvm_spp_get_permission(kvm, &spp_info);
+ if (i == 1 &&
+ spp_info.access_map[0] != FULL_SPP_ACCESS)
+ new_spte |= PT_SPP_MASK;
+ }
+
new_spte = mark_spte_for_access_track(new_spte);
mmu_spte_clear_track_bits(sptep);
@@ -2677,6 +2695,10 @@ static bool mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp,
pte = *spte;
if (is_shadow_present_pte(pte)) {
if (is_last_spte(pte, sp->role.level)) {
+ /* SPPT leaf entries don't have rmaps*/
+ if (sp->role.level == PT_PAGE_TABLE_LEVEL &&
+ is_spp_spte(sp))
+ return true;
drop_spte(kvm, spte);
if (is_large_pte(pte))
--kvm->stat.lpages;
--
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 ` Yang Weijiang [this message]
2019-11-21 10:32 ` [PATCH v7 8/9] mmu: spp: Handle SPP protected pages when VM memory changes Paolo Bonzini
2019-11-21 15:01 ` Yang Weijiang
2019-11-19 8:49 ` [PATCH v7 9/9] x86: spp: Add SPP protection check in emulation Yang Weijiang
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-9-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).