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 AE96F3B95F9 for ; Mon, 31 Aug 2026 22:20:14 +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=1788214816; cv=none; b=H8TuS0YjJDCdj1SAui2whBJkrx5sqa6IjNxm7LC8p6OXJw/1D7QrkolwSc1a59RnECtXZHIPoKXi1GeX5+01RRc/c6y9puEkDHo7gPnChO1CYToqCpCwoahgcgG6iM4D7nUFN+n7HAW7rcwCv+XUV0wQ91HAe5jk0bcU4XhExnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788214816; c=relaxed/simple; bh=Xv2xXvGnIgqmqGk2e+2ZhJ+ZsR+tcBDS9L06n48fmsk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IDJI/4LOsHM2iJzQr5vEQIVQzGzgxD2yOAUMtrvDGGIOiKL2CSaweO/EcvH3AykRdrkGMVzZXmoE8LkQntHpPSX25r73Flq+lYvzxz4NvHXLGPiaEuVhr97wr+HrLKF5wpmrtRkHBECEjxoxJsQjRd/nBoDJH1d/1iXSP6hkAYI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LieHIN9b; 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="LieHIN9b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C8D01F00A3F; Mon, 31 Aug 2026 22:20:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788214814; bh=uDVjC6M6z6Mqh4Zqp0SbrP1nJIzmhxFqT0unsJUGZP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LieHIN9blIztDTvBPOKLn8IWIXaT8btp25DQyXZZ738tRV00bH6dvOdhMId8ykiJu WsGuL7K3vSxy+cmo7GZ+PAQWdclshl/xnLmR8kyoWkWrwKVB3dq4nIEdoadKeUGj8Z tdOG3Hca8MGmPwX0pAro2MB0GzbBjWsbXSD47LOleGj0mmNtTUPC/NqLswzRw2lQOd 4w6fqOVrxWCMkk+PYVwItW5nlPi6EitcFuyBb30j23BbNyAbaQ26mWuSBJX4x3Eszz zXeXJNZdkm7qIbDUF0k0I0c9Js7giSg8QScjw3lfDbPD+XNJpLGulnmHMRcWVOS6bE e0yhJWBra4Acg== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Christopherson , Ackerley Tng , Sasha Levin Subject: [PATCH 7.2.y 4/8] KVM: SEV: Wire up kvm_x86_ops.gmem_xxx() if and only if CONFIG_KVM_AMD_SEV=y Date: Mon, 31 Aug 2026 18:20:06 -0400 Message-ID: <20260831222010.1859431-4-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 01a96ff30dde5127c37497f1e098e639e7ae152f ] Wire up the SEV-SNP guest_memfd kvm_x86_ops hooks if and only if SEV is actually enabled, and drop the now-unnecessary stubs. Leaving the hooks NULL allows the static call infrastructure to elide the CALL+RET, and more importantly, referencing the hooks if and only if SEV support is enabled will allow conditionally definining the hooks using their corresponding HAVE_KVM_ARCH_GMEM_XXX Kconfig. No functional change intended. Cc: stable@vger.kernel.org # 6.12.x Reviewed-by: Ackerley Tng Link: https://patch.msgid.link/20260709204948.1988414-5-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/svm.c | 8 ++++---- arch/x86/kvm/svm/svm.h | 10 ---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 60495447f0ca0..1158f3e28200c 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -5466,6 +5466,10 @@ struct kvm_x86_ops svm_x86_ops __initdata = { .vm_copy_enc_context_from = sev_vm_copy_enc_context_from, .vm_move_enc_context_from = sev_vm_move_enc_context_from, + + .gmem_prepare = sev_gmem_prepare, + .gmem_invalidate = sev_gmem_invalidate, + .gmem_max_mapping_level = sev_gmem_max_mapping_level, #endif .check_emulate_instruction = svm_check_emulate_instruction, @@ -5477,10 +5481,6 @@ struct kvm_x86_ops svm_x86_ops __initdata = { .vcpu_deliver_sipi_vector = svm_vcpu_deliver_sipi_vector, .vcpu_get_apicv_inhibit_reasons = avic_vcpu_get_apicv_inhibit_reasons, .alloc_apic_backing_page = svm_alloc_apic_backing_page, - - .gmem_prepare = sev_gmem_prepare, - .gmem_invalidate = sev_gmem_invalidate, - .gmem_max_mapping_level = sev_gmem_max_mapping_level, }; /* diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 88c6b784c92b9..344312bd1fd46 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -1036,16 +1036,6 @@ static inline int sev_cpu_init(struct svm_cpu_data *sd) { return 0; } static inline int sev_dev_get_attr(u32 group, u64 attr, u64 *val) { return -ENXIO; } #define max_sev_asid 0 static inline void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code) {} -static inline int sev_gmem_prepare(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order) -{ - return 0; -} -static inline void sev_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end) {} -static inline int sev_gmem_max_mapping_level(struct kvm *kvm, kvm_pfn_t pfn, bool is_private) -{ - return 0; -} - static inline struct vmcb_save_area *sev_decrypt_vmsa(struct kvm_vcpu *vcpu) { return NULL; -- 2.53.0