Commit 6e2ca7d1 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity

KVM: MMU: Optimize guest page table walk

This patch optimizes the guest page table walk by using get_user()
instead of copy_from_user().

With this patch applied, paging64_walk_addr_generic() has become
about 0.5us to 1.0us faster on my Phenom II machine with NPT on.
Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 40e19b51
...@@ -123,6 +123,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, ...@@ -123,6 +123,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
gva_t addr, u32 access) gva_t addr, u32 access)
{ {
pt_element_t pte; pt_element_t pte;
pt_element_t __user *ptep_user;
gfn_t table_gfn; gfn_t table_gfn;
unsigned index, pt_access, uninitialized_var(pte_access); unsigned index, pt_access, uninitialized_var(pte_access);
gpa_t pte_gpa; gpa_t pte_gpa;
...@@ -158,6 +159,9 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, ...@@ -158,6 +159,9 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
pt_access = ACC_ALL; pt_access = ACC_ALL;
for (;;) { for (;;) {
gfn_t real_gfn;
unsigned long host_addr;
index = PT_INDEX(addr, walker->level); index = PT_INDEX(addr, walker->level);
table_gfn = gpte_to_gfn(pte); table_gfn = gpte_to_gfn(pte);
...@@ -166,9 +170,22 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, ...@@ -166,9 +170,22 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
walker->table_gfn[walker->level - 1] = table_gfn; walker->table_gfn[walker->level - 1] = table_gfn;
walker->pte_gpa[walker->level - 1] = pte_gpa; walker->pte_gpa[walker->level - 1] = pte_gpa;
if (kvm_read_guest_page_mmu(vcpu, mmu, table_gfn, &pte, real_gfn = mmu->translate_gpa(vcpu, gfn_to_gpa(table_gfn),
offset, sizeof(pte), PFERR_USER_MASK|PFERR_WRITE_MASK);
PFERR_USER_MASK|PFERR_WRITE_MASK)) { if (real_gfn == UNMAPPED_GVA) {
present = false;
break;
}
real_gfn = gpa_to_gfn(real_gfn);
host_addr = gfn_to_hva(vcpu->kvm, real_gfn);
if (kvm_is_error_hva(host_addr)) {
present = false;
break;
}
ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
if (get_user(pte, ptep_user)) {
present = false; present = false;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment