Commit f31b88b3 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: SVM: Free sev_asid_bitmap during init if SEV setup fails 



Free sev_asid_bitmap if the reclaim bitmap allocation fails, othwerise
KVM will unnecessarily keep the bitmap when SEV is not fully enabled.

Freeing the page is also necessary to avoid introducing a bug when a
future patch eliminates svm_sev_enabled() in favor of using the global
'sev' flag directly.  While sev_hardware_enabled() checks max_sev_asid,
which is true even if KVM setup fails, 'sev' will be true if and only
if KVM setup fully succeeds.

Fixes: 33af3a7e ("KVM: SVM: Reduce WBINVD/DF_FLUSH invocations")
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210422021125.3417167-3-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3b1902b8

arch/x86/kvm/svm/sev.c

+4 −1
Original line number Diff line number Diff line
@@ -1831,8 +1831,11 @@ void __init sev_hardware_setup(void) 
		goto out;



	sev_reclaim_asid_bitmap = bitmap_zalloc(max_sev_asid, GFP_KERNEL);

	if (!sev_reclaim_asid_bitmap)

	if (!sev_reclaim_asid_bitmap) {

		bitmap_free(sev_asid_bitmap);

		sev_asid_bitmap = NULL;

		goto out;

	}



	sev_asid_count = max_sev_asid - min_sev_asid + 1;

	if (misc_cg_set_capacity(MISC_CG_RES_SEV, sev_asid_count))