Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 15096ffceabb9693306982127348890886384aaa

Authored by Xiao Guangrong
Committed by Avi Kivity
1 parent e6d53e3b0d
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

KVM: handle more completed apfs if possible 

If it's no need to inject async #PF to PV guest we can handle
more completed apfs at one time, so we can retry guest #PF
as early as possible

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Showing 1 changed file with 16 additions and 16 deletions Side-by-side Diff

... ... @@ -124,24 +124,24 @@
124 124 {
125 125 struct kvm_async_pf *work;
126 126  
127   - if (list_empty_careful(&vcpu->async_pf.done) ||
128   - !kvm_arch_can_inject_async_page_present(vcpu))
129   - return;
  127 + while (!list_empty_careful(&vcpu->async_pf.done) &&
  128 + kvm_arch_can_inject_async_page_present(vcpu)) {
  129 + spin_lock(&vcpu->async_pf.lock);
  130 + work = list_first_entry(&vcpu->async_pf.done, typeof(*work),
  131 + link);
  132 + list_del(&work->link);
  133 + spin_unlock(&vcpu->async_pf.lock);
130 134  
131   - spin_lock(&vcpu->async_pf.lock);
132   - work = list_first_entry(&vcpu->async_pf.done, typeof(*work), link);
133   - list_del(&work->link);
134   - spin_unlock(&vcpu->async_pf.lock);
  135 + if (work->page)
  136 + kvm_arch_async_page_ready(vcpu, work);
  137 + kvm_arch_async_page_present(vcpu, work);
135 138  
136   - if (work->page)
137   - kvm_arch_async_page_ready(vcpu, work);
138   - kvm_arch_async_page_present(vcpu, work);
139   -
140   - list_del(&work->queue);
141   - vcpu->async_pf.queued--;
142   - if (work->page)
143   - put_page(work->page);
144   - kmem_cache_free(async_pf_cache, work);
  139 + list_del(&work->queue);
  140 + vcpu->async_pf.queued--;
  141 + if (work->page)
  142 + put_page(work->page);
  143 + kmem_cache_free(async_pf_cache, work);
  144 + }
145 145 }
146 146  
147 147 int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn,