From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 819FA38C2C0 for ; Fri, 26 Jun 2026 23:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782515681; cv=none; b=Dmyv3i2+y88rEanhOTMDJu12HE7OjWuJI80MeFeBPbMJdXRyxe48XuA2MvTEQtyq3gnrkLM5tqOX5bwhHphsVgDB4sFNDNuvvSu8/vEwt5wPADtfDZo5BCBfT50eh4Yo/9zHquJilcXADJPfd2DZWNAf6eQFZnBJs0U0TPbi7fg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782515681; c=relaxed/simple; bh=DBIf3+VFDZYptvruqD6ltoPaucEpf3ClGhtQ8Sb8YIg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=htQBc/da5NlxE/UM5iQCFOc3hNKcV+QrbyaMHJc51SLojVx2nG5GY88W00HuxyDd94B4mjmITXA0vTmyPRIwiFw8OmZ1TKehk3IjbeS4oE4gxY+WSk7Zd4bh7GHnIXDCq8qZsJWP33k/xhHS71kRpPq5Xm4udPS+bDTokgtxvJc= 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=XcRYWEZ1; arc=none smtp.client-ip=209.85.214.201 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="XcRYWEZ1" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2c82843005eso9341745ad.1 for ; Fri, 26 Jun 2026 16:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782515670; x=1783120470; darn=vger.kernel.org; h=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=23IT/I8BFI3FVtFLLsXh6XFyUDIWbMpHRUduaQab4Hg=; b=XcRYWEZ1BnjfcqXl2GPzpOZTDxb+pE/JFMJJozO9kPzdjMekNT4aqjIpUE2862r2mJ 7YXZP+yKFMAbd1ypuZEyedvgLC1Qs+yPiESxq/+l+ndxTwDEZxqpVPTupcY0KppOmATL ooXr7LLJEUR576SWjRfLv8lZKKOAA0aEc7lpfII7YvW2kK87pKcdSTK5tuejJrHc5/Bw JpALUpkUZQGsiAUhBQmIdNBzSr/N3qL60XMXEF8xX50sVP9HTEKV23cqz3M7yB8uSNH5 Lm8PfkAWRXKIIf8m964M4ufRpryJPAc0ZWIVm4gzrJWjlGcuixaBCrNo8k7n84S8DaAz gfkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782515670; x=1783120470; h=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=23IT/I8BFI3FVtFLLsXh6XFyUDIWbMpHRUduaQab4Hg=; b=UGrU13STBbMy2O+9fMWrVZsAzV0B7vOw52n3o9mlTZJKLffBFk4eQxORupxE0pY/Ae 6uI/e949tPLjvwdwHB7q72PU0PUOdEnmsEbQwnOudOPSlUIBqrT7W3BWN1f6OVB/tP/a 1NRA6NOEO6M9cBg7bpA9p13emy9n+WZeoyd10hMynrYfn84YZm2txZ53ahFh7BGcWQ6d WLT9UqfOzUb+BXOIVTaUIVdXc2Ibz/bn2NhifppocGYr86vbWvnqoteIFXAc7Qvu1sw6 aYvahgcDRoLSDG0VMOhh18JCUVsLtA3BlbcqlMfqVquNxopyfPimxR4pUPsk11Blzkg5 ztuQ== X-Forwarded-Encrypted: i=1; AFNElJ/Pfo1Gy1Tmqba4QshIr4QMXPwwinH88Z4BemIhPR/wg4AXZEbLGC3jyj16NB+uXtQ9XAKWLa0H165VEJc=@vger.kernel.org X-Gm-Message-State: AOJu0YzBR3uY+P7ImGWA8nQB+XuKpcb+0FuhCOyt9fyykdTV3FMNFXHp ofM6NWHQWMzVyePgAJorYmR6BZK0gEB26eJM5dleeR8dhaYZgo0smUOmpqabXEXQunUqqTMO9I6 7l49vSA== X-Received: from pgbo37.prod.google.com ([2002:a63:5a25:0:b0:c93:e04b:d9ad]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:d045:b0:3a2:d838:bfdb with SMTP id adf61e73a8af0-3bd4ae979ccmr9780194637.29.1782515669661; Fri, 26 Jun 2026 16:14:29 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Jun 2026 16:14:16 -0700 In-Reply-To: <20260626231416.3943216-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: <20260626231416.3943216-1-seanjc@google.com> X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260626231416.3943216-10-seanjc@google.com> Subject: [PATCH v2 9/9] KVM: SEV: Mark vCPU has having guest-provided VMSA even if its invalid From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Hyunwoo Kim , Tom Lendacky , Michael Roth , "=?UTF-8?q?J=C3=B6rg=20R=C3=B6del?=" , Fuad Tabba , Ackerley Tng Content-Type: text/plain; charset="UTF-8" Track the guest as having a guest-provided VMSA as soon as control.vmsa_pa is invalidated, instead of waiting to see if the guest-provided VMSA is usable, so that KVM doesn't switch back to the original VMSA instead of exiting to userspace (due to an invalid VMSA). By the time a vCPU tries to load a guest-provided VMSA, KVM has already communicated "success" for AP creation, i.e. KVM has committed to using the guest-provided VMSA. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 04be49b1af57..7e06ed16f474 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -4001,23 +4001,6 @@ static void __sev_snp_reload_vmsa(struct kvm_vcpu *vcpu, gpa_t gpa) */ vmcb_mark_all_dirty(svm->vmcb); - if (!VALID_PAGE(gpa)) - return; - - slot = gfn_to_memslot(vcpu->kvm, gfn); - if (!slot) - return; - - mmu_seq = kvm->mmu_invalidate_seq; - smp_rmb(); - - /* - * The new VMSA will be private memory guest memory, so retrieve the - * PFN from the gmem backend. - */ - if (kvm_gmem_get_pfn(vcpu->kvm, slot, gfn, &pfn, &page, NULL)) - return; - /* * From this point forward, the VMSA will always be a guest-mapped page * rather than the initial one allocated by KVM in svm->sev_es.vmsa. In @@ -4029,6 +4012,23 @@ static void __sev_snp_reload_vmsa(struct kvm_vcpu *vcpu, gpa_t gpa) */ svm->sev_es.snp_has_guest_vmsa = true; + if (!VALID_PAGE(gpa)) + return; + + slot = gfn_to_memslot(vcpu->kvm, gfn); + if (!slot) + return; + + mmu_seq = kvm->mmu_invalidate_seq; + smp_rmb(); + + /* + * The new VMSA will be private memory guest memory, so retrieve the + * PFN from the gmem backend. + */ + if (kvm_gmem_get_pfn(vcpu->kvm, slot, gfn, &pfn, &page, NULL)) + return; + read_lock(&kvm->mmu_lock); /* * Save the guest-provided GPA. If retry is needed, then KVM will try -- 2.55.0.rc0.799.gd6f94ed593-goog