From: Joerg Roedel <joerg.roedel@amd.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 08/29] KVM: MMU: Let is_rsvd_bits_set take mmu context instead of vcpu
Date: Fri, 10 Sep 2010 17:30:45 +0200 [thread overview]
Message-ID: <1284132667-18620-9-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1284132667-18620-1-git-send-email-joerg.roedel@amd.com>
This patch changes is_rsvd_bits_set() function prototype to
take only a kvm_mmu context instead of a full vcpu.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kvm/mmu.c | 6 +++---
arch/x86/kvm/paging_tmpl.h | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 9e48a77..86f7557 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2578,12 +2578,12 @@ static void paging_free(struct kvm_vcpu *vcpu)
nonpaging_free(vcpu);
}
-static bool is_rsvd_bits_set(struct kvm_vcpu *vcpu, u64 gpte, int level)
+static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level)
{
int bit7;
bit7 = (gpte >> 7) & 1;
- return (gpte & vcpu->arch.mmu.rsvd_bits_mask[bit7][level-1]) != 0;
+ return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) != 0;
}
#define PTTYPE 64
@@ -2859,7 +2859,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
return;
}
- if (is_rsvd_bits_set(vcpu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))
+ if (is_rsvd_bits_set(&vcpu->arch.mmu, *(u64 *)new, PT_PAGE_TABLE_LEVEL))
return;
++vcpu->kvm->stat.mmu_pte_updated;
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 13d0c06..68ee1b7 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -168,7 +168,7 @@ walk:
break;
}
- if (is_rsvd_bits_set(vcpu, pte, walker->level)) {
+ if (is_rsvd_bits_set(&vcpu->arch.mmu, pte, walker->level)) {
rsvd_fault = true;
break;
}
@@ -327,6 +327,7 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
u64 *sptep)
{
struct kvm_mmu_page *sp;
+ struct kvm_mmu *mmu = &vcpu->arch.mmu;
pt_element_t *gptep = gw->prefetch_ptes;
u64 *spte;
int i;
@@ -358,7 +359,7 @@ 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(vcpu, gpte, PT_PAGE_TABLE_LEVEL)) {
+ is_rsvd_bits_set(mmu, gpte, PT_PAGE_TABLE_LEVEL)) {
if (!sp->unsync)
__set_spte(spte, shadow_notrap_nonpresent_pte);
continue;
@@ -713,7 +714,7 @@ 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, gpte, PT_PAGE_TABLE_LEVEL)
+ 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)) {
u64 nonpresent;
--
1.7.0.4
next prev parent reply other threads:[~2010-09-10 15:33 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-10 15:30 [PATCH 0/29] Nested Paging Virtualization for KVM v4 Joerg Roedel
2010-09-10 15:30 ` [PATCH 01/29] KVM: MMU: Check for root_level instead of long mode Joerg Roedel
2010-09-10 15:30 ` [PATCH 02/29] KVM: MMU: Make tdp_enabled a mmu-context parameter Joerg Roedel
2010-09-10 15:30 ` [PATCH 03/29] KVM: MMU: Make set_cr3 a function pointer in kvm_mmu Joerg Roedel
2010-09-10 15:30 ` [PATCH 04/29] KVM: X86: Introduce a tdp_set_cr3 function Joerg Roedel
2010-09-10 15:30 ` [PATCH 05/29] KVM: MMU: Introduce get_cr3 function pointer Joerg Roedel
2010-09-10 15:30 ` [PATCH 06/29] KVM: MMU: Introduce inject_page_fault " Joerg Roedel
2010-09-10 15:30 ` [PATCH 07/29] KVM: MMU: Introduce kvm_init_shadow_mmu helper function Joerg Roedel
2010-09-10 15:30 ` Joerg Roedel [this message]
2010-09-10 15:30 ` [PATCH 09/29] KVM: MMU: Track page fault data in struct vcpu Joerg Roedel
2010-09-10 15:30 ` [PATCH 10/29] KVM: MMU: Introduce generic walk_addr function Joerg Roedel
2010-09-10 15:30 ` [PATCH 11/29] KVM: MMU: Add infrastructure for two-level page walker Joerg Roedel
2010-09-10 15:30 ` [PATCH 12/29] KVM: X86: Introduce pointer to mmu context used for gva_to_gpa Joerg Roedel
2010-09-10 15:30 ` [PATCH 13/29] KVM: MMU: Implement nested gva_to_gpa functions Joerg Roedel
2010-09-10 15:30 ` [PATCH 14/29] KVM: X86: Add kvm_read_guest_page_mmu function Joerg Roedel
2010-09-10 15:30 ` [PATCH 15/29] KVM: MMU: Make walk_addr_generic capable for two-level walking Joerg Roedel
2010-09-10 15:30 ` [PATCH 16/29] KVM: MMU: Introduce kvm_read_nested_guest_page() Joerg Roedel
2010-09-10 15:30 ` [PATCH 17/29] KVM: MMU: Introduce init_kvm_nested_mmu() Joerg Roedel
2010-09-10 15:30 ` [PATCH 18/29] KVM: MMU: Propagate the right fault back to the guest after gva_to_gpa Joerg Roedel
2010-09-12 8:50 ` Avi Kivity
2010-09-10 15:30 ` [PATCH 19/29] KVM: X86: Propagate fetch faults Joerg Roedel
2010-09-10 15:30 ` [PATCH 20/29] KVM: MMU: Add kvm_mmu parameter to load_pdptrs function Joerg Roedel
2010-09-10 15:30 ` [PATCH 21/29] KVM: MMU: Introduce kvm_pdptr_read_mmu Joerg Roedel
2010-09-10 15:30 ` [PATCH 22/29] KVM: MMU: Refactor mmu_alloc_roots function Joerg Roedel
2010-09-10 15:31 ` [PATCH 23/29] KVM: MMU: Allow long mode shadows for legacy page tables Joerg Roedel
2010-09-10 15:31 ` [PATCH 24/29] KVM: MMU: Track NX state in struct kvm_mmu Joerg Roedel
2010-09-12 8:06 ` Avi Kivity
2010-09-10 15:31 ` [PATCH 25/29] KVM: SVM: Implement MMU helper functions for Nested Nested Paging Joerg Roedel
2010-09-10 15:31 ` [PATCH 26/29] KVM: SVM: Initialize Nested Nested MMU context on VMRUN Joerg Roedel
2010-09-10 15:31 ` [PATCH 27/29] KVM: SVM: Expect two more candiates for exit_int_info Joerg Roedel
2010-09-10 15:31 ` [PATCH 28/29] KVM: SVM: Report Nested Paging support to userspace Joerg Roedel
2010-09-10 15:31 ` [PATCH 29/29] KVM: X86: Report SVM bit to userspace only when supported Joerg Roedel
2010-09-12 8:56 ` [PATCH 0/29] Nested Paging Virtualization for KVM v4 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=1284132667-18620-9-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.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
all inboxes | Powered by JetHome®