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

Paolo Bonzini committed 5 years ago

Commit 84886c22 parents 501cfe0 50a8d338 files · +19 −16Browse files

Unified · Split

8 files

arch/arm64/include/asm/esr.h +1 −0
arch/arm64/include/asm/kvm_host.h +1 −1
arch/arm64/kvm/arm.c +1 −4
arch/arm64/kvm/guest.c +1 −6
arch/arm64/kvm/hyp/hyp-entry.S +1 −1
arch/arm64/kvm/hyp/nvhe/host.S +1 −1
arch/arm64/kvm/hyp/nvhe/setup.c +12 −2
arch/arm64/kvm/hyp/nvhe/sys_regs.c +1 −1

arch/arm64/include/asm/esr.h+1−0

@@ -68,6 +68,7 @@ · 67 unmodified lines
68	#define ESR_ELx_EC_MAX (0x3F)	68	#define ESR_ELx_EC_MAX (0x3F)
69		69
70	#define ESR_ELx_EC_SHIFT (26)	70	#define ESR_ELx_EC_SHIFT (26)
		71	#define ESR_ELx_EC_WIDTH (6)
71	#define ESR_ELx_EC_MASK (UL(0x3F) << ESR_ELx_EC_SHIFT)	72	#define ESR_ELx_EC_MASK (UL(0x3F) << ESR_ELx_EC_SHIFT)
72	#define ESR_ELx_EC(esr) (((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT)	73	#define ESR_ELx_EC(esr) (((esr) & ESR_ELx_EC_MASK) >> ESR_ELx_EC_SHIFT)
73		74

arch/arm64/include/asm/kvm_host.h+1−1

@@ -584,7 +584,7 @@ struct kvm_vcpu_stat { · 583 unmodified lines
584	u64 exits;	584	u64 exits;
585	};	585	};
586		586
587	int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);	587	void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
588	unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);	588	unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);
589	int kvm_arm_copy_reg_indices(struct kvm_vcpu vcpu, u64 __user indices);	589	int kvm_arm_copy_reg_indices(struct kvm_vcpu vcpu, u64 __user indices);
590	int kvm_arm_get_reg(struct kvm_vcpu vcpu, const struct kvm_one_reg reg);	590	int kvm_arm_get_reg(struct kvm_vcpu vcpu, const struct kvm_one_reg reg);

arch/arm64/kvm/arm.c+1−4

 		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);
+		kvm_vcpu_preferred_target(&init);
-		if (err)
-			return err;
 		if (copy_to_user(argp, &init, sizeof(init)))
 			return -EFAULT;

arch/arm64/kvm/guest.c+1−6

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

@@ -44,7 +44,7 @@ · 43 unmodified lines
44	el1_sync: // Guest trapped into EL2	44	el1_sync: // Guest trapped into EL2
45		45
46	mrs x0, esr_el2	46	mrs x0, esr_el2
47	lsr x0, x0, #ESR_ELx_EC_SHIFT	47	ubfx x0, x0, #ESR_ELx_EC_SHIFT, #ESR_ELx_EC_WIDTH
48	cmp x0, #ESR_ELx_EC_HVC64	48	cmp x0, #ESR_ELx_EC_HVC64
49	ccmp x0, #ESR_ELx_EC_HVC32, #4, ne	49	ccmp x0, #ESR_ELx_EC_HVC32, #4, ne
50	b.ne el1_trap	50	b.ne el1_trap

arch/arm64/kvm/hyp/nvhe/host.S+1−1

@@ -141,7 +141,7 @@ SYM_FUNC_END(__host_hvc) · 140 unmodified lines
141	.L__vect_start\@:	141	.L__vect_start\@:
142	stp x0, x1, [sp, #-16]!	142	stp x0, x1, [sp, #-16]!
143	mrs x0, esr_el2	143	mrs x0, esr_el2
144	lsr x0, x0, #ESR_ELx_EC_SHIFT	144	ubfx x0, x0, #ESR_ELx_EC_SHIFT, #ESR_ELx_EC_WIDTH
145	cmp x0, #ESR_ELx_EC_HVC64	145	cmp x0, #ESR_ELx_EC_HVC64
146	b.eq __host_hvc	146	b.eq __host_hvc
147	b __host_exit	147	b __host_exit

arch/arm64/kvm/hyp/nvhe/setup.c+12−2

 	phys = kvm_pte_to_phys(pte);
 	if (!addr_is_memory(phys))
-		return 0;
+		return -EINVAL;
 	/*
 	 * Adjust the host stage-2 mappings to match the ownership attributes
 		.cb	= finalize_host_mappings_walker,
 		.flags	= KVM_PGTABLE_WALK_LEAF,
 	};
+	int i, ret;
+	for (i = 0; i < hyp_memblock_nr; i++) {
+		struct memblock_region *reg = &hyp_memory[i];
+		u64 start = (u64)hyp_phys_to_virt(reg->base);
+		ret = kvm_pgtable_walk(&pkvm_pgtable, start, reg->size, &walker);
+		if (ret)
+			return ret;
+	}
-	return kvm_pgtable_walk(&pkvm_pgtable, 0, BIT(pkvm_pgtable.ia_bits), &walker);
+	return 0;
 }
 void __noreturn __pkvm_init_finalise(void)

arch/arm64/kvm/hyp/nvhe/sys_regs.c+1−1

@@ -474,7 +474,7 @@ bool kvm_handle_pvm_sysreg(struct kvm_vcpu vcpu, u64 exit_code) · 473 unmodified lines
474	return true;	474	return true;
475	}	475	}
476		476
477	/**	477	/*
478	* Handler for protected VM restricted exceptions.	478	* Handler for protected VM restricted exceptions.
479	*	479	*
480	* Inject an undefined exception into the guest and return true to indicate that	480	* Inject an undefined exception into the guest and return true to indicate that