Re: [PATCH v12 07/45] KVM: Rename kvm_mem_is_private() to kvm_is_private_gfn()

[Fuad Tabba]

On Mon, 31 Aug 2026 at 01:25, Ackerley Tng via B4 Relay
<devnull+ackerleytng.google.com@xxxxxxxxxx> wrote:
>
> From: Ackerley Tng <ackerleytng@xxxxxxxxxx>
>
> Rename kvm_mem_is_private() to kvm_is_private_gfn() to prepare for in-place
> conversion, where there will be two lookup functions,
> kvm_vm_is_private_gfn() and kvm_gmem_is_private_gfn().
>
> This renaming allows consistent prefixing of "vm" vs "gmem" for
> kvm_*_is_private_gfn(), as opposed to kvm_gmem_mem_is_private(), which
> looks like a typo.
>
> Suggested-by: Sean Christopherson <seanjc@xxxxxxxxxx>
> Signed-off-by: Ackerley Tng <ackerleytng@xxxxxxxxxx>

Reviewed-by: Fuad Tabba <fuad.tabba@xxxxxxxxx>

Cheers,
/fuad

> ---
>  arch/x86/kvm/mmu/mmu.c   | 12 ++++++------
>  arch/x86/kvm/svm/sev.c   |  2 +-
>  include/linux/kvm_host.h |  4 ++--
>  virt/kvm/guest_memfd.c   |  2 +-
>  4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 10e59507d252f..62f751952ad8a 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -3421,7 +3421,7 @@ int kvm_mmu_max_mapping_level(struct kvm *kvm, struct kvm_page_fault *fault,
>                 is_private = fault->is_private;
>         } else {
>                 max_level = PG_LEVEL_NUM;
> -               is_private = kvm_mem_is_private(kvm, gfn);
> +               is_private = kvm_is_private_gfn(kvm, gfn);
>         }
>
>         max_level = min(max_level, max_huge_page_level);
> @@ -3634,13 +3634,13 @@ static bool page_fault_can_be_fast(struct kvm *kvm, struct kvm_page_fault *fault
>          * guest spinning on a #PF indefinitely, so don't attempt the fast path
>          * in this case.
>          *
> -        * Note that the kvm_mem_is_private() check might race with an
> +        * Note that the kvm_is_private_gfn() check might race with an
>          * attribute update, but this will either result in the guest spinning
>          * on RET_PF_SPURIOUS until the update completes, or an actual spurious
>          * case might go down the slow path. Either case will resolve itself.
>          */
>         if (kvm->arch.has_private_mem &&
> -           fault->is_private != kvm_mem_is_private(kvm, fault->gfn))
> +           fault->is_private != kvm_is_private_gfn(kvm, fault->gfn))
>                 return false;
>
>         /*
> @@ -4708,7 +4708,7 @@ static int kvm_mmu_faultin_pfn(struct kvm_vcpu *vcpu,
>          * Now that we have a snapshot of mmu_invalidate_seq we can check for a
>          * private vs. shared mismatch.
>          */
> -       if (fault->is_private != kvm_mem_is_private(kvm, fault->gfn)) {
> +       if (fault->is_private != kvm_is_private_gfn(kvm, fault->gfn)) {
>                 kvm_mmu_prepare_memory_fault_exit(vcpu, fault);
>                 return -EFAULT;
>         }
> @@ -5111,7 +5111,7 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu,
>
>         direct_bits = 0;
>         if (kvm_arch_has_private_mem(vcpu->kvm) &&
> -           kvm_mem_is_private(vcpu->kvm, gpa_to_gfn(range->gpa)))
> +           kvm_is_private_gfn(vcpu->kvm, gpa_to_gfn(range->gpa)))
>                 error_code |= PFERR_PRIVATE_ACCESS;
>         else
>                 direct_bits = gfn_to_gpa(kvm_gfn_direct_bits(vcpu->kvm));
> @@ -6584,7 +6584,7 @@ int noinline kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 err
>         if (IS_ENABLED(CONFIG_KVM_SW_PROTECTED_VM) &&
>             !(error_code & PFERR_RSVD_MASK) &&
>             vcpu->kvm->arch.vm_type == KVM_X86_SW_PROTECTED_VM &&
> -           kvm_mem_is_private(vcpu->kvm, gpa_to_gfn(cr2_or_gpa)))
> +           kvm_is_private_gfn(vcpu->kvm, gpa_to_gfn(cr2_or_gpa)))
>                 error_code |= PFERR_PRIVATE_ACCESS;
>
>         r = RET_PF_INVALID;
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index 0a887f8e05d3a..dff684b88f153 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -5030,7 +5030,7 @@ void sev_handle_rmp_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code)
>          * userspace via KVM_EXIT_MEMORY_FAULT events, however, so RMP faults
>          * for shared pages should not end up here.
>          */
> -       if (!kvm_mem_is_private(kvm, gfn)) {
> +       if (!kvm_is_private_gfn(kvm, gfn)) {
>                 pr_warn_ratelimited("SEV: Unexpected RMP fault for non-private GPA 0x%llx\n",
>                                     gpa);
>                 return;
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index 6ca81f5349db8..9b97266f61ec8 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -2573,12 +2573,12 @@ bool kvm_arch_pre_set_vm_memory_attributes(struct kvm *kvm,
>  bool kvm_arch_post_set_vm_memory_attributes(struct kvm *kvm,
>                                             struct kvm_gfn_range *range);
>
> -static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)
> +static inline bool kvm_is_private_gfn(struct kvm *kvm, gfn_t gfn)
>  {
>         return kvm_get_vm_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE;
>  }
>  #else
> -static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)
> +static inline bool kvm_is_private_gfn(struct kvm *kvm, gfn_t gfn)
>  {
>         return false;
>  }
> diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
> index e32ac2c28cbef..ce5efcacda36e 100644
> --- a/virt/kvm/guest_memfd.c
> +++ b/virt/kvm/guest_memfd.c
> @@ -879,7 +879,7 @@ static long __kvm_gmem_populate(struct kvm *kvm, struct kvm_memory_slot *slot,
>
>         folio_unlock(folio);
>
> -       if (!kvm_mem_is_private(kvm, gfn)) {
> +       if (!kvm_is_private_gfn(kvm, gfn)) {
>                 ret = -EINVAL;
>                 goto out_put_folio;
>         }
>
> --
> 2.55.0.897.gb25b4bd76c-goog
>
>