From nobody Wed Apr 8 04:39:43 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE4CA3F32D6 for ; Tue, 10 Mar 2026 23:49:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773186549; cv=none; b=jhCqLykJ8VpcoV1rlZ1FPv5qarDc85QrXcPYdze9kBY2ooNrnAMtV1nzA/1LQ6edMZOKkRyHZSUvtOqFgb8bouCXZKi3AoDA3n81lMuO193G034PyLUQVlqm9scjmbS18jsZK8NdElfL5b6+FO91HBx5hdv6zVByciPWEXrax0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773186549; c=relaxed/simple; bh=NYFo993tTkJnZVxYyi8yhYGD0rwpt0fJ6Qw67xx6DSM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XCDYQ/CBqgLyViPMFqtTMZBUf/8TupLxrPTmRuDJIJnBVZuJEp+ypD0XXRQtK8yc19EeywKffCCXbd/j61Waf7SKz4TJvtqghuUT1/kRLqUR2bGPbR09BsdjEiVpkhwyyDM4KePnHngrk61azPCwFARauiOpx+p38+GxsL1v8u8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Ab2Exknn; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ab2Exknn" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c738f71723aso3401914a12.2 for ; Tue, 10 Mar 2026 16:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1773186548; x=1773791348; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:from:to:cc:subject:date :message-id:reply-to; bh=dBZkGpoLO8YBRN9uFX112erAiueHmjShOSeCtGMnrhs=; b=Ab2ExknnJ2jiK3t62+6QQjIaGpu/EIYCXMIgURREeh4gK04vwilZkR8DTHAy8rGsNH kuarvQ9qttW/h4WNuuxjOFofdvV4JTNj50Gkrh8+Ois5yagmO+Sipd323TYbz1nqhwN5 83Ws20RKdiMYBC4qkDH5F90E0GbN5HLfz46B8NYBf5NogJWbdlwG0kPJZskVRY+3icDW dkaOTJkZg0n9krN4jbkDojZUh6KyjzDp3u3UIAj5D0B7XF+BxHQH4dx1NXCChpsMvtjn ykRZKfQH4cm8AEv5biQUxSZvVIyEpFaLKL74HiUjrs0T0mc6zqjWyk9l6xVgB1CW59yC iaRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773186548; x=1773791348; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dBZkGpoLO8YBRN9uFX112erAiueHmjShOSeCtGMnrhs=; b=B7vJU3gpTcJLcmzbJkXKVoNpJt9/kVwBib5nmfUz5cAM3QyR0HcGKXOMU7uG0zBgcs H/ME3W7J/KTGHjBgSP84+4170supjHI0nC10k78WUEjjjoyIUiDpvQPz0CNp7nIayb2x MWKJFbU37WImfQhzDTrbJHAoun/hW6viim/vauUuT46YoTk52cs+CtIaaKSqKBMYyk5p k9Yj4OIuv5ZB4eF4cDdXcYI39JLEXn1qTV7zdF22LXI2Lr+f4kOGQDS8/QrKKCGZrbtA qsEDydVDarK7ThVPqrW25/AD6mrfwHTOg2t7TZOtjmy9n3bzMHF6/gbL8eU25u4ve0oD TnzQ== X-Forwarded-Encrypted: i=1; AJvYcCXRFmCO9XowPaP3E0/Q2sUfsylRq2Fuf6+EaeqMvLo6SYNxhd7gVshe5LtYwh5swcndT1ppNDlJ0jXgQ6I=@vger.kernel.org X-Gm-Message-State: AOJu0YweGZD4PXhEUHl4dYEIIG8T4XN1FN6zg1NJV+yrGia1hjpIT6ED bNxHSMYJrcX/V3PGoO4rsmGFYq0qylYKIHyXR5NIHHesJDqm9FP3vG+gudJWIpwdjsbJD2NJZy/ e0jcMdg== X-Received: from pgx11.prod.google.com ([2002:a63:174b:0:b0:c73:846d:a381]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:700e:b0:398:b5c0:587 with SMTP id adf61e73a8af0-398c60d925bmr346250637.42.1773186548043; Tue, 10 Mar 2026 16:49:08 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Mar 2026 16:48:26 -0700 In-Reply-To: <20260310234829.2608037-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260310234829.2608037-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260310234829.2608037-19-seanjc@google.com> Subject: [PATCH 18/21] KVM: SEV: use mutex guard in sev_mem_enc_unregister_region() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jethro Beekman , Alexander Potapenko , "=?UTF-8?q?Carlos=20L=C3=B3pez?=" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Carlos L=C3=B3pez Simplify the error paths in sev_mem_enc_unregister_region() by using a mutex guard, allowing early return instead of using gotos. Signed-off-by: Carlos L=C3=B3pez Link: https://patch.msgid.link/20260120201013.3931334-7-clopez@suse.de Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index d71241e8de95..61347d8508f2 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2814,35 +2814,25 @@ int sev_mem_enc_unregister_region(struct kvm *kvm, struct kvm_enc_region *range) { struct enc_region *region; - int ret; =20 /* If kvm is mirroring encryption context it isn't responsible for it */ if (is_mirroring_enc_context(kvm)) return -EINVAL; =20 - mutex_lock(&kvm->lock); + guard(mutex)(&kvm->lock); =20 - if (!sev_guest(kvm)) { - ret =3D -ENOTTY; - goto failed; - } + if (!sev_guest(kvm)) + return -ENOTTY; =20 region =3D find_enc_region(kvm, range); - if (!region) { - ret =3D -EINVAL; - goto failed; - } + if (!region) + return -EINVAL; =20 sev_writeback_caches(kvm); =20 __unregister_enc_region_locked(kvm, region); =20 - mutex_unlock(&kvm->lock); return 0; - -failed: - mutex_unlock(&kvm->lock); - return ret; } =20 int sev_vm_copy_enc_context_from(struct kvm *kvm, unsigned int source_fd) --=20 2.53.0.473.g4a7958ca14-goog