From nobody Sun Feb 8 11:25:51 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 9504C43D514 for ; Tue, 20 Jan 2026 20:13:17 +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=1768939999; cv=none; b=HusCoSZanKzOh/CV1edjGzr5U52X00v+2gzLqlAjn4JamG/te91EUeB9ykwnCYPYz9mqcHPXGg/fgwwTeEuPIVB06a2L18sk7w5BV6v9djxMJftmvAbGjOUqU4s5OKX8Gen/9/CsZpIpa+d3jLcEzW3qoJehqO6lpLmUG6/0kUg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768939999; c=relaxed/simple; bh=7vZVjEFQozotu3pAIMQMnmq402Kc52hWcAKb2p85NjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AGgYvZxutOQepASctvyUvkv6otzW4f++Vgn8+VrjRA9Nc7sCJ4iO17/Xa5oAbxEShv/7b0GEug7jatyii40V6BDlHmLvbKHSIC8rKnIqhIkYcnbwhMLg9unvFyf7C2JNnposSV6tZalNz2WqOEE/ENoPoy1Y3gCqmBXV/7t0suA= 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=Ae2pTOmT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=N758PLfl; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Ae2pTOmT; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=N758PLfl; 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="Ae2pTOmT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="N758PLfl"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Ae2pTOmT"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="N758PLfl" 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 9C32F33734; Tue, 20 Jan 2026 20:13:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1768939982; 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=8laTTAit2FwvbftAMZeY2VDYr34Ix/IP7FRUTwr385A=; b=Ae2pTOmTATmF/q87yZZvIxdKHauxWadz9gSICdKkTVJoJxpchTuTUAjJWetETBNo27tu43 TqgR4j+E1srn77nEldkI79qm8ORZnPSPsLrmIXPk9dWn/ujy/0D3uAXMCVsuoiu0WP/2pr 0hw69XOP9rdsyVMNfVi/YLD/+QH+f9U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1768939982; 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=8laTTAit2FwvbftAMZeY2VDYr34Ix/IP7FRUTwr385A=; b=N758PLfl3QSCNCJ1DTXmRJ2uTN2VaopCXiY3/ipZgm2bp6nBNlbDhg71qe06I7EbPrNUAV Dzg9i4xBMLICdsBA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1768939982; 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=8laTTAit2FwvbftAMZeY2VDYr34Ix/IP7FRUTwr385A=; b=Ae2pTOmTATmF/q87yZZvIxdKHauxWadz9gSICdKkTVJoJxpchTuTUAjJWetETBNo27tu43 TqgR4j+E1srn77nEldkI79qm8ORZnPSPsLrmIXPk9dWn/ujy/0D3uAXMCVsuoiu0WP/2pr 0hw69XOP9rdsyVMNfVi/YLD/+QH+f9U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1768939982; 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=8laTTAit2FwvbftAMZeY2VDYr34Ix/IP7FRUTwr385A=; b=N758PLfl3QSCNCJ1DTXmRJ2uTN2VaopCXiY3/ipZgm2bp6nBNlbDhg71qe06I7EbPrNUAV Dzg9i4xBMLICdsBA== 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 C413F3EA63; Tue, 20 Jan 2026 20:13:01 +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 4A+JLM3hb2nRMAAAD6G6ig (envelope-from ); Tue, 20 Jan 2026 20:13:01 +0000 From: =?UTF-8?q?Carlos=20L=C3=B3pez?= To: kvm@vger.kernel.org, seanjc@google.com, pbonzini@redhat.com Cc: pankaj.gupta@amd.com, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Carlos=20L=C3=B3pez?= , Borislav Petkov Subject: [PATCH v2 5/6] KVM: SEV: use mutex guard in snp_handle_guest_req() Date: Tue, 20 Jan 2026 21:10:13 +0100 Message-ID: <20260120201013.3931334-8-clopez@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260120201013.3931334-3-clopez@suse.de> References: <20260120201013.3931334-3-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.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLtm3bmjtwwfkzb5ddzerbmdsq)]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(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-Flag: NO X-Spam-Score: -3.30 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 --- 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 37ff48a876a5..d3fa0963465d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4089,12 +4089,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); @@ -4107,21 +4105,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