Commit 84886c26 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-5.16-1' of... 

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

KVM/arm64 fixes for 5.16, take #1

- Fix the host S2 finalization by solely iterating over the memblocks
  instead of the whole IPA space

- Tighten the return value of kvm_vcpu_preferred_target() now that
  32bit support is long gone

- Make sure the extraction of ESR_ELx.EC is limited to the architected
  bits

- Comment fixups
parents 501cfe06 50a8d331

arch/arm64/include/asm/esr.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define ESR_ELx_EC_MAX		(0x3F)



#define ESR_ELx_EC_SHIFT	(26)

#define ESR_ELx_EC_WIDTH	(6)

#define ESR_ELx_EC_MASK		(UL(0x3F) << ESR_ELx_EC_SHIFT)

#define ESR_ELx_EC(esr)		(((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT)

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ struct kvm_vcpu_stat { 
	u64 exits;

};



int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

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);

arch/arm64/kvm/arm.c

+1 −4
Original line number Diff line number Diff line
@@ -1389,12 +1389,9 @@ long kvm_arch_vm_ioctl(struct file *filp, 
		return kvm_vm_ioctl_set_device_addr(kvm, &dev_addr);

	}

	case KVM_ARM_PREFERRED_TARGET: {

		int err;

		struct kvm_vcpu_init init;



		err = kvm_vcpu_preferred_target(&init);

		if (err)

			return err;

		kvm_vcpu_preferred_target(&init);



		if (copy_to_user(argp, &init, sizeof(init)))

			return -EFAULT;

arch/arm64/kvm/guest.c

+1 −6
Original line number Diff line number Diff line
@@ -869,13 +869,10 @@ u32 __attribute_const__ kvm_target_cpu(void) 
	return KVM_ARM_TARGET_GENERIC_V8;

}



int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)

void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)

{

	u32 target = kvm_target_cpu();



	if (target < 0)

		return -ENODEV;



	memset(init, 0, sizeof(*init));



	/*
@@ -885,8 +882,6 @@ int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init) 
	 * target type.

	 */

	init->target = (__u32)target;



	return 0;

}



int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

arch/arm64/kvm/hyp/hyp-entry.S

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
el1_sync:				// Guest trapped into EL2



	mrs	x0, esr_el2

	lsr	x0, x0, #ESR_ELx_EC_SHIFT

	ubfx	x0, x0, #ESR_ELx_EC_SHIFT, #ESR_ELx_EC_WIDTH

	cmp	x0, #ESR_ELx_EC_HVC64

	ccmp	x0, #ESR_ELx_EC_HVC32, #4, ne

	b.ne	el1_trap