From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 78D17373BE6 for ; Fri, 26 Jun 2026 23:14:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782515663; cv=none; b=OMyTNAtZKHs3pDDiD5ytXKb/aHK/wPsLHJb5KXpfNxExQePfikOucZF0WgpOJjzT+peWd+b8Oi9ol/y47nKcAWRQgZNw18JZ+RB9fYSMyAYTXcypTPsRI9CB3hBP+vpLwrvo2lMWxcmHsyAAIznk9n/+thPGXepMk/85cDdPX4E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782515663; c=relaxed/simple; bh=tHbnzj4cCkm92N0N6S0S35TFmZS7KTv9837vIW/+yNE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EPPgmuAgYzB1uQ3Jyk22hnPn5A58Qwsm60jO6ylqjrWVmCR8DEnf7v0fRFRzLw6OzNRUYVIXQFq5tt3BVbThlII8jBlYtaClhCayOSP9mX31y8RjF2c6naooM+bmpI6forv+Z5pxCirUhcmKpFa6g9N+9SCFUMsVzYyBlsosOro= 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=npMyBFCo; arc=none smtp.client-ip=209.85.215.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="npMyBFCo" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c88aab7c1d4so737408a12.3 for ; Fri, 26 Jun 2026 16:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782515662; x=1783120462; 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=DSUU9PxKuuir4g3D6jT/rhVPClYQABg9m1OIKu1UhOU=; b=npMyBFCowmcJZhGczpfuEOIzEge6P1m7UzXznX4oMh+r3nKh9BFmavfNI7+w8oKtpu yd4hKPXOCbx6PGoAJhTgoyw55JDUJgWlP9nw9AcpmiIk91Wp7zzcPOkIA6R+Q6oXEcXC uJ+Lut9EJXbmhYix+5H7qvzVxFbabVN47kGgv0lwFJtEaJU9Bt+/I18BGiSUpAvfIYjB lNF6DvIdAEUiqhP8SUJeTraBNFFTKOmOGaSLudyD/1cN2Ls/lW9XgN4pAy3h6jdcsZVc 5AF+0UnZNBB6fQjS2gcdD3OUNDRbQhfd3QdbWfKdmQGOFuE0HAKDyZ9yz5yYd/4C7jQa Q3sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782515662; x=1783120462; 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=DSUU9PxKuuir4g3D6jT/rhVPClYQABg9m1OIKu1UhOU=; b=KIbLyx4jbiMr07yHCHcuZbT/WeDbankbHm2sygWrgAgw3AUsVuAp4yquxCO+BQbMSz dc7D9qL4KbvPOQjBVTyKsHWRrqCF2hmsLMzp4diEu6LXQ3djk/qGDtoi2AkpjWB6ZSk7 Nngk/ftlqqov4nmJIzKMnerIB9KdQD7QboQrXNjvHu4Ul0xtcKInJk62fp+BolgwZVNq iSJUQEcSjG92YIvMySHQm1cSp6iHtp7gUTj2Usu52SLPsc+IwxHwcbFXgoR9h7PUFSJP tdCpMpKryInoMmnky6xH/3nFX4X3o6bR6hyk9+5JemsYWXFMjpiaGVFTO/fY8tBq88p1 vT3A== X-Forwarded-Encrypted: i=1; AFNElJ8OwfnUfEOKnjj3nSrXjZrrUo0sjBuq5GzpkDKk+zkkN55jb4BzZHAYFKJ3dJsqshWyUcnaBafWYJ7EXmI=@vger.kernel.org X-Gm-Message-State: AOJu0YxyU8mosUWtx1LcMovdgIqMKUR1qsnj7ofrHkZcmaQsowamqPcp kIHnn8u8dvLPFWfE3Oy/UfyZmt+ogVbrB5QL7CFxtDCT4Yul3IjS6X10KiZ6psJoR8k7fuLIlxr jcxz2/Q== X-Received: from pgko6.prod.google.com ([2002:a63:f146:0:b0:c82:26d4:bb49]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:a08:b0:3bf:76d5:4cf2 with SMTP id adf61e73a8af0-3bf76d5544fmr273255637.40.1782515661586; Fri, 26 Jun 2026 16:14:21 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Jun 2026 16:14:09 -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-3-seanjc@google.com> Subject: [PATCH v2 2/9] KVM: SEV: Extract loading of guest-provided VMSA to a separate helper 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" Extract the loading/retrieval of a guest-provided VMSA to a separate helper so that KVM can reuse the core logic when refreshing the VMSA after an MMU invalidation from guest_memfd. No functional change intended. Cc: stable@vger.kernel.org # 6.12.x Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 52 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 827f5dc06102..d8ed00f76aa3 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3979,29 +3979,17 @@ static int snp_begin_psc(struct vcpu_svm *svm) return snp_do_psc(svm); } -/* - * Invoked as part of svm_vcpu_reset() processing of an init event. - */ -static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) +static void sev_snp_reload_vmsa(struct kvm_vcpu *vcpu, gpa_t gpa) { struct vcpu_svm *svm = to_svm(vcpu); struct kvm_memory_slot *slot; + gfn_t gfn = gpa_to_gfn(gpa); struct page *page; kvm_pfn_t pfn; - gfn_t gfn; - guard(mutex)(&svm->sev_es.snp_vmsa_mutex); + lockdep_assert_held(&svm->sev_es.snp_vmsa_mutex); - if (!svm->sev_es.snp_ap_waiting_for_reset) - return; - - svm->sev_es.snp_ap_waiting_for_reset = false; - - /* Mark the vCPU as offline and not runnable */ - vcpu->arch.pv.pv_unhalted = false; - kvm_set_mp_state(vcpu, KVM_MP_STATE_HALTED); - - /* Clear use of the VMSA */ + /* Clear use of the VMSA. */ svm->vmcb->control.vmsa_pa = INVALID_PAGE; svm->sev_es.snp_guest_vmsa_gpa = INVALID_PAGE; @@ -4011,12 +3999,9 @@ static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) */ vmcb_mark_all_dirty(svm->vmcb); - if (!VALID_PAGE(svm->sev_es.snp_pending_vmsa_gpa)) + if (!VALID_PAGE(gpa)) return; - gfn = gpa_to_gfn(svm->sev_es.snp_pending_vmsa_gpa); - svm->sev_es.snp_pending_vmsa_gpa = INVALID_PAGE; - slot = gfn_to_memslot(vcpu->kvm, gfn); if (!slot) return; @@ -4040,7 +4025,7 @@ static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) svm->sev_es.snp_has_guest_vmsa = true; /* Use the new VMSA */ - svm->sev_es.snp_guest_vmsa_gpa = gfn_to_gpa(gfn); + svm->sev_es.snp_guest_vmsa_gpa = gpa; svm->vmcb->control.vmsa_pa = pfn_to_hpa(pfn); /* Mark the vCPU as runnable */ @@ -4054,6 +4039,31 @@ static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) kvm_release_page_clean(page); } +/* + * Invoked as part of svm_vcpu_reset() processing of an init event. + */ +static void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu) +{ + struct vcpu_svm *svm = to_svm(vcpu); + gpa_t gpa; + + guard(mutex)(&svm->sev_es.snp_vmsa_mutex); + + if (!svm->sev_es.snp_ap_waiting_for_reset) + return; + + svm->sev_es.snp_ap_waiting_for_reset = false; + + /* Mark the vCPU as offline and not runnable */ + vcpu->arch.pv.pv_unhalted = false; + kvm_set_mp_state(vcpu, KVM_MP_STATE_HALTED); + + gpa = svm->sev_es.snp_pending_vmsa_gpa; + svm->sev_es.snp_pending_vmsa_gpa = INVALID_PAGE; + + sev_snp_reload_vmsa(vcpu, gpa); +} + static int sev_snp_ap_creation(struct vcpu_svm *svm) { struct kvm_sev_info *sev = to_kvm_sev_info(svm->vcpu.kvm); -- 2.55.0.rc0.799.gd6f94ed593-goog