diff options
author | Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> | 2011-05-15 11:28:29 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-07-12 04:45:07 -0400 |
commit | bcdd9a93c57571652c887cb522176db741893581 (patch) | |
tree | a9d7521a43062db39644e0e4b45f6844de7ff63a /arch/x86/kvm/mmu.c | |
parent | 38e3b2b28c5f8fe7914172f4ba631ef4552824d6 (diff) |
KVM: MMU: cleanup for dropping parent pte
Introduce drop_parent_pte to remove the rmap of parent pte and
clear parent pte
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 71eddc4c981..15afa1e1eaf 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -1084,6 +1084,13 @@ static void mmu_page_remove_parent_pte(struct kvm_mmu_page *sp, | |||
1084 | pte_list_remove(parent_pte, &sp->parent_ptes); | 1084 | pte_list_remove(parent_pte, &sp->parent_ptes); |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | static void drop_parent_pte(struct kvm_mmu_page *sp, | ||
1088 | u64 *parent_pte) | ||
1089 | { | ||
1090 | mmu_page_remove_parent_pte(sp, parent_pte); | ||
1091 | __set_spte(parent_pte, shadow_trap_nonpresent_pte); | ||
1092 | } | ||
1093 | |||
1087 | static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu, | 1094 | static struct kvm_mmu_page *kvm_mmu_alloc_page(struct kvm_vcpu *vcpu, |
1088 | u64 *parent_pte, int direct) | 1095 | u64 *parent_pte, int direct) |
1089 | { | 1096 | { |
@@ -1560,8 +1567,7 @@ static void validate_direct_spte(struct kvm_vcpu *vcpu, u64 *sptep, | |||
1560 | if (child->role.access == direct_access) | 1567 | if (child->role.access == direct_access) |
1561 | return; | 1568 | return; |
1562 | 1569 | ||
1563 | mmu_page_remove_parent_pte(child, sptep); | 1570 | drop_parent_pte(child, sptep); |
1564 | __set_spte(sptep, shadow_trap_nonpresent_pte); | ||
1565 | kvm_flush_remote_tlbs(vcpu->kvm); | 1571 | kvm_flush_remote_tlbs(vcpu->kvm); |
1566 | } | 1572 | } |
1567 | } | 1573 | } |
@@ -1578,7 +1584,7 @@ static void mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp, | |||
1578 | drop_spte(kvm, spte, shadow_trap_nonpresent_pte); | 1584 | drop_spte(kvm, spte, shadow_trap_nonpresent_pte); |
1579 | else { | 1585 | else { |
1580 | child = page_header(pte & PT64_BASE_ADDR_MASK); | 1586 | child = page_header(pte & PT64_BASE_ADDR_MASK); |
1581 | mmu_page_remove_parent_pte(child, spte); | 1587 | drop_parent_pte(child, spte); |
1582 | } | 1588 | } |
1583 | } | 1589 | } |
1584 | __set_spte(spte, shadow_trap_nonpresent_pte); | 1590 | __set_spte(spte, shadow_trap_nonpresent_pte); |
@@ -1613,10 +1619,8 @@ static void kvm_mmu_unlink_parents(struct kvm *kvm, struct kvm_mmu_page *sp) | |||
1613 | { | 1619 | { |
1614 | u64 *parent_pte; | 1620 | u64 *parent_pte; |
1615 | 1621 | ||
1616 | while ((parent_pte = pte_list_next(&sp->parent_ptes, NULL))) { | 1622 | while ((parent_pte = pte_list_next(&sp->parent_ptes, NULL))) |
1617 | kvm_mmu_put_page(sp, parent_pte); | 1623 | drop_parent_pte(sp, parent_pte); |
1618 | __set_spte(parent_pte, shadow_trap_nonpresent_pte); | ||
1619 | } | ||
1620 | } | 1624 | } |
1621 | 1625 | ||
1622 | static int mmu_zap_unsync_children(struct kvm *kvm, | 1626 | static int mmu_zap_unsync_children(struct kvm *kvm, |
@@ -2046,8 +2050,7 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, | |||
2046 | u64 pte = *sptep; | 2050 | u64 pte = *sptep; |
2047 | 2051 | ||
2048 | child = page_header(pte & PT64_BASE_ADDR_MASK); | 2052 | child = page_header(pte & PT64_BASE_ADDR_MASK); |
2049 | mmu_page_remove_parent_pte(child, sptep); | 2053 | drop_parent_pte(child, sptep); |
2050 | __set_spte(sptep, shadow_trap_nonpresent_pte); | ||
2051 | kvm_flush_remote_tlbs(vcpu->kvm); | 2054 | kvm_flush_remote_tlbs(vcpu->kvm); |
2052 | } else if (pfn != spte_to_pfn(*sptep)) { | 2055 | } else if (pfn != spte_to_pfn(*sptep)) { |
2053 | pgprintk("hfn old %llx new %llx\n", | 2056 | pgprintk("hfn old %llx new %llx\n", |