From nobody Thu Apr 9 16:59:08 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0755481FA0; Fri, 6 Mar 2026 21:09:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772831351; cv=none; b=XSRR5W1CslxBQfuFCBfKsuo5jLSPEl+6h6JcGnlldh7dpaGp1sw0caBbON6cjIDWInAHduFuI1ryvprF0h1HZGqsmspKyryekv0CMyiN2hAeoWRZMXmcu4eA6sx+8WTHUEkKs4KiNJUQguNk1ezh8RLd2M99n1huEWdoqGxS19s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772831351; c=relaxed/simple; bh=zlFgROWLnxVwC4QoyF8FYkdqnZDZOTfxmemo5hzE2nU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M8Y3AOIkgl5T8TJkRzpUETZf3aWTV9mJvAEsRZd8ueWP/WI6Fdch0ZpGU0SeP+k1+s5Fa8+imrtEV9jlfWsHQ3R0nSYsNRAfjuMYQAkvNdtPEdk/aEQceAsp6DqDEQZeWAqjwa/9tPaLfoZf09xCG8FiG4FFdtbrtCkYiye5ymQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=msS/vTXy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="msS/vTXy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65091C4CEF7; Fri, 6 Mar 2026 21:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772831351; bh=zlFgROWLnxVwC4QoyF8FYkdqnZDZOTfxmemo5hzE2nU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=msS/vTXy4vrAatHVDXTNfTlDGkIePu0rWzonK+un3oboazCH4K0BjDCqwDG42rFgg kbRGO+Z6uwHka6urunH6r2Ofu60D7ODtGzmVRhJgqohILp43ZZU3wNBYKR4dtysufQ 5i4oGv2mVcY7kz0l5/uXo7PPdtTafg/fLlQNcquSKza24EtERq2l0WRpPtSu2iedZ/ co25pPLrJLwFX7gmEflhZi7ctL2l+jrLyqIqw13fYSVp3UErBQgH1wzDRjyt42A4p0 r9wZQeTMrh7786NS6e6Hd4SpKqUFbKFCjbHJP8XfJf3INOqsWg6zaeab8bM8dcqOqX oIShVRYo+NWng== From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , Jim Mattson , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Subject: [PATCH v2 2/6] KVM: nSVM: Simplify error handling of nested_svm_copy_vmcb12_to_cache() Date: Fri, 6 Mar 2026 21:08:56 +0000 Message-ID: <20260306210900.1933788-3-yosry@kernel.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260306210900.1933788-1-yosry@kernel.org> References: <20260306210900.1933788-1-yosry@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" nested_svm_vmrun() currently stores the return value of nested_svm_copy_vmcb12_to_cache() in a local variable 'err', separate from the generally used 'ret' variable. This is done to have a single call to kvm_skip_emulated_instruction(), such that we can store the return value of kvm_skip_emulated_instruction() in 'ret', and then re-check the return value of nested_svm_copy_vmcb12_to_cache() in 'err'. The code is unnecessarily confusing. Instead, call kvm_skip_emulated_instruction() in the failure path of nested_svm_copy_vmcb12_to_cache() if the return value is not -EFAULT, and drop 'err'. Suggested-by: Sean Christopherson Signed-off-by: Yosry Ahmed --- arch/x86/kvm/svm/nested.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index b191c6cab57db..6d4c053778b21 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -1079,7 +1079,7 @@ static int nested_svm_copy_vmcb12_to_cache(struct kvm= _vcpu *vcpu, u64 vmcb12_gpa int nested_svm_vmrun(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm =3D to_svm(vcpu); - int ret, err; + int ret; u64 vmcb12_gpa; struct vmcb *vmcb01 =3D svm->vmcb01.ptr; =20 @@ -1104,19 +1104,20 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) return -EINVAL; =20 vmcb12_gpa =3D svm->vmcb->save.rax; - err =3D nested_svm_copy_vmcb12_to_cache(vcpu, vmcb12_gpa); - if (err =3D=3D -EFAULT) { + ret =3D nested_svm_copy_vmcb12_to_cache(vcpu, vmcb12_gpa); + + /* + * Advance RIP if #GP or #UD are not injected, but otherwise + * stop if copying and checking vmcb12 failed. + */ + if (ret =3D=3D -EFAULT) { kvm_inject_gp(vcpu, 0); return 1; + } else if (ret) { + return kvm_skip_emulated_instruction(vcpu); } =20 - /* - * Advance RIP if #GP or #UD are not injected, but otherwise stop if - * copying and checking vmcb12 failed. - */ ret =3D kvm_skip_emulated_instruction(vcpu); - if (err) - return ret; =20 /* * Since vmcb01 is not in use, we can use it to store some of the L1 --=20 2.53.0.473.g4a7958ca14-goog