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

Commit 658f7c4b authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-arm-for-4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm 

KVM/ARM updates for 4.9-rc2

- Handle faults generated by the page table walker as being writes
- Map the BSS at EL2
parents 3633031d c8ea0395

arch/arm/kvm/arm.c

+7 −0
Original line number Diff line number Diff line
@@ -1312,6 +1312,13 @@ static int init_hyp_mode(void) 
		goto out_err;

	}



	err = create_hyp_mappings(kvm_ksym_ref(__bss_start),

				  kvm_ksym_ref(__bss_stop), PAGE_HYP_RO);

	if (err) {

		kvm_err("Cannot map bss section\n");

		goto out_err;

	}



	/*

	 * Map the Hyp stack pages

	 */

arch/arm64/include/asm/kvm_emulate.h

+6 −5
Original line number Diff line number Diff line
@@ -178,11 +178,6 @@ static inline bool kvm_vcpu_dabt_isvalid(const struct kvm_vcpu *vcpu) 
	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_ISV);

}



static inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR);

}



static inline bool kvm_vcpu_dabt_issext(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_SSE);
@@ -203,6 +198,12 @@ static inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu) 
	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_S1PTW);

}



static inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR) ||

		kvm_vcpu_dabt_iss1tw(vcpu); /* AF/DBM update */

}



static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)

{

	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_CM);