ARM: KVM: Initial VGIC infrastructure code (1a89dd91) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/include/asm/kvm_host.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@
		#define KVM_NR_PAGE_SIZES 1
		#define KVM_PAGES_PER_HPAGE(x) (1UL<<31)

		#include <asm/kvm_vgic.h>

		struct kvm_vcpu;
		u32 kvm_vcpu_reg(struct kvm_vcpu vcpu, u8 reg_num, u32 mode);
		int kvm_target_cpu(void);
		@@ -58,6 +60,9 @@ struct kvm_arch {

		/* Stage-2 page table */
		pgd_t *pgd;

		/* Interrupt controller */
		struct vgic_dist vgic;
		};

		#define KVM_NR_MEM_OBJS 40
		@@ -92,6 +97,9 @@ struct kvm_vcpu_arch {
		struct vfp_hard_struct vfp_guest;
		struct vfp_hard_struct *vfp_host;

		/* VGIC state */
		struct vgic_cpu vgic_cpu;

		/*
		* Anything that is not used directly from assembly code goes
		* here.

arch/arm/include/asm/kvm_vgic.h

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 ARM Ltd.
		* Author: Marc Zyngier <marc.zyngier@arm.com>
		*
		* 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.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#ifndef __ASM_ARM_KVM_VGIC_H
		#define __ASM_ARM_KVM_VGIC_H

		#include <linux/irqchip/arm-gic.h>

		struct vgic_dist {
		};

		struct vgic_cpu {
		};

		struct kvm;
		struct kvm_vcpu;
		struct kvm_run;
		struct kvm_exit_mmio;

		#ifdef CONFIG_KVM_ARM_VGIC
		bool vgic_handle_mmio(struct kvm_vcpu vcpu, struct kvm_run run,
		struct kvm_exit_mmio *mmio);

		#else
		static inline int kvm_vgic_hyp_init(void)
		{
		return 0;
		}

		static inline int kvm_vgic_init(struct kvm *kvm)
		{
		return 0;
		}

		static inline int kvm_vgic_create(struct kvm *kvm)
		{
		return 0;
		}

		static inline int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
		{
		return 0;
		}

		static inline void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu) {}
		static inline void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) {}

		static inline int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu)
		{
		return 0;
		}

		static inline bool vgic_handle_mmio(struct kvm_vcpu vcpu, struct kvm_run run,
		struct kvm_exit_mmio *mmio)
		{
		return false;
		}

		static inline int irqchip_in_kernel(struct kvm *kvm)
		{
		return 0;
		}
		#endif

		#endif

arch/arm/kvm/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,3 +19,4 @@ kvm-arm-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o)
		obj-y += kvm-arm.o init.o interrupts.o
		obj-y += arm.o guest.o mmu.o emulate.o reset.o
		obj-y += coproc.o coproc_a15.o mmio.o psci.o
		obj-$(CONFIG_KVM_ARM_VGIC) += vgic.o

arch/arm/kvm/arm.c

+26 −1

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@ static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
		static u8 kvm_next_vmid;
		static DEFINE_SPINLOCK(kvm_vmid_lock);

		static bool vgic_present;

		static void kvm_arm_set_running_vcpu(struct kvm_vcpu *vcpu)
		{
		BUG_ON(preemptible());
		@@ -184,6 +186,9 @@ int kvm_dev_ioctl_check_extension(long ext)
		{
		int r;
		switch (ext) {
		case KVM_CAP_IRQCHIP:
		r = vgic_present;
		break;
		case KVM_CAP_USER_MEMORY:
		case KVM_CAP_SYNC_MMU:
		case KVM_CAP_DESTROY_MEMORY_REGION_WORKS:
		@@ -315,8 +320,16 @@ int __attribute_const__ kvm_target_cpu(void)

		int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
		{
		int ret;

		/* Force users to call KVM_ARM_VCPU_INIT */
		vcpu->arch.target = -1;

		/* Set up VGIC */
		ret = kvm_vgic_vcpu_init(vcpu);
		if (ret)
		return ret;

		return 0;
		}

		@@ -374,7 +387,7 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
		*/
		int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)
		{
		return !!v->arch.irq_lines;
		return !!v->arch.irq_lines \|\| kvm_vgic_vcpu_pending_irq(v);
		}

		/* Just ensure a guest exit from a particular CPU */
		@@ -693,6 +706,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
		if (vcpu->arch.pause)
		vcpu_pause(vcpu);

		kvm_vgic_flush_hwstate(vcpu);

		local_irq_disable();

		/*
		@@ -705,6 +720,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)

		if (ret <= 0 \|\| need_new_vmid_gen(vcpu->kvm)) {
		local_irq_enable();
		kvm_vgic_sync_hwstate(vcpu);
		continue;
		}

		@@ -737,6 +753,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
		* Back from guest
		*************************************************************/

		kvm_vgic_sync_hwstate(vcpu);

		ret = handle_exit(vcpu, run, ret);
		}

		@@ -1011,6 +1029,13 @@ static int init_hyp_mode(void)
		}
		}

		/*
		* Init HYP view of VGIC
		*/
		err = kvm_vgic_hyp_init();
		if (err)
		goto out_free_vfp;

		kvm_info("Hyp mode initialized successfully\n");
		return 0;
		out_free_vfp:

arch/arm/kvm/interrupts.S

+4 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ ENTRY(__kvm_vcpu_run)

		save_host_regs

		restore_vgic_state

		@ Store hardware CP15 state and load guest state
		read_cp15_state store_to_vcpu = 0
		write_cp15_state read_from_vcpu = 1
		@@ -187,6 +189,8 @@ after_vfp_restore:
		read_cp15_state store_to_vcpu = 1
		write_cp15_state read_from_vcpu = 0

		save_vgic_state

		restore_host_regs
		clrex @ Clear exclusive monitor
		mov r0, r1 @ Return the return code