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

Commit 71783e09 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-for-v5.1' of... 

Merge tag 'kvmarm-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next

KVM/arm updates for Linux v5.1

- A number of pre-nested code rework
- Direct physical timer assignment on VHE systems
- kvm_call_hyp type safety enforcement
- Set/Way cache sanitisation for 32bit guests
- Build system cleanups
- A bunch of janitorial fixes
parents 8f060f53 c88b0936

MAINTAINERS

+7 −11
Original line number Diff line number Diff line
@@ -8304,29 +8304,25 @@ S: Maintained 
F:	arch/x86/include/asm/svm.h

F:	arch/x86/kvm/svm.c



KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)

KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)

M:	Christoffer Dall <christoffer.dall@arm.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

R:	James Morse <james.morse@arm.com>

R:	Julien Thierry <julien.thierry@arm.com>

R:	Suzuki K Pouloze <suzuki.poulose@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kvmarm@lists.cs.columbia.edu

W:	http://systems.cs.columbia.edu/projects/kvm-arm

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

S:	Supported

S:	Maintained

F:	arch/arm/include/uapi/asm/kvm*

F:	arch/arm/include/asm/kvm*

F:	arch/arm/kvm/

F:	virt/kvm/arm/

F:	include/kvm/arm_*



KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)

M:	Christoffer Dall <christoffer.dall@arm.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kvmarm@lists.cs.columbia.edu

S:	Maintained

F:	arch/arm64/include/uapi/asm/kvm*

F:	arch/arm64/include/asm/kvm*

F:	arch/arm64/kvm/

F:	virt/kvm/arm/

F:	include/kvm/arm_*



KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)

M:	James Hogan <jhogan@kernel.org>

arch/arm/include/asm/arch_gicv3.h

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define ICH_VTR				__ACCESS_CP15(c12, 4, c11, 1)

#define ICH_MISR			__ACCESS_CP15(c12, 4, c11, 2)

#define ICH_EISR			__ACCESS_CP15(c12, 4, c11, 3)

#define ICH_ELSR			__ACCESS_CP15(c12, 4, c11, 5)

#define ICH_ELRSR			__ACCESS_CP15(c12, 4, c11, 5)

#define ICH_VMCR			__ACCESS_CP15(c12, 4, c11, 7)



#define __LR0(x)			__ACCESS_CP15(c12, 4, c12, x)
@@ -151,7 +151,7 @@ CPUIF_MAP(ICH_HCR, ICH_HCR_EL2) 
CPUIF_MAP(ICH_VTR, ICH_VTR_EL2)

CPUIF_MAP(ICH_MISR, ICH_MISR_EL2)

CPUIF_MAP(ICH_EISR, ICH_EISR_EL2)

CPUIF_MAP(ICH_ELSR, ICH_ELSR_EL2)

CPUIF_MAP(ICH_ELRSR, ICH_ELRSR_EL2)

CPUIF_MAP(ICH_VMCR, ICH_VMCR_EL2)

CPUIF_MAP(ICH_AP0R3, ICH_AP0R3_EL2)

CPUIF_MAP(ICH_AP0R2, ICH_AP0R2_EL2)

arch/arm/include/asm/kvm_emulate.h

+8 −0
Original line number Diff line number Diff line
@@ -265,6 +265,14 @@ static inline bool kvm_vcpu_dabt_isextabt(struct kvm_vcpu *vcpu) 
	}

}



static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_trap_is_iabt(vcpu))

		return false;



	return kvm_vcpu_dabt_iswrite(vcpu);

}



static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;

arch/arm/include/asm/kvm_host.h

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

#include <asm/kvm_mmio.h>

#include <asm/fpstate.h>

#include <asm/smp_plat.h>

#include <kvm/arm_arch_timer.h>



#define __KVM_HAVE_ARCH_INTC_INITIALIZED
@@ -56,10 +57,13 @@ int __attribute_const__ kvm_target_cpu(void); 
int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

void kvm_reset_coprocs(struct kvm_vcpu *vcpu);



struct kvm_arch {

	/* VTTBR value associated with below pgd and vmid */

	u64    vttbr;

struct kvm_vmid {

	/* The VMID generation used for the virt. memory system */

	u64    vmid_gen;

	u32    vmid;

};



struct kvm_arch {

	/* The last vcpu id that ran on each physical CPU */

	int __percpu *last_vcpu_ran;
@@ -69,11 +73,11 @@ struct kvm_arch { 
	 */



	/* The VMID generation used for the virt. memory system */

	u64    vmid_gen;

	u32    vmid;

	struct kvm_vmid vmid;



	/* Stage-2 page table */

	pgd_t *pgd;

	phys_addr_t pgd_phys;



	/* Interrupt controller */

	struct vgic_dist	vgic;
@@ -147,6 +151,13 @@ struct kvm_cpu_context { 


typedef struct kvm_cpu_context kvm_cpu_context_t;



static inline void kvm_init_host_cpu_context(kvm_cpu_context_t *cpu_ctxt,

					     int cpu)

{

	/* The host's MPIDR is immutable, so let's set it up at boot time */

	cpu_ctxt->cp15[c0_MPIDR] = cpu_logical_map(cpu);

}



struct kvm_vcpu_arch {

	struct kvm_cpu_context ctxt;
@@ -214,7 +225,35 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); 
int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

unsigned long kvm_call_hyp(void *hypfn, ...);



unsigned long __kvm_call_hyp(void *hypfn, ...);



/*

 * The has_vhe() part doesn't get emitted, but is used for type-checking.

 */

#define kvm_call_hyp(f, ...)						\

	do {								\

		if (has_vhe()) {					\

			f(__VA_ARGS__);					\

		} else {						\

			__kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__); \

		}							\

	} while(0)



#define kvm_call_hyp_ret(f, ...)					\

	({								\

		typeof(f(__VA_ARGS__)) ret;				\

									\

		if (has_vhe()) {					\

			ret = f(__VA_ARGS__);				\

		} else {						\

			ret = __kvm_call_hyp(kvm_ksym_ref(f),		\

					     ##__VA_ARGS__);		\

		}							\

									\

		ret;							\

	})



void force_vm_exit(const cpumask_t *mask);

int __kvm_arm_vcpu_get_events(struct kvm_vcpu *vcpu,

			      struct kvm_vcpu_events *events);
@@ -265,7 +304,7 @@ static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr, 
	 * compliant with the PCS!).

	 */



	kvm_call_hyp((void*)hyp_stack_ptr, vector_ptr, pgd_ptr);

	__kvm_call_hyp((void*)hyp_stack_ptr, vector_ptr, pgd_ptr);

}



static inline void __cpu_init_stage2(void)

arch/arm/include/asm/kvm_hyp.h

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define TTBR1		__ACCESS_CP15_64(1, c2)

#define VTTBR		__ACCESS_CP15_64(6, c2)

#define PAR		__ACCESS_CP15_64(0, c7)

#define CNTP_CVAL	__ACCESS_CP15_64(2, c14)

#define CNTV_CVAL	__ACCESS_CP15_64(3, c14)

#define CNTVOFF		__ACCESS_CP15_64(4, c14)
@@ -85,6 +86,7 @@ 
#define TID_PRIV	__ACCESS_CP15(c13, 0, c0, 4)

#define HTPIDR		__ACCESS_CP15(c13, 4, c0, 2)

#define CNTKCTL		__ACCESS_CP15(c14, 0, c1, 0)

#define CNTP_CTL	__ACCESS_CP15(c14, 0, c2, 1)

#define CNTV_CTL	__ACCESS_CP15(c14, 0, c3, 1)

#define CNTHCTL		__ACCESS_CP15(c14, 4, c1, 0)
@@ -94,6 +96,8 @@ 
#define read_sysreg_el0(r)		read_sysreg(r##_el0)

#define write_sysreg_el0(v, r)		write_sysreg(v, r##_el0)



#define cntp_ctl_el0			CNTP_CTL

#define cntp_cval_el0			CNTP_CVAL

#define cntv_ctl_el0			CNTV_CTL

#define cntv_cval_el0			CNTV_CVAL

#define cntvoff_el2			CNTVOFF