Commit d741dcae authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-5.8-4' of... 

Merge tag 'kvmarm-fixes-5.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/arm64 fixes for Linux 5.8, take #3

- Fix a corner case of a new mapping inheriting exec permission without
  and yet bypassing invalidation of the I-cache
- Make sure PtrAuth predicates oinly generate inline code for the
  non-VHE hypervisor code
parents 5e105c88 b757b47a

arch/arm64/include/asm/kvm_host.h

+8 −3
Original line number Diff line number Diff line
@@ -380,9 +380,14 @@ struct kvm_vcpu_arch { 
#define vcpu_has_sve(vcpu) (system_supports_sve() && \

			    ((vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_SVE))



#define vcpu_has_ptrauth(vcpu)	((system_supports_address_auth() || \

				  system_supports_generic_auth()) && \

				 ((vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_PTRAUTH))

#ifdef CONFIG_ARM64_PTR_AUTH

#define vcpu_has_ptrauth(vcpu)						\

	((cpus_have_final_cap(ARM64_HAS_ADDRESS_AUTH) ||		\

	  cpus_have_final_cap(ARM64_HAS_GENERIC_AUTH)) &&		\

	 (vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_PTRAUTH)

#else

#define vcpu_has_ptrauth(vcpu)		false

#endif



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

arch/arm64/kvm/mmu.c

+6 −5
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static bool stage2_get_leaf_entry(struct kvm *kvm, phys_addr_t addr, 
	return true;

}



static bool stage2_is_exec(struct kvm *kvm, phys_addr_t addr)

static bool stage2_is_exec(struct kvm *kvm, phys_addr_t addr, unsigned long sz)

{

	pud_t *pudp;

	pmd_t *pmdp;
@@ -1338,11 +1338,11 @@ static bool stage2_is_exec(struct kvm *kvm, phys_addr_t addr) 
		return false;



	if (pudp)

		return kvm_s2pud_exec(pudp);

		return sz <= PUD_SIZE && kvm_s2pud_exec(pudp);

	else if (pmdp)

		return kvm_s2pmd_exec(pmdp);

		return sz <= PMD_SIZE && kvm_s2pmd_exec(pmdp);

	else

		return kvm_s2pte_exec(ptep);

		return sz == PAGE_SIZE && kvm_s2pte_exec(ptep);

}



static int stage2_set_pte(struct kvm *kvm, struct kvm_mmu_memory_cache *cache,
@@ -1958,7 +1958,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	 * execute permissions, and we preserve whatever we have.

	 */

	needs_exec = exec_fault ||

		(fault_status == FSC_PERM && stage2_is_exec(kvm, fault_ipa));

		(fault_status == FSC_PERM &&

		 stage2_is_exec(kvm, fault_ipa, vma_pagesize));



	if (vma_pagesize == PUD_SIZE) {

		pud_t new_pud = kvm_pfn_pud(pfn, mem_type);

CRA Git | Maintained and supported by SUSTech CRA and CCSE