Commit 5a7a8426 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Christoffer Dall
Browse files

arm64: KVM: Use static keys for selecting the GIC backend 



Currently GIC backend is selected via alternative framework and this
is fine. We are going to introduce vgic-v3 to 32-bit world and there
we don't have patching framework in hand, so we can either check
support for GICv3 every time we need to choose which backend to use or
try to optimise it by using static keys. The later looks quite
promising because we can share logic involved in selecting GIC backend
between architectures if both uses static keys.

This patch moves arm64 from alternative to static keys framework for
selecting GIC backend. For that we embed static key into vgic_global
and enable the key during vgic initialisation based on what has
already been exposed by the host GIC driver.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 5d947a14

arch/arm64/kvm/hyp/switch.c

+11 −10
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
 */



#include <linux/types.h>

#include <linux/jump_label.h>



#include <asm/kvm_asm.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_hyp.h>
@@ -136,17 +138,13 @@ static void __hyp_text __deactivate_vm(struct kvm_vcpu *vcpu) 
	write_sysreg(0, vttbr_el2);

}



static hyp_alternate_select(__vgic_call_save_state,

			    __vgic_v2_save_state, __vgic_v3_save_state,

			    ARM64_HAS_SYSREG_GIC_CPUIF);



static hyp_alternate_select(__vgic_call_restore_state,

			    __vgic_v2_restore_state, __vgic_v3_restore_state,

			    ARM64_HAS_SYSREG_GIC_CPUIF);



static void __hyp_text __vgic_save_state(struct kvm_vcpu *vcpu)

{

	__vgic_call_save_state()(vcpu);

	if (static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif))

		__vgic_v3_save_state(vcpu);

	else

		__vgic_v2_save_state(vcpu);



	write_sysreg(read_sysreg(hcr_el2) & ~HCR_INT_OVERRIDE, hcr_el2);

}
@@ -159,7 +157,10 @@ static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu) 
	val |= vcpu->arch.irq_lines;

	write_sysreg(val, hcr_el2);



	__vgic_call_restore_state()(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)

include/kvm/arm_vgic.h

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/types.h>

#include <kvm/iodev.h>

#include <linux/list.h>

#include <linux/jump_label.h>



#define VGIC_V3_MAX_CPUS	255

#define VGIC_V2_MAX_CPUS	8
@@ -67,6 +68,9 @@ struct vgic_global { 


	/* Only needed for the legacy KVM_CREATE_IRQCHIP */

	bool			can_emulate_gicv2;



	/* GIC system register CPU interface */

	struct static_key_false gicv3_cpuif;

};



extern struct vgic_global kvm_vgic_global_state;

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

+4 −0
Original line number Diff line number Diff line
@@ -405,6 +405,10 @@ int kvm_vgic_hyp_init(void) 
		break;

	case GIC_V3:

		ret = vgic_v3_probe(gic_kvm_info);

		if (!ret) {

			static_branch_enable(&kvm_vgic_global_state.gicv3_cpuif);

			kvm_info("GIC system register CPU interface enabled\n");

		}

		break;

	default:

		ret = -ENODEV;

virt/kvm/arm/vgic/vgic.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#define DEBUG_SPINLOCK_BUG_ON(p)

#endif



struct vgic_global __section(.hyp.text) kvm_vgic_global_state;

struct vgic_global __section(.hyp.text) kvm_vgic_global_state = {.gicv3_cpuif = STATIC_KEY_FALSE_INIT,};



/*

 * Locking order is always:

CRA Git | Maintained and supported by SUSTech CRA and CCSE