diff options
author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2011-12-16 05:18:10 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-03-05 07:52:18 -0500 |
commit | a138fe7535c0ec778465c7b54b1aaaf4cfd885b7 (patch) | |
tree | 08c8f5bf5edf847d5127a00a6041b0629cc24045 | |
parent | 6addd1aa2ca28c054820ef2966ad372f118c3f31 (diff) |
KVM: MMU: remove the redundant get_written_sptes
get_written_sptes is called twice in kvm_mmu_pte_write, one of them can be
removed
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r-- | arch/x86/kvm/mmu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 9270e0d93c31..34da43086952 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -3551,7 +3551,7 @@ static u64 mmu_pte_write_fetch_gpte(struct kvm_vcpu *vcpu, gpa_t *gpa, | |||
3551 | * If we're seeing too many writes to a page, it may no longer be a page table, | 3551 | * If we're seeing too many writes to a page, it may no longer be a page table, |
3552 | * or we may be forking, in which case it is better to unmap the page. | 3552 | * or we may be forking, in which case it is better to unmap the page. |
3553 | */ | 3553 | */ |
3554 | static bool detect_write_flooding(struct kvm_mmu_page *sp, u64 *spte) | 3554 | static bool detect_write_flooding(struct kvm_mmu_page *sp) |
3555 | { | 3555 | { |
3556 | /* | 3556 | /* |
3557 | * Skip write-flooding detected for the sp whose level is 1, because | 3557 | * Skip write-flooding detected for the sp whose level is 1, because |
@@ -3660,10 +3660,8 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, | |||
3660 | 3660 | ||
3661 | mask.cr0_wp = mask.cr4_pae = mask.nxe = 1; | 3661 | mask.cr0_wp = mask.cr4_pae = mask.nxe = 1; |
3662 | for_each_gfn_indirect_valid_sp(vcpu->kvm, sp, gfn, node) { | 3662 | for_each_gfn_indirect_valid_sp(vcpu->kvm, sp, gfn, node) { |
3663 | spte = get_written_sptes(sp, gpa, &npte); | ||
3664 | |||
3665 | if (detect_write_misaligned(sp, gpa, bytes) || | 3663 | if (detect_write_misaligned(sp, gpa, bytes) || |
3666 | detect_write_flooding(sp, spte)) { | 3664 | detect_write_flooding(sp)) { |
3667 | zap_page |= !!kvm_mmu_prepare_zap_page(vcpu->kvm, sp, | 3665 | zap_page |= !!kvm_mmu_prepare_zap_page(vcpu->kvm, sp, |
3668 | &invalid_list); | 3666 | &invalid_list); |
3669 | ++vcpu->kvm->stat.mmu_flooded; | 3667 | ++vcpu->kvm->stat.mmu_flooded; |