]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: guest_memfd: use folio_nr_pages() instead of shift operation
authorPedro Demarchi Gomes <pedrodemargomes@gmail.com>
Sat, 4 Oct 2025 03:02:10 +0000 (00:02 -0300)
committerSean Christopherson <seanjc@google.com>
Mon, 20 Oct 2025 13:30:28 +0000 (06:30 -0700)
folio_nr_pages() is a faster helper function to get the number of pages when
NR_PAGES_IN_LARGE_FOLIO is enabled.

Signed-off-by: Pedro Demarchi Gomes <pedrodemargomes@gmail.com>
Link: https://lore.kernel.org/r/20251004030210.49080-1-pedrodemargomes@gmail.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
virt/kvm/guest_memfd.c

index caa87efc8f7aeb9833df7a7f2e40a07873515ebd..9017e4d77c53826a99086f82e523b560865555b4 100644 (file)
@@ -82,9 +82,9 @@ static int kvm_gmem_prepare_folio(struct kvm *kvm, struct kvm_memory_slot *slot,
         * The order will be passed when creating the guest_memfd, and
         * checked when creating memslots.
         */
-       WARN_ON(!IS_ALIGNED(slot->gmem.pgoff, 1 << folio_order(folio)));
+       WARN_ON(!IS_ALIGNED(slot->gmem.pgoff, folio_nr_pages(folio)));
        index = kvm_gmem_get_index(slot, gfn);
-       index = ALIGN_DOWN(index, 1 << folio_order(folio));
+       index = ALIGN_DOWN(index, folio_nr_pages(folio));
        r = __kvm_gmem_prepare_folio(kvm, slot, index, folio);
        if (!r)
                kvm_gmem_mark_prepared(folio);