Commit 817506df authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-5.16-fixes' into kvm-master 

* Fixes for Xen emulation

* Kill kvm_map_gfn() / kvm_unmap_gfn() and broken gfn_to_pfn_cache

* Fixes for migration of 32-bit nested guests on 64-bit hypervisor

* Compilation fixes

* More SEV cleanups
parents e5bc4d46 8e38e96a

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ union kvm_mmu_extended_role { 
		unsigned int cr4_smap:1;

		unsigned int cr4_smep:1;

		unsigned int cr4_la57:1;

		unsigned int efer_lma:1;

	};

};

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu) 
	}

}



struct kvm_cpuid_entry2 *kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu)

static struct kvm_cpuid_entry2 *kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu)

{

	u32 base = vcpu->arch.kvm_cpuid_base;

arch/x86/kvm/mmu/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -4682,6 +4682,7 @@ static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu, 
		/* PKEY and LA57 are active iff long mode is active. */

		ext.cr4_pke = ____is_efer_lma(regs) && ____is_cr4_pke(regs);

		ext.cr4_la57 = ____is_efer_lma(regs) && ____is_cr4_la57(regs);

		ext.efer_lma = ____is_efer_lma(regs);

	}



	ext.valid = 1;

arch/x86/kvm/svm/sev.c

+11 −7
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ static void sev_unbind_asid(struct kvm *kvm, unsigned int handle) 
static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp)

{

	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;

	bool es_active = argp->id == KVM_SEV_ES_INIT;

	int asid, ret;



	if (kvm->created_vcpus)
@@ -247,7 +246,8 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) 
	if (unlikely(sev->active))

		return ret;



	sev->es_active = es_active;

	sev->active = true;

	sev->es_active = argp->id == KVM_SEV_ES_INIT;

	asid = sev_asid_new(sev);

	if (asid < 0)

		goto e_no_asid;
@@ -257,8 +257,6 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) 
	if (ret)

		goto e_free;



	sev->active = true;

	sev->asid = asid;

	INIT_LIST_HEAD(&sev->regions_list);



	return 0;
@@ -268,6 +266,7 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) 
	sev->asid = 0;

e_no_asid:

	sev->es_active = false;

	sev->active = false;

	return ret;

}
@@ -1530,7 +1529,7 @@ static int sev_receive_finish(struct kvm *kvm, struct kvm_sev_cmd *argp) 
	return sev_issue_cmd(kvm, SEV_CMD_RECEIVE_FINISH, &data, &argp->error);

}



static bool cmd_allowed_from_miror(u32 cmd_id)

static bool is_cmd_allowed_from_mirror(u32 cmd_id)

{

	/*

	 * Allow mirrors VM to call KVM_SEV_LAUNCH_UPDATE_VMSA to enable SEV-ES
@@ -1757,7 +1756,7 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) 


	/* Only the enc_context_owner handles some memory enc operations. */

	if (is_mirroring_enc_context(kvm) &&

	    !cmd_allowed_from_miror(sev_cmd.id)) {

	    !is_cmd_allowed_from_mirror(sev_cmd.id)) {

		r = -EINVAL;

		goto out;

	}
@@ -1990,7 +1989,12 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd) 
	mutex_unlock(&source_kvm->lock);

	mutex_lock(&kvm->lock);



	if (sev_guest(kvm)) {

	/*

	 * Disallow out-of-band SEV/SEV-ES init if the target is already an

	 * SEV guest, or if vCPUs have been created.  KVM relies on vCPUs being

	 * created after SEV/SEV-ES initialization, e.g. to init intercepts.

	 */

	if (sev_guest(kvm) || kvm->created_vcpus) {

		ret = -EINVAL;

		goto e_mirror_unlock;

	}

arch/x86/kvm/svm/svm.h

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static __always_inline bool sev_es_guest(struct kvm *kvm) 
#ifdef CONFIG_KVM_AMD_SEV

	struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;



	return sev_guest(kvm) && sev->es_active;

	return sev->es_active && !WARN_ON_ONCE(!sev->active);

#else

	return false;

#endif