diff options
Diffstat (limited to 'drivers/kvm/kvm.h')
-rw-r--r-- | drivers/kvm/kvm.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index 3ac9cbce3369..336be86c6f5a 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h | |||
@@ -619,7 +619,7 @@ unsigned long segment_base(u16 selector); | |||
619 | void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, | 619 | void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, |
620 | const u8 *old, const u8 *new, int bytes); | 620 | const u8 *old, const u8 *new, int bytes); |
621 | int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva); | 621 | int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva); |
622 | void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu); | 622 | void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu); |
623 | int kvm_mmu_load(struct kvm_vcpu *vcpu); | 623 | int kvm_mmu_load(struct kvm_vcpu *vcpu); |
624 | void kvm_mmu_unload(struct kvm_vcpu *vcpu); | 624 | void kvm_mmu_unload(struct kvm_vcpu *vcpu); |
625 | 625 | ||
@@ -628,11 +628,15 @@ int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run); | |||
628 | static inline int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, | 628 | static inline int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, |
629 | u32 error_code) | 629 | u32 error_code) |
630 | { | 630 | { |
631 | if (unlikely(vcpu->kvm->n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES)) | ||
632 | kvm_mmu_free_some_pages(vcpu); | ||
633 | return vcpu->mmu.page_fault(vcpu, gva, error_code); | 631 | return vcpu->mmu.page_fault(vcpu, gva, error_code); |
634 | } | 632 | } |
635 | 633 | ||
634 | static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu) | ||
635 | { | ||
636 | if (unlikely(vcpu->kvm->n_free_mmu_pages < KVM_MIN_FREE_MMU_PAGES)) | ||
637 | __kvm_mmu_free_some_pages(vcpu); | ||
638 | } | ||
639 | |||
636 | static inline int kvm_mmu_reload(struct kvm_vcpu *vcpu) | 640 | static inline int kvm_mmu_reload(struct kvm_vcpu *vcpu) |
637 | { | 641 | { |
638 | if (likely(vcpu->mmu.root_hpa != INVALID_PAGE)) | 642 | if (likely(vcpu->mmu.root_hpa != INVALID_PAGE)) |