Skip to content

Commit 1edd270

Browse files
committed
KVM: remove kvm_arch_gmem_prepare_needed()
JIRA: https://issues.redhat.com/browse/RHEL-32435 It is enough to return 0 if a guest need not do any preparation. This is in fact how sev_gmem_prepare() works for non-SNP guests, and it extends naturally to Intel hosts: the x86 callback for gmem_prepare is optional and returns 0 if not defined. Reviewed-by: Michael Roth <michael.roth@amd.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit 7239ed7) Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 0e4e12d commit 1edd270

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

arch/x86/kvm/x86.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13616,11 +13616,6 @@ bool kvm_arch_no_poll(struct kvm_vcpu *vcpu)
1361613616
EXPORT_SYMBOL_GPL(kvm_arch_no_poll);
1361713617

1361813618
#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE
13619-
bool kvm_arch_gmem_prepare_needed(struct kvm *kvm)
13620-
{
13621-
return kvm->arch.vm_type == KVM_X86_SNP_VM;
13622-
}
13623-
1362413619
int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order)
1362513620
{
1362613621
return static_call(kvm_x86_gmem_prepare)(kvm, pfn, gfn, max_order);

include/linux/kvm_host.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2445,7 +2445,6 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm,
24452445

24462446
#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE
24472447
int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order);
2448-
bool kvm_arch_gmem_prepare_needed(struct kvm *kvm);
24492448
#endif
24502449

24512450
/**

virt/kvm/guest_memfd.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,9 @@ static int __kvm_gmem_prepare_folio(struct kvm *kvm, struct kvm_memory_slot *slo
2929
pgoff_t index, struct folio *folio)
3030
{
3131
#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE
32-
kvm_pfn_t pfn;
33-
gfn_t gfn;
34-
int rc;
35-
36-
if (!kvm_arch_gmem_prepare_needed(kvm))
37-
return 0;
38-
39-
pfn = folio_file_pfn(folio, index);
40-
gfn = slot->base_gfn + index - slot->gmem.pgoff;
41-
rc = kvm_arch_gmem_prepare(kvm, gfn, pfn, folio_order(folio));
32+
kvm_pfn_t pfn = folio_file_pfn(folio, index);
33+
gfn_t gfn = slot->base_gfn + index - slot->gmem.pgoff;
34+
int rc = kvm_arch_gmem_prepare(kvm, gfn, pfn, folio_order(folio));
4235
if (rc) {
4336
pr_warn_ratelimited("gmem: Failed to prepare folio for index %lx GFN %llx PFN %llx error %d.\n",
4437
index, gfn, pfn, rc);

0 commit comments

Comments
 (0)