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 AEDE13CFF58 for ; Tue, 10 Mar 2026 23:49:10 +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=1773186552; cv=none; b=d8+kDLny6DkhKUECv/f59e214SwG15dDAsODedBVm9RFVHee6legbqpqKfCVr3EH7Rs2UrJkzm0zElaaazRRiDKXinmkdae7P8rXFlEimFPc3EmTCZRjEicReLWj44vfG9MIfFnDxzJtZuW8mhSWHSYOHmnJxTXNj+U3eAG9mec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773186552; c=relaxed/simple; bh=4TD9pPi5TlvpvhOzVSMC/8tIlufHssTvpFKZG9MSCS8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jvMBjeVAs427rpb4s4hccYoV/THPY52HuAyaZQW9VqeWAHaEzVZSYBN9dLafyRN/zM1/XKp0gY4znbhuC92IIdhuT78Uc07vMoeu5MxjUZZtbZ+mZr21vhe4002LlmAx6AYMWjjnpmnb3oGaIBihtf1IO5ZXwSTojsloRaYLmkM= 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=nuH1AKLN; 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="nuH1AKLN" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c73c065dd15so1014953a12.0 for ; Tue, 10 Mar 2026 16:49:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1773186550; x=1773791350; 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=rsy02nKNMThAB7RAfyDYV+cekM55MBbRNNmsTH3jOcQ=; b=nuH1AKLN4Qu9XnRijhhKzVf6fWwcVq2ig1WNk/pjBhLdkjzUO8VselpW/TfBEJ1LTi PLeIJ0YgJpsTl51cthif4lCSMN56BwVEkATIJSsnO0KOwtMadMV8lwXwKWMOE31EesAW e4zEPO3pNxHKxXsSIqF89LOIuUPQk5pjvx/cjZWD23BFcdz8vVNP0sySUecXQwjzyqhk zpiJdgt3CgVs2duoVgk28UX0luJPrXazgKwX+c9QOmvUqFJ2XPMZHrc0+V6Vc/WGuk1y HdNFT4kOfAwaSs9dvV9M3pgvwLHrPpEybXiFTXqBCknWtlIdUF5hD4poObXf+1nLsDIB PoDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773186550; x=1773791350; 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=rsy02nKNMThAB7RAfyDYV+cekM55MBbRNNmsTH3jOcQ=; b=G+JJwsJDsDTJ0/IYzGKC4WluxkIk4kdB17FuHbFiBq5gNCvdzUHCBlxHJFy+6ckmAS d/aVqgFjFEvgv9A4o5W6zvu2Mo4zObZ5GuTM1fR7txmvu0kHCttaJ21iLkGA8p3pwE4R y3lkFbvh9w/3vT2GUV8AeQM/0ovSJSHv/r8J5lB892k91pMcLvK9sGye2Lll1MeCyROI eiDqc26S43rTkExX3Wkm0QGccBr2qBJw1BbY09+VhD7917VobVwFLqsjirh/ivrelD/a Sh0T4o3oeHW21L32FNlOcw0F7ekiH1Lp+I4wdxxnE7MMTOmKUqYuJD57/vmn/RbpMmnT 8aDA== X-Forwarded-Encrypted: i=1; AJvYcCW8utbqUiIdlloO2Quxu0SXi8W+BTbH7WVnWcpp804ImTgkZ6Kbkqqt7TlOx/3fVRqNEqTrHeuiUUeIFR4=@vger.kernel.org X-Gm-Message-State: AOJu0YweeiaT/qmZtz2i0sjpiqoEpcZyuc8WqYdkekn0UPibwMqa8PM4 kVS4ReF8CtmgYQn4znfyGhXjlyEsv3uJA3WNS64OwMrHBYgeYEaomd/EfO3/MpkCzq/nFgQnA2C MgKP7UQ== X-Received: from pgww18.prod.google.com ([2002:a05:6a02:2c92:b0:c73:7789:143c]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:400f:b0:398:7b1d:87ce with SMTP id adf61e73a8af0-398c5f94378mr339334637.20.1773186549951; Tue, 10 Mar 2026 16:49:09 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 10 Mar 2026 16:48:27 -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-20-seanjc@google.com> Subject: [PATCH 19/21] KVM: SEV: use mutex guard in snp_handle_guest_req() 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 snp_handle_guest_req() 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-8-clopez@suse.de Signed-off-by: Sean Christopherson --- 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 61347d8508f2..36a33e8ade4d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4174,12 +4174,10 @@ static int snp_handle_guest_req(struct vcpu_svm *sv= m, gpa_t req_gpa, gpa_t resp_ if (!is_sev_snp_guest(&svm->vcpu)) 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); @@ -4192,21 +4190,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_req_certs_err(struct vcpu_svm *svm, u32 vmm_error) --=20 2.53.0.473.g4a7958ca14-goog