Commit d6c840ad authored by Ackerley Tng's avatar Ackerley Tng Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Rename .private_max_mapping_level() to .gmem_max_mapping_level() 



Rename kvm_x86_ops.private_max_mapping_level() to .gmem_max_mapping_level()
in anticipation of extending guest_memfd support to non-private memory.

No functional change intended.

Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAckerley Tng <ackerleytng@google.com>
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Co-developed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Message-ID: <20250729225455.670324-13-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 576d035e

arch/x86/include/asm/kvm-x86-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ KVM_X86_OP_OPTIONAL_RET0(vcpu_get_apicv_inhibit_reasons); 
KVM_X86_OP_OPTIONAL(get_untagged_addr)

KVM_X86_OP_OPTIONAL(alloc_apic_backing_page)

KVM_X86_OP_OPTIONAL_RET0(gmem_prepare)

KVM_X86_OP_OPTIONAL_RET0(private_max_mapping_level)

KVM_X86_OP_OPTIONAL_RET0(gmem_max_mapping_level)

KVM_X86_OP_OPTIONAL(gmem_invalidate)



#undef KVM_X86_OP

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1922,7 +1922,7 @@ struct kvm_x86_ops { 
	void *(*alloc_apic_backing_page)(struct kvm_vcpu *vcpu);

	int (*gmem_prepare)(struct kvm *kvm, kvm_pfn_t pfn, gfn_t gfn, int max_order);

	void (*gmem_invalidate)(kvm_pfn_t start, kvm_pfn_t end);

	int (*private_max_mapping_level)(struct kvm *kvm, kvm_pfn_t pfn);

	int (*gmem_max_mapping_level)(struct kvm *kvm, kvm_pfn_t pfn);

};



struct kvm_x86_nested_ops {

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -4532,7 +4532,7 @@ static u8 kvm_max_private_mapping_level(struct kvm *kvm, kvm_pfn_t pfn, 
	if (max_level == PG_LEVEL_4K)

		return PG_LEVEL_4K;



	req_max_level = kvm_x86_call(private_max_mapping_level)(kvm, pfn);

	req_max_level = kvm_x86_call(gmem_max_mapping_level)(kvm, pfn);

	if (req_max_level)

		max_level = min(max_level, req_max_level);

arch/x86/kvm/svm/sev.c

+1 −1
Original line number Diff line number Diff line
@@ -4943,7 +4943,7 @@ void sev_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end) 
	}

}



int sev_private_max_mapping_level(struct kvm *kvm, kvm_pfn_t pfn)

int sev_gmem_max_mapping_level(struct kvm *kvm, kvm_pfn_t pfn)

{

	int level, rc;

	bool assigned;

arch/x86/kvm/svm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -5180,7 +5180,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 


	.gmem_prepare = sev_gmem_prepare,

	.gmem_invalidate = sev_gmem_invalidate,

	.private_max_mapping_level = sev_private_max_mapping_level,

	.gmem_max_mapping_level = sev_gmem_max_mapping_level,

};



/*