system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-28 07:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

KVM: MMU: cleanup FNAME(fetch)() functions

Browse source 
Cleanup this function that we are already get the direct sp's access

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Xiao Guangrong 2010-06-30 16:05:00 +08:00 committed by Avi Kivity
parent 9e7b0e7fba
commit 84754cd8fc
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/x86/kvm/paging_tmpl.h
View file

@ -306,12 +306,18 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
gfn_t table_gfn; gfn_t table_gfn;
int r; int r;
int level; int level;
bool dirty = is_dirty_gpte(gw->ptes[gw->level - 1]);
unsigned direct_access;
pt_element_t curr_pte; pt_element_t curr_pte;
struct kvm_shadow_walk_iterator iterator; struct kvm_shadow_walk_iterator iterator;
if (!is_present_gpte(gw->ptes[gw->level - 1])) if (!is_present_gpte(gw->ptes[gw->level - 1]))
return NULL; return NULL;
direct_access = gw->pt_access & gw->pte_access;
if (!dirty)
direct_access &= ~ACC_WRITE_MASK;
for_each_shadow_entry(vcpu, addr, iterator) { for_each_shadow_entry(vcpu, addr, iterator) {
level = iterator.level; level = iterator.level;
sptep = iterator.sptep; sptep = iterator.sptep;
@ -319,15 +325,13 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
mmu_set_spte(vcpu, sptep, access, mmu_set_spte(vcpu, sptep, access,
gw->pte_access & access, gw->pte_access & access,
user_fault, write_fault, user_fault, write_fault,
is_dirty_gpte(gw->ptes[gw->level-1]), dirty, ptwrite, level,
ptwrite, level,
gw->gfn, pfn, false, true); gw->gfn, pfn, false, true);
break; break;
} }
if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep)) { if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep)) {
struct kvm_mmu_page *child; struct kvm_mmu_page *child;
unsigned direct_access;
if (level != gw->level) if (level != gw->level)
continue; continue;
@ -339,10 +343,6 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
* so we should update the spte at this point to get * so we should update the spte at this point to get
* a new sp with the correct access. * a new sp with the correct access.
*/ */
direct_access = gw->pt_access & gw->pte_access;
if (!is_dirty_gpte(gw->ptes[gw->level - 1]))
direct_access &= ~ACC_WRITE_MASK;
child = page_header(*sptep & PT64_BASE_ADDR_MASK); child = page_header(*sptep & PT64_BASE_ADDR_MASK);
if (child->role.access == direct_access) if (child->role.access == direct_access)
continue; continue;
@ -359,11 +359,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
} }
if (level <= gw->level) { if (level <= gw->level) {
int delta = level - gw->level + 1;
direct = 1; direct = 1;
if (!is_dirty_gpte(gw->ptes[level - delta])) access = direct_access;
access &= ~ACC_WRITE_MASK;
access &= gw->pte_access;
/* /*
* It is a large guest pages backed by small host pages, * It is a large guest pages backed by small host pages,