Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75174ba6 authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm/arm64: Handle VGICv2 save/restore from the main VGIC code 



We can program the GICv2 hypervisor control interface logic directly
from the core vgic code and can instead do the save/restore directly
from the flush/sync functions, which can lead to a number of future
optimizations.

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

arch/arm/kvm/hyp/switch.c

+0 −4
Original line number Diff line number Diff line
@@ -92,16 +92,12 @@ static void __hyp_text __vgic_save_state(struct kvm_vcpu *vcpu) 
{

	if (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif))

		__vgic_v3_save_state(vcpu);

	else

		__vgic_v2_save_state(vcpu);

}



static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu)

{

	if (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif))

		__vgic_v3_restore_state(vcpu);

	else

		__vgic_v2_restore_state(vcpu);

}



static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu)

arch/arm64/include/asm/kvm_hyp.h

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ typeof(orig) * __hyp_text fname(void) \ 
	return val;							\

}



void __vgic_v2_save_state(struct kvm_vcpu *vcpu);

void __vgic_v2_restore_state(struct kvm_vcpu *vcpu);

int __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu);



void __vgic_v3_save_state(struct kvm_vcpu *vcpu);

arch/arm64/kvm/hyp/switch.c

+0 −4
Original line number Diff line number Diff line
@@ -196,16 +196,12 @@ static void __hyp_text __vgic_save_state(struct kvm_vcpu *vcpu) 
{

	if (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif))

		__vgic_v3_save_state(vcpu);

	else

		__vgic_v2_save_state(vcpu);

}



static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu)

{

	if (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif))

		__vgic_v3_restore_state(vcpu);

	else

		__vgic_v2_restore_state(vcpu);

}



static bool __hyp_text __true_value(void)

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

+0 −65
Original line number Diff line number Diff line
@@ -23,71 +23,6 @@ 
#include <asm/kvm_hyp.h>

#include <asm/kvm_mmu.h>



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;

	u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;

	u64 elrsr;

	int i;



	elrsr = readl_relaxed(base + GICH_ELRSR0);

	if (unlikely(used_lrs > 32))

		elrsr |= ((u64)readl_relaxed(base + GICH_ELRSR1)) << 32;



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

		if (elrsr & (1UL << i))

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

		else

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



		writel_relaxed(0, base + GICH_LR0 + (i * 4));

	}

}



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

void __hyp_text __vgic_v2_save_state(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = kern_hyp_va(vcpu->kvm);

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

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

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

	u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;



	if (!base)

		return;



	if (used_lrs) {

		cpu_if->vgic_apr = readl_relaxed(base + GICH_APR);

		save_lrs(vcpu, base);

		writel_relaxed(0, base + GICH_HCR);

	} else {

		cpu_if->vgic_apr = 0;

	}

}



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

void __hyp_text __vgic_v2_restore_state(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = kern_hyp_va(vcpu->kvm);

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

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

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

	int i;

	u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;



	if (!base)

		return;



	if (used_lrs) {

		writel_relaxed(cpu_if->vgic_hcr, base + GICH_HCR);

		writel_relaxed(cpu_if->vgic_apr, base + GICH_APR);

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

			writel_relaxed(cpu_if->vgic_lr[i],

				       base + GICH_LR0 + (i * 4));

		}

	}

}



#ifdef CONFIG_ARM64

/*

 * __vgic_v2_perform_cpuif_access -- perform a GICV access on behalf of the

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

+63 −0
Original line number Diff line number Diff line
@@ -421,6 +421,69 @@ int vgic_v2_probe(const struct gic_kvm_info *info) 
	return ret;

}



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

{

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

	u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;

	u64 elrsr;

	int i;



	elrsr = readl_relaxed(base + GICH_ELRSR0);

	if (unlikely(used_lrs > 32))

		elrsr |= ((u64)readl_relaxed(base + GICH_ELRSR1)) << 32;



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

		if (elrsr & (1UL << i))

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

		else

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



		writel_relaxed(0, base + GICH_LR0 + (i * 4));

	}

}



void vgic_v2_save_state(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;

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

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

	void __iomem *base = vgic->vctrl_base;

	u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;



	if (!base)

		return;



	if (used_lrs) {

		cpu_if->vgic_apr = readl_relaxed(base + GICH_APR);

		save_lrs(vcpu, base);

		writel_relaxed(0, base + GICH_HCR);

	} else {

		cpu_if->vgic_apr = 0;

	}

}



void vgic_v2_restore_state(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;

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

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

	void __iomem *base = vgic->vctrl_base;

	u64 used_lrs = vcpu->arch.vgic_cpu.used_lrs;

	int i;



	if (!base)

		return;



	if (used_lrs) {

		writel_relaxed(cpu_if->vgic_hcr, base + GICH_HCR);

		writel_relaxed(cpu_if->vgic_apr, base + GICH_APR);

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

			writel_relaxed(cpu_if->vgic_lr[i],

				       base + GICH_LR0 + (i * 4));

		}

	}

}



void vgic_v2_load(struct kvm_vcpu *vcpu)

{

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