[PATCH 21/21] KVM: SEV: Goto an existing error label if charging misc_cg for an ASID fails
From: Sean Christopherson
Date: Tue Mar 10 2026 - 19:52:11 EST
Dedup a small amount of cleanup code in SEV ASID allocation by reusing
an existing error label.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
arch/x86/kvm/svm/sev.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index c35eb9e30993..32d7f329f92c 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -289,14 +289,11 @@ static int sev_asid_new(struct kvm_sev_info *sev, unsigned long vm_type)
if (min_asid > max_asid)
return -ENOTTY;
- WARN_ON(sev->misc_cg);
+ WARN_ON_ONCE(sev->misc_cg);
sev->misc_cg = get_current_misc_cg();
ret = sev_misc_cg_try_charge(sev);
- if (ret) {
- put_misc_cg(sev->misc_cg);
- sev->misc_cg = NULL;
- return ret;
- }
+ if (ret)
+ goto e_put_cg;
asid = sev_alloc_asid(min_asid, max_asid);
if (asid > max_asid) {
@@ -306,8 +303,10 @@ static int sev_asid_new(struct kvm_sev_info *sev, unsigned long vm_type)
sev->asid = asid;
return 0;
+
e_uncharge:
sev_misc_cg_uncharge(sev);
+e_put_cg:
put_misc_cg(sev->misc_cg);
sev->misc_cg = NULL;
return ret;
--
2.53.0.473.g4a7958ca14-goog