Commit f8cfbce1 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm/arm64: vgic-v2: Do not save an LR known to be empty 



On exit, any empty LR will be signaled in GICH_ELRSR*. Which
means that we do not have to save it, and we can just clear
its state in the in-memory copy.

Take this opportunity to move the LR saving code into its
own function.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 2a1044f8

virt/kvm/arm/hyp/vgic-v2-sr.c

+20 −6
Original line number Original line Diff line number Diff line
@@ -83,6 +83,25 @@ static void __hyp_text save_elrsr(struct kvm_vcpu *vcpu, void __iomem *base) 
#endif

#endif

}

}





static void __hyp_text save_lrs(struct kvm_vcpu *vcpu, void __iomem *base)

{

	struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;

	int nr_lr = vcpu->arch.vgic_cpu.nr_lr;

	int i;



	for (i = 0; i < nr_lr; i++) {

		if (!(vcpu->arch.vgic_cpu.live_lrs & (1UL << i)))

			continue;



		if (cpu_if->vgic_elrsr & (1UL << i)) {

			cpu_if->vgic_lr[i] &= ~GICH_LR_STATE;

			continue;

		}



		cpu_if->vgic_lr[i] = readl_relaxed(base + GICH_LR0 + (i * 4));

	}

}



/* vcpu is already in the HYP VA space */

/* vcpu is already in the HYP VA space */

void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu)

void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu)

{

{
@@ -90,12 +109,10 @@ void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu) 
	struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;

	struct vgic_v2_cpu_if *cpu_if = &vcpu->arch.vgic_cpu.vgic_v2;

	struct vgic_dist *vgic = &kvm->arch.vgic;

	struct vgic_dist *vgic = &kvm->arch.vgic;

	void __iomem *base = kern_hyp_va(vgic->vctrl_base);

	void __iomem *base = kern_hyp_va(vgic->vctrl_base);

	int i, nr_lr;





	if (!base)

	if (!base)

		return;

		return;





	nr_lr = vcpu->arch.vgic_cpu.nr_lr;

	cpu_if->vgic_vmcr = readl_relaxed(base + GICH_VMCR);

	cpu_if->vgic_vmcr = readl_relaxed(base + GICH_VMCR);





	if (vcpu->arch.vgic_cpu.live_lrs) {

	if (vcpu->arch.vgic_cpu.live_lrs) {
@@ -103,10 +120,7 @@ void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu) 




		save_maint_int_state(vcpu, base);

		save_maint_int_state(vcpu, base);

		save_elrsr(vcpu, base);

		save_elrsr(vcpu, base);

 

		save_lrs(vcpu, base);

		for (i = 0; i < nr_lr; i++)

			if (vcpu->arch.vgic_cpu.live_lrs & (1UL << i))

				cpu_if->vgic_lr[i] = readl_relaxed(base + GICH_LR0 + (i * 4));





		writel_relaxed(0, base + GICH_HCR);

		writel_relaxed(0, base + GICH_HCR);

CRA Git | Maintained and supported by SUSTech CRA and CCSE