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

Commit 4429fc64 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

arm/arm64: KVM: rework MPIDR assignment and add accessors 



The virtual MPIDR registers (containing topology information) for the
guest are currently mapped linearily to the vcpu_id. Improve this
mapping for arm64 by using three levels to not artificially limit the
number of vCPUs.
To help this, change and rename the kvm_vcpu_get_mpidr() function to
mask off the non-affinity bits in the MPIDR register.
Also add an accessor to later allow easier access to a vCPU with a
given MPIDR. Use this new accessor in the PSCI emulation.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 7276030a

arch/arm/include/asm/kvm_emulate.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/kvm_arm.h>

#include <asm/cputype.h>



unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);

unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu);
@@ -167,9 +168,9 @@ static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;

}



static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)

static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.cp15[c0_MPIDR];

	return vcpu->arch.cp15[c0_MPIDR] & MPIDR_HWID_BITMASK;

}



static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)

arch/arm/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -236,6 +236,8 @@ int kvm_perf_teardown(void); 


void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);



struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);



static inline void kvm_arch_hardware_disable(void) {}

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

arch/arm/kvm/arm.c

+13 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,19 @@ static void check_kvm_target_cpu(void *ret) 
	*(int *)ret = kvm_target_cpu();

}



struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)

{

	struct kvm_vcpu *vcpu;

	int i;



	mpidr &= MPIDR_HWID_BITMASK;

	kvm_for_each_vcpu(i, vcpu, kvm) {

		if (mpidr == kvm_vcpu_get_mpidr_aff(vcpu))

			return vcpu;

	}

	return NULL;

}



/**

 * Initialize Hyp-mode and memory mappings on all CPUs.

 */

arch/arm/kvm/psci.c

+5 −12
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/cputype.h>

#include <asm/kvm_emulate.h>

#include <asm/kvm_psci.h>

#include <asm/kvm_host.h>



/*

 * This is an implementation of the Power State Coordination Interface
@@ -66,25 +67,17 @@ static void kvm_psci_vcpu_off(struct kvm_vcpu *vcpu) 
static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu)

{

	struct kvm *kvm = source_vcpu->kvm;

	struct kvm_vcpu *vcpu = NULL, *tmp;

	struct kvm_vcpu *vcpu = NULL;

	wait_queue_head_t *wq;

	unsigned long cpu_id;

	unsigned long context_id;

	unsigned long mpidr;

	phys_addr_t target_pc;

	int i;



	cpu_id = *vcpu_reg(source_vcpu, 1);

	cpu_id = *vcpu_reg(source_vcpu, 1) & MPIDR_HWID_BITMASK;

	if (vcpu_mode_is_32bit(source_vcpu))

		cpu_id &= ~((u32) 0);



	kvm_for_each_vcpu(i, tmp, kvm) {

		mpidr = kvm_vcpu_get_mpidr(tmp);

		if ((mpidr & MPIDR_HWID_BITMASK) == (cpu_id & MPIDR_HWID_BITMASK)) {

			vcpu = tmp;

			break;

		}

	}

	vcpu = kvm_mpidr_to_vcpu(kvm, cpu_id);



	/*

	 * Make sure the caller requested a valid CPU and that the CPU is
@@ -155,7 +148,7 @@ static unsigned long kvm_psci_vcpu_affinity_info(struct kvm_vcpu *vcpu) 
	 * then ON else OFF

	 */

	kvm_for_each_vcpu(i, tmp, kvm) {

		mpidr = kvm_vcpu_get_mpidr(tmp);

		mpidr = kvm_vcpu_get_mpidr_aff(tmp);

		if (((mpidr & target_affinity_mask) == target_affinity) &&

		    !tmp->arch.pause) {

			return PSCI_0_2_AFFINITY_LEVEL_ON;

arch/arm64/include/asm/kvm_emulate.h

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/kvm_arm.h>

#include <asm/kvm_mmio.h>

#include <asm/ptrace.h>

#include <asm/cputype.h>



unsigned long *vcpu_reg32(const struct kvm_vcpu *vcpu, u8 reg_num);

unsigned long *vcpu_spsr32(const struct kvm_vcpu *vcpu);
@@ -192,9 +193,9 @@ static inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & ESR_EL2_FSC_TYPE;

}



static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)

static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu_sys_reg(vcpu, MPIDR_EL1);

	return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;

}



static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)