From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH v2 3/6] KVM: MMU: don't mark spte notrap if reserved bit set
Date: Wed, 17 Nov 2010 12:11:41 +0800 [thread overview]
Message-ID: <4CE355FD.70804@cn.fujitsu.com> (raw)
In-Reply-To: <4CE355A0.6020907@cn.fujitsu.com>
If reserved bit is set, we need inject the #PF with PFEC.RSVD=1,
but shadow_notrap_nonpresent_pte injects #PF with PFEC.RSVD=0 only
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
arch/x86/kvm/paging_tmpl.h | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 58b4d9a..ca0e5e8 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -395,8 +395,10 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
gpte = gptep[i];
- if (!is_present_gpte(gpte) ||
- is_rsvd_bits_set(mmu, gpte, PT_PAGE_TABLE_LEVEL)) {
+ if (is_rsvd_bits_set(mmu, gpte, PT_PAGE_TABLE_LEVEL))
+ continue;
+
+ if (!is_present_gpte(gpte)) {
if (!sp->unsync)
__set_spte(spte, shadow_notrap_nonpresent_pte);
continue;
@@ -760,6 +762,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
pt_element_t gpte;
gpa_t pte_gpa;
gfn_t gfn;
+ bool rsvd_bits_set;
if (!is_shadow_present_pte(sp->spt[i]))
continue;
@@ -771,12 +774,14 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
return -EINVAL;
gfn = gpte_to_gfn(gpte);
- if (is_rsvd_bits_set(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL)
- || gfn != sp->gfns[i] || !is_present_gpte(gpte)
- || !(gpte & PT_ACCESSED_MASK)) {
+ rsvd_bits_set = is_rsvd_bits_set(&vcpu->arch.mmu, gpte,
+ PT_PAGE_TABLE_LEVEL);
+ if (rsvd_bits_set || gfn != sp->gfns[i] ||
+ !is_present_gpte(gpte) || !(gpte & PT_ACCESSED_MASK)) {
u64 nonpresent;
- if (is_present_gpte(gpte) || !clear_unsync)
+ if (rsvd_bits_set || is_present_gpte(gpte) ||
+ !clear_unsync)
nonpresent = shadow_trap_nonpresent_pte;
else
nonpresent = shadow_notrap_nonpresent_pte;
--
1.7.0.4
next prev parent reply other threads:[~2010-11-17 4:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-17 4:10 [PATCH v2 1/6] KVM: MMU: fix forgot flush vcpu tlbs Xiao Guangrong
2010-11-17 4:10 ` [PATCH v2 2/6] KVM: MMU: don't drop spte if overwrite it from W to RO Xiao Guangrong
2010-11-17 15:42 ` Marcelo Tosatti
2010-11-17 15:57 ` Avi Kivity
2010-11-18 7:12 ` Xiao Guangrong
2010-11-18 15:32 ` Marcelo Tosatti
2010-11-18 16:41 ` Avi Kivity
2010-11-17 4:11 ` Xiao Guangrong [this message]
2010-11-17 15:56 ` [PATCH v2 3/6] KVM: MMU: don't mark spte notrap if reserved bit set Marcelo Tosatti
2010-11-17 4:12 ` [PATCH v2 4/6] KVM: MMU: rename 'reset_host_protection' to 'host_writable' Xiao Guangrong
2010-11-17 15:58 ` Marcelo Tosatti
2010-11-17 4:13 ` [PATCH v2 5/6] KVM: MMU: remove 'clear_unsync' parameter Xiao Guangrong
2010-11-17 16:49 ` Marcelo Tosatti
2010-11-18 7:42 ` Xiao Guangrong
2010-11-18 15:43 ` Marcelo Tosatti
2010-11-17 4:13 ` [PATCH v2 6/6] KVM: MMU: cleanup update_pte, pte_prefetch and sync_page functions Xiao Guangrong
2010-11-17 16:55 ` Marcelo Tosatti
2010-11-17 15:29 ` [PATCH v2 1/6] KVM: MMU: fix forgot flush vcpu tlbs Marcelo Tosatti
2010-11-17 16:26 ` Avi Kivity
2010-11-17 17:36 ` Marcelo Tosatti
2010-11-18 7:17 ` Xiao Guangrong
2010-11-18 9:32 ` Avi Kivity
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=4CE355FD.70804@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.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).