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

Merge tag 'kvmarm-fixes-6.12-2' of... 

Merge tag 'kvmarm-fixes-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.12, take #2

- Fix the guest view of the ID registers, making the relevant fields
  writable from userspace (affecting ID_AA64DFR0_EL1 and ID_AA64PFR1_EL1)

- Correcly expose S1PIE to guests, fixing a regression introduced
  in 6.12-rc1 with the S1POE support

- Fix the recycling of stage-2 shadow MMUs by tracking the context
  (are we allowed to block or not) as well as the recycling state

- Address a couple of issues with the vgic when userspace misconfigures
  the emulation, resulting in various splats. Headaches courtesy
  of our Syzkaller friends
parents 3ec4350d df5fd75e

arch/arm64/include/asm/kvm_host.h

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define KVM_REQ_RELOAD_PMU	KVM_ARCH_REQ(5)

#define KVM_REQ_SUSPEND		KVM_ARCH_REQ(6)

#define KVM_REQ_RESYNC_PMU_EL0	KVM_ARCH_REQ(7)

#define KVM_REQ_NESTED_S2_UNMAP	KVM_ARCH_REQ(8)



#define KVM_DIRTY_LOG_MANUAL_CAPS   (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \

				     KVM_DIRTY_LOG_INITIALLY_SET)
@@ -211,6 +212,12 @@ struct kvm_s2_mmu { 
	 */

	bool	nested_stage2_enabled;



	/*

	 * true when this MMU needs to be unmapped before being used for a new

	 * purpose.

	 */

	bool	pending_unmap;



	/*

	 *  0: Nobody is currently using this, check vttbr for validity

	 * >0: Somebody is actively using this.

arch/arm64/include/asm/kvm_mmu.h

+2 −1
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size, 
int create_hyp_stack(phys_addr_t phys_addr, unsigned long *haddr);

void __init free_hyp_pgds(void);



void kvm_stage2_unmap_range(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size);

void kvm_stage2_unmap_range(struct kvm_s2_mmu *mmu, phys_addr_t start,

			    u64 size, bool may_block);

void kvm_stage2_flush_range(struct kvm_s2_mmu *mmu, phys_addr_t addr, phys_addr_t end);

void kvm_stage2_wp_range(struct kvm_s2_mmu *mmu, phys_addr_t addr, phys_addr_t end);

arch/arm64/include/asm/kvm_nested.h

+3 −1
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ extern void kvm_s2_mmu_iterate_by_vmid(struct kvm *kvm, u16 vmid, 
extern void kvm_vcpu_load_hw_mmu(struct kvm_vcpu *vcpu);

extern void kvm_vcpu_put_hw_mmu(struct kvm_vcpu *vcpu);



extern void check_nested_vcpu_requests(struct kvm_vcpu *vcpu);



struct kvm_s2_trans {

	phys_addr_t output;

	unsigned long block_size;
@@ -124,7 +126,7 @@ extern int kvm_s2_handle_perm_fault(struct kvm_vcpu *vcpu, 
				    struct kvm_s2_trans *trans);

extern int kvm_inject_s2_fault(struct kvm_vcpu *vcpu, u64 esr_el2);

extern void kvm_nested_s2_wp(struct kvm *kvm);

extern void kvm_nested_s2_unmap(struct kvm *kvm);

extern void kvm_nested_s2_unmap(struct kvm *kvm, bool may_block);

extern void kvm_nested_s2_flush(struct kvm *kvm);



unsigned long compute_tlb_inval_range(struct kvm_s2_mmu *mmu, u64 val);

arch/arm64/kvm/arm.c

+5 −0
Original line number Diff line number Diff line
@@ -997,6 +997,9 @@ static int kvm_vcpu_suspend(struct kvm_vcpu *vcpu) 
static int check_vcpu_requests(struct kvm_vcpu *vcpu)

{

	if (kvm_request_pending(vcpu)) {

		if (kvm_check_request(KVM_REQ_VM_DEAD, vcpu))

			return -EIO;



		if (kvm_check_request(KVM_REQ_SLEEP, vcpu))

			kvm_vcpu_sleep(vcpu);
@@ -1031,6 +1034,8 @@ static int check_vcpu_requests(struct kvm_vcpu *vcpu) 


		if (kvm_dirty_ring_check_request(vcpu))

			return 0;



		check_nested_vcpu_requests(vcpu);

	}



	return 1;

arch/arm64/kvm/hypercalls.c

+6 −6
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int kvm_smccc_call_handler(struct kvm_vcpu *vcpu) 
				 * to the guest, and hide SSBS so that the

				 * guest stays protected.

				 */

				if (cpus_have_final_cap(ARM64_SSBS))

				if (kvm_has_feat(vcpu->kvm, ID_AA64PFR1_EL1, SSBS, IMP))

					break;

				fallthrough;

			case SPECTRE_UNAFFECTED:
@@ -428,7 +428,7 @@ int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) 
 * Convert the workaround level into an easy-to-compare number, where higher

 * values mean better protection.

 */

static int get_kernel_wa_level(u64 regid)

static int get_kernel_wa_level(struct kvm_vcpu *vcpu, u64 regid)

{

	switch (regid) {

	case KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1:
@@ -449,7 +449,7 @@ static int get_kernel_wa_level(u64 regid) 
			 * don't have any FW mitigation if SSBS is there at

			 * all times.

			 */

			if (cpus_have_final_cap(ARM64_SSBS))

			if (kvm_has_feat(vcpu->kvm, ID_AA64PFR1_EL1, SSBS, IMP))

				return KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL;

			fallthrough;

		case SPECTRE_UNAFFECTED:
@@ -486,7 +486,7 @@ int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
	case KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1:

	case KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2:

	case KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_3:

		val = get_kernel_wa_level(reg->id) & KVM_REG_FEATURE_LEVEL_MASK;

		val = get_kernel_wa_level(vcpu, reg->id) & KVM_REG_FEATURE_LEVEL_MASK;

		break;

	case KVM_REG_ARM_STD_BMAP:

		val = READ_ONCE(smccc_feat->std_bmap);
@@ -588,7 +588,7 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
		if (val & ~KVM_REG_FEATURE_LEVEL_MASK)

			return -EINVAL;



		if (get_kernel_wa_level(reg->id) < val)

		if (get_kernel_wa_level(vcpu, reg->id) < val)

			return -EINVAL;



		return 0;
@@ -624,7 +624,7 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
		 * We can deal with NOT_AVAIL on NOT_REQUIRED, but not the

		 * other way around.

		 */

		if (get_kernel_wa_level(reg->id) < wa_level)

		if (get_kernel_wa_level(vcpu, reg->id) < wa_level)

			return -EINVAL;



		return 0;