From nobody Sun Feb 8 00:11:31 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 47DFD31986D for ; Fri, 19 Dec 2025 11:43:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144623; cv=none; b=H8HPj9hf+HvefaDgq5sdoHCrSotrTPfmPV3MWGmnjMPksQFPoBeMkI5RgnJenwh/5+sGFyUScnJ/1VMCJVwUmHDWstsk7GCOH+v1Nz7Um3duMwjOfLHQhhlqXcG1I4j6GxK9oyVu4LgGgxiHkiR5IR4GqjYAiJt9duB08s97cEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144623; c=relaxed/simple; bh=spCH2RG+AhZVozNevZ6i3mngQBX2bSM3d9ry14WgBX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=kno0NgYWUFeUfXpp/x70gamzLJ2SjowBGNCiEvZtg4nDJuJoO9nTac3vVlRVBt69zM23ZV/NWMsB9eybL5OL7wYdP1gSLqYiRyUjNm6cSZkqw4DSxZmx3ErTCv8DQ4q3vjyU04r0+TV5WTRBP5ck0/hRsAEXD4ITustRZIye08I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=bGK8jW1X; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=z4c40GeC; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=bGK8jW1X; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=z4c40GeC; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="bGK8jW1X"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="z4c40GeC"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="bGK8jW1X"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="z4c40GeC" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2482C33700; Fri, 19 Dec 2025 11:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Zv71gwQn0bju/h7RL9kNTPKzfgg8WZO15eDlR04yHM=; b=bGK8jW1XSsWaxFvYMTdc3acVUOMF8q8aKrEgs2hzK8A4gFvAiwtc/vLIdjTicEp+4rVIWh dRfeuLpoGB1CmMg+L9VTpgfEwPmXMUSZMlbGAxRSQZQwDbFoFimUdsxp69bqnKf3fL/88t VtT8XhqqLMVwHOGtSj/fzL1TJLGVI0A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Zv71gwQn0bju/h7RL9kNTPKzfgg8WZO15eDlR04yHM=; b=z4c40GeCEMr/TW1oHB73U4B5WcnJSedcurQAE94MyBo6WFgK42HxcKhqjmp2lpb5ZdWbVi 7277un7GXALgZjCA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=bGK8jW1X; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=z4c40GeC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Zv71gwQn0bju/h7RL9kNTPKzfgg8WZO15eDlR04yHM=; b=bGK8jW1XSsWaxFvYMTdc3acVUOMF8q8aKrEgs2hzK8A4gFvAiwtc/vLIdjTicEp+4rVIWh dRfeuLpoGB1CmMg+L9VTpgfEwPmXMUSZMlbGAxRSQZQwDbFoFimUdsxp69bqnKf3fL/88t VtT8XhqqLMVwHOGtSj/fzL1TJLGVI0A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Zv71gwQn0bju/h7RL9kNTPKzfgg8WZO15eDlR04yHM=; b=z4c40GeCEMr/TW1oHB73U4B5WcnJSedcurQAE94MyBo6WFgK42HxcKhqjmp2lpb5ZdWbVi 7277un7GXALgZjCA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8027B3EA65; Fri, 19 Dec 2025 11:43:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gMqOHGo6RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:38 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 1/6] KVM: SEV: use mutex guard in snp_launch_update() Date: Fri, 19 Dec 2025 12:41:56 +0100 Message-ID: <20251219114238.3797364-2-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spam-Level: X-Rspamd-Queue-Id: 2482C33700 X-Spam-Flag: NO X-Spam-Score: -4.51 Simplify the error paths in snp_launch_update() by using a mutex guard, allowing early return instead of using gotos. Signed-off-by: Carlos L=C3=B3pez Reviewed-by: Pankaj Gupta --- arch/x86/kvm/svm/sev.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index f59c65abe3cf..1b325ae61d15 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -8,6 +8,7 @@ */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 +#include #include #include #include @@ -2367,7 +2368,6 @@ static int snp_launch_update(struct kvm *kvm, struct = kvm_sev_cmd *argp) struct kvm_memory_slot *memslot; long npages, count; void __user *src; - int ret =3D 0; =20 if (!sev_snp_guest(kvm) || !sev->snp_context) return -EINVAL; @@ -2407,13 +2407,11 @@ static int snp_launch_update(struct kvm *kvm, struc= t kvm_sev_cmd *argp) * initial expected state and better guard against unexpected * situations. */ - mutex_lock(&kvm->slots_lock); + guard(mutex)(&kvm->slots_lock); =20 memslot =3D gfn_to_memslot(kvm, params.gfn_start); - if (!kvm_slot_has_gmem(memslot)) { - ret =3D -EINVAL; - goto out; - } + if (!kvm_slot_has_gmem(memslot)) + return -EINVAL; =20 sev_populate_args.sev_fd =3D argp->sev_fd; sev_populate_args.type =3D params.type; @@ -2425,22 +2423,18 @@ static int snp_launch_update(struct kvm *kvm, struc= t kvm_sev_cmd *argp) argp->error =3D sev_populate_args.fw_error; pr_debug("%s: kvm_gmem_populate failed, ret %ld (fw_error %d)\n", __func__, count, argp->error); - ret =3D -EIO; - } else { - params.gfn_start +=3D count; - params.len -=3D count * PAGE_SIZE; - if (params.type !=3D KVM_SEV_SNP_PAGE_TYPE_ZERO) - params.uaddr +=3D count * PAGE_SIZE; - - ret =3D 0; - if (copy_to_user(u64_to_user_ptr(argp->data), ¶ms, sizeof(params))) - ret =3D -EFAULT; + return -EIO; } =20 -out: - mutex_unlock(&kvm->slots_lock); + params.gfn_start +=3D count; + params.len -=3D count * PAGE_SIZE; + if (params.type !=3D KVM_SEV_SNP_PAGE_TYPE_ZERO) + params.uaddr +=3D count * PAGE_SIZE; =20 - return ret; + if (copy_to_user(u64_to_user_ptr(argp->data), ¶ms, sizeof(params))) + return -EFAULT; + + return 0; } =20 static int snp_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *arg= p) --=20 2.51.0 From nobody Sun Feb 8 00:11:31 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 EC45231A802 for ; Fri, 19 Dec 2025 11:43:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144624; cv=none; b=q6v0MeGc3eBYRxqT2ueVRz14aAj/7r3PhEtcIKcluJ5fV7II9WUlU0My6lC6HW9jwMA9CJ7wyqCqc0IzBoInQ6GJ0CG5ZMiA7Oo945Mh70DrYWXHC7SvzyMiX6QYUkILvylxSyy2Q8uVAAiO4o58P9kPW3P2/In+u1pwoLNgsfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144624; c=relaxed/simple; bh=WT+AweqE2BkW0lbQLjFvfZBROAT0sQXjWX6h2baii5A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HXARTZ9JmaQgv6+9/vNZaIDpg1UkIeQoIgqJO72fzYeWOG/KZ/4eI/3doIjv8KQbHW6fyOXmg8MmsC1TvNtK6NfGuqiYPLzOqF5OXSFQNy9du8eEA8aclpHmXzYsHTu1+rnk5caFo95dbnwJUs9wz+utBmnOJEEGQXCcrRbYAh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=LYRSNgcf; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=c4UYOcss; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fG5CggXi; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=9EYX1+lm; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="LYRSNgcf"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="c4UYOcss"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fG5CggXi"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="9EYX1+lm" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id EAF875BD33; Fri, 19 Dec 2025 11:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=LYRSNgcfbQM8UXqrL8N5JA9GcPz/SR0pRzmqrXO+gmbIcOWBTjwZdDdD92HGvTv/ItjJjJ lAzRnUxBAGBE7Ujh5/wSTF0Qrso+eFcaVPWb6p0rY3mSWM2wBftVzKUmouvXnnDJ4Bd/5M U1+5LouATv7hsa0OeLGuZGV5JeGNvCA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=c4UYOcss3t+vJorOAV9OlUSaX3kPqvXlCAvmlT+eS7bk4OTKXJhF8sUZ20HH+fAeeznlRD 8IlQNNQ0M4EmuaBA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=fG5CggXi+aW9NMAZqGfLrZ1N494WAmjRTmFVS1Bp3zH+faWy0Z5xP1uOM4EcIjXy6y6YTZ 1cyeJjWw1OMLGZtcgvZOcpjNJPxczEpdKRh0kJ861eAhmfE5ct3jgdzrcDLzM97ozaKzcY duXZyfpRfJFMakTSCp2D0nSVmFKfq/I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144619; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5oSZZT48jCa2l0/DziD5ficyj8DE33K7X9MsZAk4m/A=; b=9EYX1+lmjcPOVVzOxv+QZnDx1zsAu4Eh73G5Y6kFz0saMPpCjbX9DR8CFlFHN2ixO5SCGR fjzkS6PYdHykieAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 553913EA66; Fri, 19 Dec 2025 11:43:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SIIjEms6RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:39 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 2/6] KVM: SEV: use mutex guard in sev_mem_enc_ioctl() Date: Fri, 19 Dec 2025 12:41:57 +0100 Message-ID: <20251219114238.3797364-3-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.29 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.19)[-0.955]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo,sev_cmd.id:url] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -3.29 Simplify the error paths in sev_mem_enc_ioctl() by using a mutex guard, allowing early return instead of using gotos. Signed-off-by: Carlos L=C3=B3pez Reviewed-by: Pankaj Gupta --- arch/x86/kvm/svm/sev.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 1b325ae61d15..0ee1b77aeec5 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2575,30 +2575,24 @@ int sev_mem_enc_ioctl(struct kvm *kvm, void __user = *argp) if (copy_from_user(&sev_cmd, argp, sizeof(struct kvm_sev_cmd))) return -EFAULT; =20 - mutex_lock(&kvm->lock); + guard(mutex)(&kvm->lock); =20 /* Only the enc_context_owner handles some memory enc operations. */ if (is_mirroring_enc_context(kvm) && - !is_cmd_allowed_from_mirror(sev_cmd.id)) { - r =3D -EINVAL; - goto out; - } + !is_cmd_allowed_from_mirror(sev_cmd.id)) + return -EINVAL; =20 /* * Once KVM_SEV_INIT2 initializes a KVM instance as an SNP guest, only * allow the use of SNP-specific commands. */ - if (sev_snp_guest(kvm) && sev_cmd.id < KVM_SEV_SNP_LAUNCH_START) { - r =3D -EPERM; - goto out; - } + if (sev_snp_guest(kvm) && sev_cmd.id < KVM_SEV_SNP_LAUNCH_START) + return -EPERM; =20 switch (sev_cmd.id) { case KVM_SEV_ES_INIT: - if (!sev_es_enabled) { - r =3D -ENOTTY; - goto out; - } + if (!sev_es_enabled) + return -ENOTTY; fallthrough; case KVM_SEV_INIT: r =3D sev_guest_init(kvm, &sev_cmd); @@ -2667,15 +2661,12 @@ int sev_mem_enc_ioctl(struct kvm *kvm, void __user = *argp) r =3D snp_launch_finish(kvm, &sev_cmd); break; default: - r =3D -EINVAL; - goto out; + return -EINVAL; } =20 if (copy_to_user(argp, &sev_cmd, sizeof(struct kvm_sev_cmd))) r =3D -EFAULT; =20 -out: - mutex_unlock(&kvm->lock); return r; } =20 --=20 2.51.0 From nobody Sun Feb 8 00:11:31 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 38D1B324B30 for ; Fri, 19 Dec 2025 11:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144635; cv=none; b=IyHTTSvNTXK+VTVdDQb3hj1Yzqc2puZQTTo81cR4D1LLqumQ5T9Fk2xy62tTdiDTZ/jbF7fb0+IgbhXg1pRJapvgCIoKxG5u5drWs5iwJQqpEGyjKmZV7woPD3me6fRsRz6Q2l0D/YVFhoGigCOtgzhfPL9rdG068UhiAH2ngg0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144635; c=relaxed/simple; bh=0llsXn1km+v1kZCm7eAn8T4M52/DVBBZTXvc9qbwkT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XpyjDLGZ61HNNBwS/uDyPd/vSiFc/d+TzM6+r1M89iNSTeH/VvLzbI14S1fngztKJJ0zQQi3BS4lQn73Nj4rzUN4JQp8KQ+bCWC/Eh47Kg516wc6eUTrr+VkBt57RV8+gHhuLXy4aKRhbYU+JcTBnz1nybxh7F/z0h3KFg1+JtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=AAyICD07; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Qu9nfYH9; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=AAyICD07; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Qu9nfYH9; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="AAyICD07"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Qu9nfYH9"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="AAyICD07"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Qu9nfYH9" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C027F33714; Fri, 19 Dec 2025 11:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h7AGDWWK7oj01hSc4RtgIJ4/P00xw0qz4cWje4kcoRI=; b=AAyICD07buC4+3LonyP+rCf7tMB3bqoogye5stxAG/B7vZvgxU6PaIjNQXETGlv+CO6J6N YuR0nkqg2JxegpOKZzO0J4UdAAf8U9xa1FZbIUNUYUDMJ0uq5aQd5Ue7B0JCvmzaCrPJUK lR59kiWM7V5UCijJ54ZKRrBHWpue3Pw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h7AGDWWK7oj01hSc4RtgIJ4/P00xw0qz4cWje4kcoRI=; b=Qu9nfYH9mf4no93L99E6Oans8SBNGJmmQIavNWjweKy721xOjdxyltXMDR7CjNU7YFk1Tt 5EDsfrJyUwuDMhAw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h7AGDWWK7oj01hSc4RtgIJ4/P00xw0qz4cWje4kcoRI=; b=AAyICD07buC4+3LonyP+rCf7tMB3bqoogye5stxAG/B7vZvgxU6PaIjNQXETGlv+CO6J6N YuR0nkqg2JxegpOKZzO0J4UdAAf8U9xa1FZbIUNUYUDMJ0uq5aQd5Ue7B0JCvmzaCrPJUK lR59kiWM7V5UCijJ54ZKRrBHWpue3Pw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144620; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h7AGDWWK7oj01hSc4RtgIJ4/P00xw0qz4cWje4kcoRI=; b=Qu9nfYH9mf4no93L99E6Oans8SBNGJmmQIavNWjweKy721xOjdxyltXMDR7CjNU7YFk1Tt 5EDsfrJyUwuDMhAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2A2E33EA63; Fri, 19 Dec 2025 11:43:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cEOfB2w6RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:40 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 3/6] KVM: SEV: use mutex guard in sev_mem_enc_register_region() Date: Fri, 19 Dec 2025 12:41:58 +0100 Message-ID: <20251219114238.3797364-4-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.26 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.16)[-0.796]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -3.26 Simplify the error paths in sev_mem_enc_register_region() by using a mutex guard, allowing early return instead of using a goto. Signed-off-by: Carlos L=C3=B3pez --- arch/x86/kvm/svm/sev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 0ee1b77aeec5..253f2ae24bfc 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2691,13 +2691,13 @@ int sev_mem_enc_register_region(struct kvm *kvm, if (!region) return -ENOMEM; =20 - mutex_lock(&kvm->lock); + guard(mutex)(&kvm->lock); region->pages =3D sev_pin_memory(kvm, range->addr, range->size, ®ion->= npages, FOLL_WRITE | FOLL_LONGTERM); if (IS_ERR(region->pages)) { ret =3D PTR_ERR(region->pages); - mutex_unlock(&kvm->lock); - goto e_free; + kfree(region); + return ret; } =20 /* @@ -2714,13 +2714,8 @@ int sev_mem_enc_register_region(struct kvm *kvm, region->size =3D range->size; =20 list_add_tail(®ion->list, &sev->regions_list); - mutex_unlock(&kvm->lock); =20 return ret; - -e_free: - kfree(region); - return ret; } =20 static struct enc_region * --=20 2.51.0 From nobody Sun Feb 8 00:11:31 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 A0F0C327209 for ; Fri, 19 Dec 2025 11:44:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144642; cv=none; b=uw7Ht0YHwwWpj5K+5oiR4fP7/iRgYYFZLDp+jzYKzf8bH494/YJG5RkO04PzF0Rk4hMJqIx8m/mzDhA1aRRpHQ88m1GZVrJKznlXUv3D0e22Y5psvHo8abl/QtrvObBPeYQzB5n0m7jmFv0/6+RcZdmcqYQlRcJe3GjBNZS3iHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144642; c=relaxed/simple; bh=nvs45k15qSAWwP1D7aAueT0+dvZrviq0GNvjz2sG5tk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VSRrQy6Ediz4s32FtRX+FRI3oLW8zsZOb2pcWNRay8f6rTqTqcS06ZmfNlnV+UubSqLj5k7l/t8uXBqbD0kzWCqvTy9DwvWQwthF0yWcQMEEIIMtUPiiiXusjUCIeg8s+M4+LpdNLYj7KUvgcbS/ddRol5AEfi0/lM1f9CKFgiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ouaaDgrJ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ePPflok1; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ouaaDgrJ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=ePPflok1; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ouaaDgrJ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ePPflok1"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ouaaDgrJ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="ePPflok1" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 91E5333724; Fri, 19 Dec 2025 11:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144621; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tO0WDPTe4/z8U6jBoNRvL38G7tChL/kSg8GOpQTpU0Y=; b=ouaaDgrJhWYJrOMuYVP1uwQiiSOvcWJIXX0soTbMu8DSGUHSo4FtqztSJ3lDhFHmptAyoq btODCkRJnlEk9qgXQHNusEQb1SnCSM+lqdw1Z81IAXuTC/b9f+WU90qirAgNMdY+BuAkvE KbpOzMuOVi+ZelM9hs6LiMqfiyUW5bE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144621; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tO0WDPTe4/z8U6jBoNRvL38G7tChL/kSg8GOpQTpU0Y=; b=ePPflok1V4RIc68JZYKYuWHt+D6wuVKaCy/E25PEi+aX97okqK4HMkf4s8EBjs98kEjxLW heD/Q4rweAUz3DCg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144621; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tO0WDPTe4/z8U6jBoNRvL38G7tChL/kSg8GOpQTpU0Y=; b=ouaaDgrJhWYJrOMuYVP1uwQiiSOvcWJIXX0soTbMu8DSGUHSo4FtqztSJ3lDhFHmptAyoq btODCkRJnlEk9qgXQHNusEQb1SnCSM+lqdw1Z81IAXuTC/b9f+WU90qirAgNMdY+BuAkvE KbpOzMuOVi+ZelM9hs6LiMqfiyUW5bE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144621; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tO0WDPTe4/z8U6jBoNRvL38G7tChL/kSg8GOpQTpU0Y=; b=ePPflok1V4RIc68JZYKYuWHt+D6wuVKaCy/E25PEi+aX97okqK4HMkf4s8EBjs98kEjxLW heD/Q4rweAUz3DCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id F3AD43EA63; Fri, 19 Dec 2025 11:43:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id mGHcOGw6RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:40 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 4/6] KVM: SEV: use mutex guard in sev_mem_enc_unregister_region() Date: Fri, 19 Dec 2025 12:41:59 +0100 Message-ID: <20251219114238.3797364-5-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Flag: NO X-Spam-Score: -3.26 X-Spam-Level: X-Spamd-Result: default: False [-3.26 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.16)[-0.803]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLtm3bmjtwwfkzb5ddzerbmdsq)]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo] 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 Reviewed-by: Pankaj Gupta --- 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 253f2ae24bfc..47ff5267ab01 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2746,35 +2746,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.51.0 From nobody Sun Feb 8 00:11:31 2026 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 5E6AB32824A for ; Fri, 19 Dec 2025 11:44:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144650; cv=none; b=N3gn/ABG/QbLHG5JjzGpIJTDrKhythxYRnmHMxhptKdNDC/AAuBJyiKD5XklncR4u+yd2cPWBV/nZW8d9++aq4L+kKNIQZOf6En4t/COhhcOTdXmKgkp+h32VZzq8t7YyY/xvHyENhfW9VRgTFuaglZ2rHbkH8nKLb6SB7NrFxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144650; c=relaxed/simple; bh=ZmJW1XHRh7J6YAgXrs205TH4OgyX9T2zXUIMScXP4dU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ayzEtKk22aSqAk1F3wj0nFp8o57bCDRdeUoA/bl5uOniAjcose/KaLxIesDoUgDRVfIQLSV9Is4DZraMqJ2OanvT3eeBEIvbC9BWWwFZ3FkEk33vRJOqWmz8RIpFKf6KFEHTGednMEWaNfMNI2rI6D6XIog4qvjcotm0IMlu0ns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=LsE4AYZK; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=eX3tYUeM; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=LsE4AYZK; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=eX3tYUeM; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="LsE4AYZK"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="eX3tYUeM"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="LsE4AYZK"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="eX3tYUeM" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 70B1833729; Fri, 19 Dec 2025 11:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144622; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pdYd+JxqfFxsAWL3QZlRpvclOaJf7rcIjlPpiEXRzHU=; b=LsE4AYZKc1S6Sq3gkpVitGL0ZEWyCtQNeGPK/J3zk5tXrTy8MRG3/EGyT9hRllr+mtnZ+/ 8NSzxArdkDgYDFjjG9unFOBMPeXKiRMSZoLvHNEmVNSx9eiCOiE6MydQ2zBcAQiUrm5H3e LTcYheiRWlZcWY8paLRBrY+64aqcmv4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144622; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pdYd+JxqfFxsAWL3QZlRpvclOaJf7rcIjlPpiEXRzHU=; b=eX3tYUeMeG3IcOj25YI3QY9f1QMdr0eaPIy95R26k7BvGxITG7iTBpZE/2scOR8L3UXCNJ UJgSrdSs0DwvlkBw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LsE4AYZK; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=eX3tYUeM DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144622; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pdYd+JxqfFxsAWL3QZlRpvclOaJf7rcIjlPpiEXRzHU=; b=LsE4AYZKc1S6Sq3gkpVitGL0ZEWyCtQNeGPK/J3zk5tXrTy8MRG3/EGyT9hRllr+mtnZ+/ 8NSzxArdkDgYDFjjG9unFOBMPeXKiRMSZoLvHNEmVNSx9eiCOiE6MydQ2zBcAQiUrm5H3e LTcYheiRWlZcWY8paLRBrY+64aqcmv4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144622; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pdYd+JxqfFxsAWL3QZlRpvclOaJf7rcIjlPpiEXRzHU=; b=eX3tYUeMeG3IcOj25YI3QY9f1QMdr0eaPIy95R26k7BvGxITG7iTBpZE/2scOR8L3UXCNJ UJgSrdSs0DwvlkBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C99063EA63; Fri, 19 Dec 2025 11:43:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gFmdLm06RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:41 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 5/6] KVM: SEV: use mutex guard in snp_handle_guest_req() Date: Fri, 19 Dec 2025 12:42:00 +0100 Message-ID: <20251219114238.3797364-6-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spam-Flag: NO X-Spam-Score: -4.51 X-Rspamd-Queue-Id: 70B1833729 X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_RATELIMIT(0.00)[to_ip_from(RLh4pfje1bfbim5oauyuywcp9b)]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:dkim,suse.de:email]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Level: Simplify the error paths in snp_handle_guest_req() by using a mutex guard, allowing early return instead of using gotos. Signed-off-by: Carlos L=C3=B3pez Reviewed-by: Pankaj Gupta --- arch/x86/kvm/svm/sev.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 47ff5267ab01..5f46b7f073b0 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4090,12 +4090,10 @@ static int snp_handle_guest_req(struct vcpu_svm *sv= m, gpa_t req_gpa, gpa_t resp_ if (!sev_snp_guest(kvm)) return -EINVAL; =20 - mutex_lock(&sev->guest_req_mutex); + guard(mutex)(&sev->guest_req_mutex); =20 - if (kvm_read_guest(kvm, req_gpa, sev->guest_req_buf, PAGE_SIZE)) { - ret =3D -EIO; - goto out_unlock; - } + if (kvm_read_guest(kvm, req_gpa, sev->guest_req_buf, PAGE_SIZE)) + return -EIO; =20 data.gctx_paddr =3D __psp_pa(sev->snp_context); data.req_paddr =3D __psp_pa(sev->guest_req_buf); @@ -4108,21 +4106,16 @@ static int snp_handle_guest_req(struct vcpu_svm *sv= m, gpa_t req_gpa, gpa_t resp_ */ ret =3D sev_issue_cmd(kvm, SEV_CMD_SNP_GUEST_REQUEST, &data, &fw_err); if (ret && !fw_err) - goto out_unlock; + return ret; =20 - if (kvm_write_guest(kvm, resp_gpa, sev->guest_resp_buf, PAGE_SIZE)) { - ret =3D -EIO; - goto out_unlock; - } + if (kvm_write_guest(kvm, resp_gpa, sev->guest_resp_buf, PAGE_SIZE)) + return -EIO; =20 /* No action is requested *from KVM* if there was a firmware error. */ svm_vmgexit_no_action(svm, SNP_GUEST_ERR(0, fw_err)); =20 - ret =3D 1; /* resume guest */ - -out_unlock: - mutex_unlock(&sev->guest_req_mutex); - return ret; + /* resume guest */ + return 1; } =20 static int snp_handle_ext_guest_req(struct vcpu_svm *svm, gpa_t req_gpa, g= pa_t resp_gpa) --=20 2.51.0 From nobody Sun Feb 8 00:11:31 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 537B9324B30 for ; Fri, 19 Dec 2025 11:43:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144630; cv=none; b=IfDDyXod9hqCP+Az3f7K11Ai8FtQmBZ5d8aubWojGnN2pHTEoyyF8S/ZDElVTc3e3cy0nSuurddQlfzeTp04iBUxbqeDpyzSd7CjmtdIPEAr+ZZeC4mNxsd7rzY+utcaljhLja7XEelNfoPX4SiiqyX8B8HtWeZ9Bq5CneScHOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766144630; c=relaxed/simple; bh=Wo/Ela2ilLDFT8XBQJ2ywxMks4RZu3xs5fuwQRV5+xY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VN7JMeP1KMnYfeI1b1uHCpGfS5oRBt8r6Yfif/2CBcrAK64O7hfbpLGn/jIx5rQ09ePhicnAZwn4EGu6kY6tdG+XfC2CHcJjAzJX4UxCXH46Ot1wHtNEAUX6pi3UZ6xHo8xzmgE4VJzKzY9c+IRojn7I811S2sCPxt1eBZB4g5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=oKT3BvZl; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Noc9Ym+3; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=oKT3BvZl; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Noc9Ym+3; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="oKT3BvZl"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Noc9Ym+3"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="oKT3BvZl"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Noc9Ym+3" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 37B2D5BD3A; Fri, 19 Dec 2025 11:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144623; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSOU5S/XpMPdboICzM5MHFHsCug3RScTZ+tMl6SAx3c=; b=oKT3BvZlKRqgg7mu6PhRQEZtmYP0w/JCQ54csGRrLNlt3Y6yYHdNMboDLAu80cGtciswFS gnQ+RdVkH6FP7zh+4zECCK/2bDGnL/PeoxPVs9dr/wksaFgRYwQdhwjl8FKVzF3UY8pj1O 6Ww2NPn9j0h/0c5L318+u3wdb0Fo/rI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144623; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSOU5S/XpMPdboICzM5MHFHsCug3RScTZ+tMl6SAx3c=; b=Noc9Ym+35CzxB4Ky2KZ+ZckmMcYWqEBBV3aNFQnwQJWNHdOVFPE7x5JqAwkjEDWVPYI1bp mDfdMFqUq0+AW8Cg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=oKT3BvZl; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Noc9Ym+3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766144623; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSOU5S/XpMPdboICzM5MHFHsCug3RScTZ+tMl6SAx3c=; b=oKT3BvZlKRqgg7mu6PhRQEZtmYP0w/JCQ54csGRrLNlt3Y6yYHdNMboDLAu80cGtciswFS gnQ+RdVkH6FP7zh+4zECCK/2bDGnL/PeoxPVs9dr/wksaFgRYwQdhwjl8FKVzF3UY8pj1O 6Ww2NPn9j0h/0c5L318+u3wdb0Fo/rI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766144623; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hSOU5S/XpMPdboICzM5MHFHsCug3RScTZ+tMl6SAx3c=; b=Noc9Ym+35CzxB4Ky2KZ+ZckmMcYWqEBBV3aNFQnwQJWNHdOVFPE7x5JqAwkjEDWVPYI1bp mDfdMFqUq0+AW8Cg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9AD9D3EA63; Fri, 19 Dec 2025 11:43:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id qA02I246RWnWGgAAD6G6ig (envelope-from ); Fri, 19 Dec 2025 11:43:42 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= Subject: [PATCH 6/6] KVM: SEV: use scoped mutex guard in sev_asid_new() Date: Fri, 19 Dec 2025 12:42:01 +0100 Message-ID: <20251219114238.3797364-7-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251219114238.3797364-1-clopez@suse.de> References: <20251219114238.3797364-1-clopez@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.998]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; R_RATELIMIT(0.00)[to_ip_from(RLh4pfje1bfbim5oauyuywcp9b)]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:email,suse.de:dkim,suse.de:mid] X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spam-Level: X-Rspamd-Queue-Id: 37B2D5BD3A X-Spam-Flag: NO X-Spam-Score: -4.51 Simplify the lock management in sev_asid_new() by using a mutex guard, automatically releasing the mutex when following the goto. Signed-off-by: Carlos L=C3=B3pez --- arch/x86/kvm/svm/sev.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 5f46b7f073b0..95430d456a6f 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -232,24 +232,20 @@ static int sev_asid_new(struct kvm_sev_info *sev, uns= igned long vm_type) return ret; } =20 - mutex_lock(&sev_bitmap_lock); - + scoped_guard(mutex, &sev_bitmap_lock) { again: - asid =3D find_next_zero_bit(sev_asid_bitmap, max_asid + 1, min_asid); - if (asid > max_asid) { - if (retry && __sev_recycle_asids(min_asid, max_asid)) { - retry =3D false; - goto again; + asid =3D find_next_zero_bit(sev_asid_bitmap, max_asid + 1, min_asid); + if (asid > max_asid) { + if (retry && __sev_recycle_asids(min_asid, max_asid)) { + retry =3D false; + goto again; + } + ret =3D -EBUSY; + goto e_uncharge; } - mutex_unlock(&sev_bitmap_lock); - ret =3D -EBUSY; - goto e_uncharge; + __set_bit(asid, sev_asid_bitmap); } =20 - __set_bit(asid, sev_asid_bitmap); - - mutex_unlock(&sev_bitmap_lock); - sev->asid =3D asid; return 0; e_uncharge: --=20 2.51.0