Commit 24975ce8 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-svm-6.5' of https://github.com/kvm-x86/linux into HEAD 

KVM SVM changes for 6.5:

 - Drop manual TR/TSS load after VM-Exit now that KVM uses VMLOAD for host state

 - Fix a not-yet-problematic missing call to trace_kvm_exit() for VM-Exits that
   are handled in the fastpath

 - Print more descriptive information about the status of SEV and SEV-ES during
   module load

 - Assert that misc_cg_set_capacity() doesn't fail to avoid should-be-impossible
   memory leaks
parents bb05b0ef 106ed2ca

arch/x86/kvm/svm/sev.c

+11 −8
Original line number Original line Diff line number Diff line
@@ -2216,10 +2216,7 @@ void __init sev_hardware_setup(void) 
	}

	}





	sev_asid_count = max_sev_asid - min_sev_asid + 1;

	sev_asid_count = max_sev_asid - min_sev_asid + 1;

	if (misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count))

	WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count));

		goto out;



	pr_info("SEV supported: %u ASIDs\n", sev_asid_count);

	sev_supported = true;

	sev_supported = true;





	/* SEV-ES support requested? */

	/* SEV-ES support requested? */
@@ -2244,13 +2241,19 @@ void __init sev_hardware_setup(void) 
		goto out;

		goto out;





	sev_es_asid_count = min_sev_asid - 1;

	sev_es_asid_count = min_sev_asid - 1;

	if (misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count))

	WARN_ON_ONCE(misc_cg_set_capacity(MISC_CG_RES_SEV_ES, sev_es_asid_count));

		goto out;



	pr_info("SEV-ES supported: %u ASIDs\n", sev_es_asid_count);

	sev_es_supported = true;

	sev_es_supported = true;





out:

out:

	if (boot_cpu_has(X86_FEATURE_SEV))

		pr_info("SEV %s (ASIDs %u - %u)\n",

			sev_supported ? "enabled" : "disabled",

			min_sev_asid, max_sev_asid);

	if (boot_cpu_has(X86_FEATURE_SEV_ES))

		pr_info("SEV-ES %s (ASIDs %u - %u)\n",

			sev_es_supported ? "enabled" : "disabled",

			min_sev_asid > 1 ? 1 : 0, min_sev_asid - 1);



	sev_enabled = sev_supported;

	sev_enabled = sev_supported;

	sev_es_enabled = sev_es_supported;

	sev_es_enabled = sev_es_supported;

#endif

#endif

arch/x86/kvm/svm/svm.c

+2 −26
Original line number Original line Diff line number Diff line
@@ -244,15 +244,6 @@ static u8 rsm_ins_bytes[] = "\x0f\xaa"; 




static unsigned long iopm_base;

static unsigned long iopm_base;





struct kvm_ldttss_desc {

	u16 limit0;

	u16 base0;

	unsigned base1:8, type:5, dpl:2, p:1;

	unsigned limit1:4, zero0:3, g:1, base2:8;

	u32 base3;

	u32 zero1;

} __attribute__((packed));



DEFINE_PER_CPU(struct svm_cpu_data, svm_data);

DEFINE_PER_CPU(struct svm_cpu_data, svm_data);





/*

/*
@@ -588,7 +579,6 @@ static int svm_hardware_enable(void) 




	struct svm_cpu_data *sd;

	struct svm_cpu_data *sd;

	uint64_t efer;

	uint64_t efer;

	struct desc_struct *gdt;

	int me = raw_smp_processor_id();

	int me = raw_smp_processor_id();





	rdmsrl(MSR_EFER, efer);

	rdmsrl(MSR_EFER, efer);
@@ -601,9 +591,6 @@ static int svm_hardware_enable(void) 
	sd->next_asid = sd->max_asid + 1;

	sd->next_asid = sd->max_asid + 1;

	sd->min_asid = max_sev_asid + 1;

	sd->min_asid = max_sev_asid + 1;





	gdt = get_current_gdt_rw();

	sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS);



	wrmsrl(MSR_EFER, efer | EFER_SVME);

	wrmsrl(MSR_EFER, efer | EFER_SVME);





	wrmsrl(MSR_VM_HSAVE_PA, sd->save_area_pa);

	wrmsrl(MSR_VM_HSAVE_PA, sd->save_area_pa);
@@ -3419,8 +3406,6 @@ static int svm_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) 
	struct kvm_run *kvm_run = vcpu->run;

	struct kvm_run *kvm_run = vcpu->run;

	u32 exit_code = svm->vmcb->control.exit_code;

	u32 exit_code = svm->vmcb->control.exit_code;





	trace_kvm_exit(vcpu, KVM_ISA_SVM);



	/* SEV-ES guests must use the CR write traps to track CR registers. */

	/* SEV-ES guests must use the CR write traps to track CR registers. */

	if (!sev_es_guest(vcpu->kvm)) {

	if (!sev_es_guest(vcpu->kvm)) {

		if (!svm_is_intercept(svm, INTERCEPT_CR0_WRITE))

		if (!svm_is_intercept(svm, INTERCEPT_CR0_WRITE))
@@ -3458,14 +3443,6 @@ static int svm_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) 
	return svm_invoke_exit_handler(vcpu, exit_code);

	return svm_invoke_exit_handler(vcpu, exit_code);

}

}





static void reload_tss(struct kvm_vcpu *vcpu)

{

	struct svm_cpu_data *sd = per_cpu_ptr(&svm_data, vcpu->cpu);



	sd->tss_desc->type = 9; /* available 32/64-bit TSS */

	load_TR_desc();

}



static void pre_svm_run(struct kvm_vcpu *vcpu)

static void pre_svm_run(struct kvm_vcpu *vcpu)

{

{

	struct svm_cpu_data *sd = per_cpu_ptr(&svm_data, vcpu->cpu);

	struct svm_cpu_data *sd = per_cpu_ptr(&svm_data, vcpu->cpu);
@@ -4100,9 +4077,6 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) 




	svm_vcpu_enter_exit(vcpu, spec_ctrl_intercepted);

	svm_vcpu_enter_exit(vcpu, spec_ctrl_intercepted);





	if (!sev_es_guest(vcpu->kvm))

		reload_tss(vcpu);



	if (!static_cpu_has(X86_FEATURE_V_SPEC_CTRL))

	if (!static_cpu_has(X86_FEATURE_V_SPEC_CTRL))

		x86_spec_ctrl_restore_host(svm->virt_spec_ctrl);

		x86_spec_ctrl_restore_host(svm->virt_spec_ctrl);
@@ -4157,6 +4131,8 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) 
		     SVM_EXIT_EXCP_BASE + MC_VECTOR))

		     SVM_EXIT_EXCP_BASE + MC_VECTOR))

		svm_handle_mce(vcpu);

		svm_handle_mce(vcpu);





	trace_kvm_exit(vcpu, KVM_ISA_SVM);



	svm_complete_interrupts(vcpu);

	svm_complete_interrupts(vcpu);





	if (is_guest_mode(vcpu))

	if (is_guest_mode(vcpu))

arch/x86/kvm/svm/svm.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -303,7 +303,6 @@ struct svm_cpu_data { 
	u32 max_asid;

	u32 max_asid;

	u32 next_asid;

	u32 next_asid;

	u32 min_asid;

	u32 min_asid;

	struct kvm_ldttss_desc *tss_desc;





	struct page *save_area;

	struct page *save_area;

	unsigned long save_area_pa;

	unsigned long save_area_pa;