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

Commit d017d7b0 authored by Vijaya Kumar K's avatar Vijaya Kumar K Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Implement VGICv3 CPU interface access 



VGICv3 CPU interface registers are accessed using
KVM_DEV_ARM_VGIC_CPU_SYSREGS ioctl. These registers are accessed
as 64-bit. The cpu MPIDR value is passed along with register id.
It is used to identify the cpu for registers access.

The VM that supports SEIs expect it on destination machine to handle
guest aborts and hence checked for ICC_CTLR_EL1.SEIS compatibility.
Similarly, VM that supports Affinity Level 3 that is required for AArch64
mode, is required to be supported on destination machine. Hence checked
for ICC_CTLR_EL1.A3V compatibility.

The arch/arm64/kvm/vgic-sys-reg-v3.c handles read and write of VGIC
CPU registers for AArch64.

For AArch32 mode, arch/arm/kvm/vgic-v3-coproc.c file is created but
APIs are not implemented.

Updated arch/arm/include/uapi/asm/kvm.h with new definitions
required to compile for AArch32.

The version of VGIC v3 specification is defined here
Documentation/virtual/kvm/devices/arm-vgic-v3.txt

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarPavel Fedin <p.fedin@samsung.com>
Signed-off-by: default avatarVijaya Kumar K <Vijaya.Kumar@cavium.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 5fb247d7

arch/arm/include/uapi/asm/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -186,9 +186,12 @@ struct kvm_arch_memory_slot { 
			(0xffffffffULL << KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT)

#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0

#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)

#define   KVM_DEV_ARM_VGIC_SYSREG_INSTR_MASK (0xffff)

#define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3

#define KVM_DEV_ARM_VGIC_GRP_CTRL       4

#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6



#define   KVM_DEV_ARM_VGIC_CTRL_INIT    0



/* KVM_IRQ_LINE irq field index values */

arch/arm/kvm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ifeq ($(plus_virt),+virt) 
	plus_virt_def := -DREQUIRES_VIRT=1

endif



ccflags-y += -Iarch/arm/kvm

ccflags-y += -Iarch/arm/kvm -Ivirt/kvm/arm/vgic

CFLAGS_arm.o := -I. $(plus_virt_def)

CFLAGS_mmu.o := -I.
@@ -20,7 +20,7 @@ kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vf 
obj-$(CONFIG_KVM_ARM_HOST) += hyp/

obj-y += kvm-arm.o init.o interrupts.o

obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o

obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o

obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o vgic-v3-coproc.o

obj-y += $(KVM)/arm/aarch32.o



obj-y += $(KVM)/arm/vgic/vgic.o

arch/arm/kvm/vgic-v3-coproc.c

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * VGIC system registers handling functions for AArch32 mode

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/kvm.h>

#include <linux/kvm_host.h>

#include <asm/kvm_emulate.h>

#include "vgic.h"



int vgic_v3_has_cpu_sysregs_attr(struct kvm_vcpu *vcpu, bool is_write, u64 id,

				 u64 *reg)

{

	/*

	 * TODO: Implement for AArch32

	 */

	return -ENXIO;

}



int vgic_v3_cpu_sysregs_uaccess(struct kvm_vcpu *vcpu, bool is_write, u64 id,

				u64 *reg)

{

	/*

	 * TODO: Implement for AArch32

	 */

	return -ENXIO;

}

arch/arm64/include/uapi/asm/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -206,9 +206,12 @@ struct kvm_arch_memory_slot { 
			(0xffffffffULL << KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT)

#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0

#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)

#define   KVM_DEV_ARM_VGIC_SYSREG_INSTR_MASK (0xffff)

#define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3

#define KVM_DEV_ARM_VGIC_GRP_CTRL	4

#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6



#define   KVM_DEV_ARM_VGIC_CTRL_INIT	0



/* Device Control API on vcpu fd */

arch/arm64/kvm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for Kernel-based Virtual Machine module

#



ccflags-y += -Iarch/arm64/kvm

ccflags-y += -Iarch/arm64/kvm -Ivirt/kvm/arm/vgic

CFLAGS_arm.o := -I.

CFLAGS_mmu.o := -I.
@@ -19,6 +19,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(ARM)/psci.o $(ARM)/perf.o 
kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o

kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o

kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o

kvm-$(CONFIG_KVM_ARM_HOST) += vgic-sys-reg-v3.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/aarch32.o



kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o