KVM: x86/mmu: Avoid unnecessary page table allocation in kvm_tdp_mmu_map()
PATCH 1/1 KVM: x86/mmu: Avoid unnecessary page table allocation in kvm_tdp_mmu_map()
In kvm_tdp_mmu_map(), while iterating TDP MMU page table entries, it is possible SPTE has already been frozen by another thread but the frozen is not done yet, for instance, when another thread is still in middle of zapping large page. In this case, the !is_shadow_present_pte() check for old SPTE in tdp_mmu_for_each_pte() may hit true, and in this case allocating new page table is unnecessary since tdp_mmu_set_spte_atomic() later will return false and page table will need to be freed. Add is_removed_spte() check before allocating new page table to avoid this.
--- arch/x86/kvm/mmu/tdp_mmu.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kvm/mmu/tdp_mmu.c +8 -0
@@ -1009,6 +1009,14 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, }if (!is_shadow_present_pte (iter.old_spte)) { +/* +* If SPTE has been forzen by another thread, just +* give up and retry, avoiding unnecessary page table +* allocation and free. +*/ +if (is_removed_spte (iter.old_spte)) +break ; + sp =alloc_tdp_mmu_page (vcpu, iter.gfn, iter.level); child_pt = sp->spt;
Signature · 1 line
2.30.2
Quoted 11 lines · Kai Huang
In
kvm_tdp_mmu_map(), while iterating TDP MMU page table entries, it is possible SPTE has already been frozen by another thread but the frozen is not done yet, for instance, when another thread is still in middle of zapping large page. In this case, the !is_shadow_present_pte() check for old SPTE intdp_mmu_for_each_pte()may hit true, and in this case allocating new page table is unnecessary sincetdp_mmu_set_spte_atomic()later will return false and page table will need to be freed. Addis_removed_spte()check before allocating new page table to avoid this.Signed-off-by Kai Huang <[email protected]>
Nice catch!
Quoted 9 lines
--- arch/x86/kvm/mmu/tdp_mmu.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/x86/kvm/mmu/tdp_mmu.c +0
-0
arch/x86/kvm/mmu/tdp_mmu.c int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, · line 1013
Quoted 5 lines
arch/x86/kvm/mmu/tdp_mmu.c +2
-0@@ -1009,6 +1009,14 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, }if (!is_shadow_present_pte (iter.old_spte)) { +/* +* If SPTE has been forzen by another thread, just
frozen
Quoted 12 lines
arch/x86/kvm/mmu/tdp_mmu.c +6
-1+* give up and retry, avoiding unnecessary page table +* allocation and free. +*/ +if (is_removed_spte (iter.old_spte)) +break ; + sp =alloc_tdp_mmu_page (vcpu, iter.gfn, iter.level); child_pt = sp->spt; --2.30.2
Quoted 11 lines · Ben Gardon
Quoted 10 lines · Kai Huang
In
kvm_tdp_mmu_map(), while iterating TDP MMU page table entries, it is possible SPTE has already been frozen by another thread but the frozen is not done yet, for instance, when another thread is still in middle of zapping large page. In this case, the !is_shadow_present_pte() check for old SPTE intdp_mmu_for_each_pte()may hit true, and in this case allocating new page table is unnecessary sincetdp_mmu_set_spte_atomic()later will return false and page table will need to be freed. Addis_removed_spte()check before allocating new page table to avoid this.
Quoted 5 lines
Quoted 1 line
Signed-off-by Kai Huang <[email protected]>Nice catch!
Reviewed-by Ben Gardon <[email protected]>
Queued, thanks for the quick review.
Paolo