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: [RESEND PATCH v10 08/10] mmu: spp: Handle SPP protected pages when VM memory changes Date: Thu, 2 Jan 2020 14:13:17 +0800 Message-ID: <20200102061319.10077-9-weijiang.yang@intel.com> (raw) In-Reply-To: <20200102061319.10077-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/mmu.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index aada0a3552b2..3fcc6ee71f15 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1913,6 +1913,19 @@ 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) { + u32 *access = gfn_to_subpage_wp_info(slot, gfn); + + if (access && *access != FULL_SPP_ACCESS) + new_spte |= PT_SPP_MASK; + } + new_spte = mark_spte_for_access_track(new_spte); mmu_spte_clear_track_bits(sptep); @@ -2763,6 +2776,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 index Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-02 6:13 [RESEND PATCH v10 00/10] Enable Sub-Page Write Protection Support Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 01/10] Documentation: Add EPT based Subpage Protection and related APIs Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 02/10] vmx: spp: Add control flags for Sub-Page Protection(SPP) Yang Weijiang 2020-01-10 16:58 ` Sean Christopherson 2020-01-13 5:44 ` Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 03/10] mmu: spp: Add SPP Table setup functions Yang Weijiang 2020-01-10 17:26 ` Sean Christopherson 2020-01-13 6:00 ` Yang Weijiang 2020-01-10 17:40 ` Sean Christopherson 2020-01-13 6:04 ` Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 04/10] mmu: spp: Add functions to operate SPP access bitmap Yang Weijiang 2020-01-10 17:38 ` Sean Christopherson 2020-01-13 6:15 ` Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 05/10] x86: spp: Introduce user-space SPP IOCTLs Yang Weijiang 2020-01-10 18:10 ` Sean Christopherson 2020-01-13 8:21 ` Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 06/10] vmx: spp: Set up SPP paging table at vmentry/vmexit Yang Weijiang 2020-01-10 17:55 ` Sean Christopherson 2020-01-13 6:50 ` Yang Weijiang 2020-01-21 14:01 ` Paolo Bonzini 2020-01-10 18:04 ` Sean Christopherson 2020-01-13 8:10 ` Yang Weijiang 2020-01-13 17:33 ` Sean Christopherson 2020-01-13 18:55 ` Adalbert Lazăr 2020-01-13 21:47 ` Sean Christopherson 2020-01-14 3:08 ` Yang Weijiang 2020-01-14 18:58 ` Sean Christopherson 2020-01-15 1:36 ` Yang Weijiang 2020-01-21 14:14 ` Paolo Bonzini 2020-01-02 6:13 ` [RESEND PATCH v10 07/10] mmu: spp: Enable Lazy mode SPP protection Yang Weijiang 2020-01-02 6:13 ` Yang Weijiang [this message] 2020-01-02 6:13 ` [RESEND PATCH v10 09/10] x86: spp: Add SPP protection check in emulation Yang Weijiang 2020-01-02 6:13 ` [RESEND PATCH v10 10/10] kvm: selftests: selftest for Sub-Page protection Yang Weijiang -- strict thread matches above, loose matches on Subject: below -- 2020-01-02 5:18 [RESEND PATCH v10 00/10] Enable Sub-Page Write Protection Support Yang Weijiang 2020-01-02 5:19 ` [RESEND PATCH v10 08/10] mmu: spp: Handle SPP protected pages when VM memory changes 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=20200102061319.10077-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
KVM Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \ kvm@vger.kernel.org public-inbox-index kvm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.kvm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git