hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: arm64: Opportunistically turn off WFI trapping when using direct LPI injection 

Just like we do for WFE trapping, it can be useful to turn off
WFI trapping when the physical CPU is not oversubscribed (that
is, the vcpu is the only runnable process on this CPU) *and*
that we're using direct injection of interrupts.

The conditions are reevaluated on each vcpu_load(), ensuring that
we don't switch to this mode on a busy system.

On a GICv4 system, this has the effect of reducing the generation
of doorbell interrupts to zero when the right conditions are
met, which is a huge improvement over the current situation
(where the doorbells are screaming if the CPU ever hits a
blocking WFI).

Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
Link: https://lore.kernel.org/r/20191107160412.30301-3-maz@kernel.org
This commit is contained in:
Marc Zyngier 2019-11-07 16:04:12 +00:00
parent 5bd90b0989
commit ef2e78ddad
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/kvm_emulate.h
View File

@ -95,12 +95,12 @@ static inline unsigned long *vcpu_hcr(const struct kvm_vcpu *vcpu)
return (unsigned long *)&vcpu->arch.hcr; return (unsigned long *)&vcpu->arch.hcr;
} }
static inline void vcpu_clear_wfe_traps(struct kvm_vcpu *vcpu) static inline void vcpu_clear_wfx_traps(struct kvm_vcpu *vcpu)
{ {
vcpu->arch.hcr &= ~HCR_TWE; vcpu->arch.hcr &= ~HCR_TWE;
} }
static inline void vcpu_set_wfe_traps(struct kvm_vcpu *vcpu) static inline void vcpu_set_wfx_traps(struct kvm_vcpu *vcpu)
{ {
vcpu->arch.hcr |= HCR_TWE; vcpu->arch.hcr |= HCR_TWE;
} }

9
arch/arm64/include/asm/kvm_emulate.h
View File

@ -87,14 +87,19 @@ static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu)
return (unsigned long *)&vcpu->arch.hcr_el2; return (unsigned long *)&vcpu->arch.hcr_el2;
} }
static inline void vcpu_clear_wfe_traps(struct kvm_vcpu *vcpu) static inline void vcpu_clear_wfx_traps(struct kvm_vcpu *vcpu)
{ {
vcpu->arch.hcr_el2 &= ~HCR_TWE; vcpu->arch.hcr_el2 &= ~HCR_TWE;
if (atomic_read(&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count))
vcpu->arch.hcr_el2 &= ~HCR_TWI;
else
vcpu->arch.hcr_el2 |= HCR_TWI;
} }
static inline void vcpu_set_wfe_traps(struct kvm_vcpu *vcpu) static inline void vcpu_set_wfx_traps(struct kvm_vcpu *vcpu)
{ {
vcpu->arch.hcr_el2 |= HCR_TWE; vcpu->arch.hcr_el2 |= HCR_TWE;
vcpu->arch.hcr_el2 |= HCR_TWI;
} }
static inline void vcpu_ptrauth_enable(struct kvm_vcpu *vcpu) static inline void vcpu_ptrauth_enable(struct kvm_vcpu *vcpu)

4
virt/kvm/arm/arm.c
View File

@ -386,9 +386,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
kvm_vcpu_pmu_restore_guest(vcpu); kvm_vcpu_pmu_restore_guest(vcpu);
if (single_task_running()) if (single_task_running())
vcpu_clear_wfe_traps(vcpu); vcpu_clear_wfx_traps(vcpu);
else else
vcpu_set_wfe_traps(vcpu); vcpu_set_wfx_traps(vcpu);
vcpu_ptrauth_setup_lazy(vcpu); vcpu_ptrauth_setup_lazy(vcpu);
} }