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

Commit 5f9077cb authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvmarm-fixes-for-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 

KVM/arm fixes for 4.18, take #1

- Lazy FPSIMD switching fixes
- Really disable compat ioctls on architectures that don't want it
- Disable compat on arm64 (it was never implemented...)
- Rely on architectural requirements for GICV on GICv3
- Detect bad alignments in unmap_stage2_range
parents ce397d21 37b65db8

arch/arm64/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ struct kvm_vcpu_arch { 
#define KVM_ARM64_FP_ENABLED		(1 << 1) /* guest FP regs loaded */

#define KVM_ARM64_FP_HOST		(1 << 2) /* host FP regs loaded */

#define KVM_ARM64_HOST_SVE_IN_USE	(1 << 3) /* backup for host TIF_SVE */

#define KVM_ARM64_HOST_SVE_ENABLED	(1 << 4) /* SVE enabled for EL0 */



#define vcpu_gp_regs(v)		(&(v)->arch.ctxt.gp_regs)

arch/arm64/include/asm/sysreg.h

+11 −0
Original line number Diff line number Diff line
@@ -728,6 +728,17 @@ asm( 
	asm volatile("msr_s " __stringify(r) ", %x0" : : "rZ" (__val));	\

} while (0)



/*

 * Modify bits in a sysreg. Bits in the clear mask are zeroed, then bits in the

 * set mask are set. Other bits are left as-is.

 */

#define sysreg_clear_set(sysreg, clear, set) do {			\

	u64 __scs_val = read_sysreg(sysreg);				\

	u64 __scs_new = (__scs_val & ~(u64)(clear)) | (set);		\

	if (__scs_new != __scs_val)					\

		write_sysreg(__scs_new, sysreg);			\

} while (0)



static inline void config_sctlr_el1(u32 clear, u32 set)

{

	u32 val;

arch/arm64/kvm/fpsimd.c

+27 −9
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ 
 * Copyright 2018 Arm Limited

 * Author: Dave Martin <Dave.Martin@arm.com>

 */

#include <linux/bottom_half.h>

#include <linux/irqflags.h>

#include <linux/sched.h>

#include <linux/thread_info.h>

#include <linux/kvm_host.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_host.h>

#include <asm/kvm_mmu.h>

#include <asm/sysreg.h>



/*

 * Called on entry to KVM_RUN unless this vcpu previously ran at least
@@ -61,10 +62,16 @@ void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) 
{

	BUG_ON(!current->mm);



	vcpu->arch.flags &= ~(KVM_ARM64_FP_ENABLED | KVM_ARM64_HOST_SVE_IN_USE);

	vcpu->arch.flags &= ~(KVM_ARM64_FP_ENABLED |

			      KVM_ARM64_HOST_SVE_IN_USE |

			      KVM_ARM64_HOST_SVE_ENABLED);

	vcpu->arch.flags |= KVM_ARM64_FP_HOST;



	if (test_thread_flag(TIF_SVE))

		vcpu->arch.flags |= KVM_ARM64_HOST_SVE_IN_USE;



	if (read_sysreg(cpacr_el1) & CPACR_EL1_ZEN_EL0EN)

		vcpu->arch.flags |= KVM_ARM64_HOST_SVE_ENABLED;

}



/*
@@ -92,19 +99,30 @@ void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu) 
 */

void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu)

{

	local_bh_disable();

	unsigned long flags;



	update_thread_flag(TIF_SVE,

			   vcpu->arch.flags & KVM_ARM64_HOST_SVE_IN_USE);

	local_irq_save(flags);



	if (vcpu->arch.flags & KVM_ARM64_FP_ENABLED) {

		/* Clean guest FP state to memory and invalidate cpu view */

		fpsimd_save();

		fpsimd_flush_cpu_state();

	} else if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) {

		/* Ensure user trap controls are correctly restored */

		fpsimd_bind_task_to_cpu();

	} else if (system_supports_sve()) {

		/*

		 * The FPSIMD/SVE state in the CPU has not been touched, and we

		 * have SVE (and VHE): CPACR_EL1 (alias CPTR_EL2) has been

		 * reset to CPACR_EL1_DEFAULT by the Hyp code, disabling SVE

		 * for EL0.  To avoid spurious traps, restore the trap state

		 * seen by kvm_arch_vcpu_load_fp():

		 */

		if (vcpu->arch.flags & KVM_ARM64_HOST_SVE_ENABLED)

			sysreg_clear_set(CPACR_EL1, 0, CPACR_EL1_ZEN_EL0EN);

		else

			sysreg_clear_set(CPACR_EL1, CPACR_EL1_ZEN_EL0EN, 0);

	}



	local_bh_enable();

	update_thread_flag(TIF_SVE,

			   vcpu->arch.flags & KVM_ARM64_HOST_SVE_IN_USE);



	local_irq_restore(flags);

}

virt/kvm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ config KVM_GENERIC_DIRTYLOG_READ_PROTECT 


config KVM_COMPAT

       def_bool y

       depends on KVM && COMPAT && !S390

       depends on KVM && COMPAT && !(S390 || ARM64)



config HAVE_KVM_IRQ_BYPASS

       bool

virt/kvm/arm/mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size) 
	phys_addr_t next;



	assert_spin_locked(&kvm->mmu_lock);

	WARN_ON(size & ~PAGE_MASK);



	pgd = kvm->arch.pgd + stage2_pgd_index(addr);

	do {

		/*