On Thu, Jun 30, 2011 at 04:20:58PM +0800, Xiao Guangrong wrote:
> If the page fault is caused by mmio, we can cache the mmio info, later, we do
> not need to walk guest page table and quickly know it is a mmio fault while we
> emulate the mmio instruction
>
> Signed-off-by: Xiao Guangrong <xiaoguangr...@cn.fujitsu.com>
> ---
> arch/x86/include/asm/kvm_host.h | 5 +++++
> arch/x86/kvm/mmu.c | 21 +++++++--------------
> arch/x86/kvm/mmu.h | 23 +++++++++++++++++++++++
> arch/x86/kvm/paging_tmpl.h | 21 ++++++++++++++-------
> arch/x86/kvm/x86.c | 11 +++++++++++
> arch/x86/kvm/x86.h | 36 ++++++++++++++++++++++++++++++++++++
> 6 files changed, 96 insertions(+), 21 deletions(-)
>
> index 7086ca8..05310b1 100644
> --- a/arch/x86/kvm/mmu.h
> +++ b/arch/x86/kvm/mmu.h
> @@ -76,4 +76,27 @@ static inline int is_present_gpte(unsigned long pte)
> return pte & PT_PRESENT_MASK;
> }
>
> +static inline int is_writable_pte(unsigned long pte)
> +{
> + return pte & PT_WRITABLE_MASK;
> +}
> +
> +static inline bool is_write_protection(struct kvm_vcpu *vcpu)
> +{
> + return kvm_read_cr0_bits(vcpu, X86_CR0_WP);
> +}
> +
> +static inline bool check_write_user_access(struct kvm_vcpu *vcpu,
> + bool write_fault, bool user_fault,
> + unsigned long pte)
> +{
> + if (unlikely(write_fault && !is_writable_pte(pte)
> + && (user_fault || is_write_protection(vcpu))))
> + return false;
> +
> + if (unlikely(user_fault && !(pte & PT_USER_MASK)))
> + return false;
> +
> + return true;
> +}
> #endif
> diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
> index 1caeb4d..13978dc 100644
> --- a/arch/x86/kvm/paging_tmpl.h
> +++ b/arch/x86/kvm/paging_tmpl.h
> @@ -201,11 +201,8 @@ walk:
> break;
> }
>
> - if (unlikely(write_fault && !is_writable_pte(pte)
> - && (user_fault || is_write_protection(vcpu))))
> - eperm = true;
> -
> - if (unlikely(user_fault && !(pte & PT_USER_MASK)))
> + if (!check_write_user_access(vcpu, write_fault, user_fault,
> + pte))
> eperm = true;
>
> #if PTTYPE == 64
> @@ -631,8 +628,16 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu,
> gva_t addr, u32 error_code,
> return 0;
>
> /* mmio */
> - if (is_error_pfn(pfn))
> - return kvm_handle_bad_page(vcpu->kvm, walker.gfn, pfn);
> + if (is_error_pfn(pfn)) {
> + unsigned access = walker.pte_access;
> + bool dirty = is_dirty_gpte(walker.ptes[walker.level - 1]);
> +
> + if (dirty)
> + access &= ~ACC_WRITE_MASK;
> +
> + return kvm_handle_bad_page(vcpu, mmu_is_nested(vcpu) ? 0 :
> + addr, access, walker.gfn, pfn);
> + }
Don't get this... if guest pte is dirty you cache without allowing
write access? Why?
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
