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

Commit 564ad0aa authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-fixes-for-v4.19-v2' of... 

Merge tag 'kvm-arm-fixes-for-v4.19-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm

Fixes for KVM/ARM for Linux v4.19 v2:

 - Fix a VFP corruption in 32-bit guest
 - Add missing cache invalidation for CoW pages
 - Two small cleanups
parents ed2ef291 df3190e2

arch/arm/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 
			      struct kvm_vcpu_events *events);



#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

arch/arm64/include/asm/kvm_host.h

+1 −3
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ struct kvm_arch { 
	u64    vmid_gen;

	u32    vmid;



	/* 1-level 2nd stage table and lock */

	spinlock_t pgd_lock;

	/* 1-level 2nd stage table, protected by kvm->mmu_lock */

	pgd_t *pgd;



	/* VTTBR value associated with above pgd and vmid */
@@ -357,7 +356,6 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, 
			      struct kvm_vcpu_events *events);



#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

arch/arm64/kvm/hyp/switch.c

+6 −3
Original line number Diff line number Diff line
@@ -98,8 +98,10 @@ static void activate_traps_vhe(struct kvm_vcpu *vcpu) 
	val = read_sysreg(cpacr_el1);

	val |= CPACR_EL1_TTA;

	val &= ~CPACR_EL1_ZEN;

	if (!update_fp_enabled(vcpu))

	if (!update_fp_enabled(vcpu)) {

		val &= ~CPACR_EL1_FPEN;

		__activate_traps_fpsimd32(vcpu);

	}



	write_sysreg(val, cpacr_el1);
@@ -114,8 +116,10 @@ static void __hyp_text __activate_traps_nvhe(struct kvm_vcpu *vcpu) 


	val = CPTR_EL2_DEFAULT;

	val |= CPTR_EL2_TTA | CPTR_EL2_TZ;

	if (!update_fp_enabled(vcpu))

	if (!update_fp_enabled(vcpu)) {

		val |= CPTR_EL2_TFP;

		__activate_traps_fpsimd32(vcpu);

	}



	write_sysreg(val, cptr_el2);

}
@@ -129,7 +133,6 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu) 
	if (cpus_have_const_cap(ARM64_HAS_RAS_EXTN) && (hcr & HCR_VSE))

		write_sysreg_s(vcpu->arch.vsesr_el2, SYS_VSESR_EL2);



	__activate_traps_fpsimd32(vcpu);

	if (has_vhe())

		activate_traps_vhe(vcpu);

	else

arch/mips/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -931,7 +931,6 @@ enum kvm_mips_fault_result kvm_trap_emul_gva_fault(struct kvm_vcpu *vcpu, 
						   bool write);



#define KVM_ARCH_WANT_MMU_NOTIFIER

int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);

int kvm_unmap_hva_range(struct kvm *kvm,

			unsigned long start, unsigned long end);

void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);

arch/mips/kvm/mmu.c

+0 −10
Original line number Diff line number Diff line
@@ -512,16 +512,6 @@ static int kvm_unmap_hva_handler(struct kvm *kvm, gfn_t gfn, gfn_t gfn_end, 
	return 1;

}



int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)

{

	unsigned long end = hva + PAGE_SIZE;



	handle_hva_to_gpa(kvm, hva, end, &kvm_unmap_hva_handler, NULL);



	kvm_mips_callbacks->flush_shadow_all(kvm);

	return 0;

}



int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)

{

	handle_hva_to_gpa(kvm, start, end, &kvm_unmap_hva_handler, NULL);