From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 ECB413B3C05 for ; Mon, 31 Aug 2026 22:20:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788214815; cv=none; b=krp4Ebv5NV2d0/+9ShGEFwBaZPSp5wH9TGJWmexrmQNbRf66gPDYefYxOxQPt6DA0YOuDy4akhsdWW4JTuomrOrW209qHOEi7N6fa/0jhyLPu9R4426vW60TT3uTrMVcwtpFDK3JyFf0ZXXBvkBeFxxKzsJtcU+9U90m8VPyRYg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788214815; c=relaxed/simple; bh=gmzijG9PAcEqOJhp3n70Eia4RORz06OKWjKNHHshlF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kK1V7FVUrP8k9IGJqFXCR3DHb5t1fyzpz//enMMHfdYjT/eh8V73/u0mXV76/pMP4aSABoxBapPssiOf1tg8tPHyLSR/4HmSelycztksAN9EIhhT5QgczD6gheAPrmBix6XBZlg1S28Vn0OBdzMCBDBcjzzA4gDKvzYQy32VgtI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nDFLaNIv; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nDFLaNIv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D0101F00ACA; Mon, 31 Aug 2026 22:20:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788214813; bh=yd/Av3DRImPKYa6UhAVSS8Xa37jpgKChBOdA91yQoHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nDFLaNIvHNKitbwFME4aBDrOJpC5l7tdj9vcNg4jYXJuQWo7n+UnM09b5p89PiqaZ TgFDQvtMEPe5Q7hePKXNWlcBL8kcF/uRxLnnMiVxGbpXHC/DVCRiZ7UV9v/AK8Vc+q Hy+6g2G9IYeIaZ+qc7SLY6EZvzq8gGVj6FW8/lh4oISUgbkShL+Q5dv772wKgzTPxB qFdAB25uKZOG4Hv8hQCd54coe4ojVNm1PhQX4CzgRNnEMq6OCKtZVi1oYVUp+RP/Xb eZqVlyrqiw8yrUIUtzIMMd+WtANdb0XaKD9zepbshf3MyJZ0VmVsHMc3tocSmRqBxu HRu98gNVVMs6A== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Christopherson , Michael Roth , Sasha Levin Subject: [PATCH 7.2.y 3/8] KVM: SEV: Mark vCPU RUNNABLE after AP_CREATE, even if VMSA is unusable Date: Mon, 31 Aug 2026 18:20:05 -0400 Message-ID: <20260831222010.1859431-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260831222010.1859431-1-sashal@kernel.org> References: <2026083158-cornmeal-overhang-51bb@gregkh> <20260831222010.1859431-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Christopherson [ Upstream commit 98ade8c48c28c227fe2e80e545ff0c57cd4712a3 ] Always mark the vCPU as RUNNABLE after responding to AP_CREATE, even if the guest-specified VMSA is unusable, e.g. isn't backed by a memslot or doesn't have a backing guest_memfd page. If the VMSA is unusable, leaving the vCPU in a non-running state will effectively hang the vCPU instead of reporting an error to userspace. This will also allow retrying the VMSA load in the future, to fix a bug where KVM doesn't honor guest_memfd invalidation events, e.g. if AP_CREATION races with PUNCH_HOLE. Cc: stable@vger.kernel.org # 6.12.x Reviewed-by: Michael Roth Link: https://patch.msgid.link/20260709204948.1988414-4-seanjc@google.com Signed-off-by: Sean Christopherson Stable-dep-of: d1a3c2162334 ("KVM: SEV: Forcefully invalidate SNP VMSA if its backing gmem page is zapped") Signed-off-by: Sasha Levin --- arch/x86/kvm/svm/sev.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 25e5948ccc19f..e105335f4da79 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4047,9 +4047,6 @@ static void sev_snp_reload_vmsa(struct kvm_vcpu *vcpu, gpa_t gpa) svm->sev_es.snp_guest_vmsa_gpa = gpa; svm->vmcb->control.vmsa_pa = pfn_to_hpa(pfn); - /* Mark the vCPU as runnable */ - kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); - /* * gmem pages aren't currently migratable, but if this ever changes * then care should be taken to ensure svm->sev_es.vmsa is pinned @@ -4081,6 +4078,15 @@ static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) svm->sev_es.snp_pending_vmsa_gpa = INVALID_PAGE; sev_snp_reload_vmsa(vcpu, gpa); + + /* + * Mark the vCPU as runnable for CREATE requests, indicated by a valid + * VMSA GPA, even if installing the VMSA failed, so that KVM_RUN will + * fail instead of blocking indefinitely and hanging the vCPU, e.g. if + * the backing guest_memfd page is unavailable. + */ + if (VALID_PAGE(gpa)) + kvm_set_mp_state(vcpu, KVM_MP_STATE_RUNNABLE); } static int sev_snp_ap_creation(struct vcpu_svm *svm) -- 2.53.0