On Tue, 08 Sep 2026 21:01:31 +0100, "Lorenzo Stoakes (ARM)" <[email protected]> wrote: > > The is_vm_hugetlb_page() predicate is badly named - the mapping can span > more than a page and it is inconsistent with other VMA predicates that > typically are prefixed by vma_. > > Rename to vma_is_hugetlb() for consistency, and while we're here update > some VM_BUG_ON_VMA() to VM_WARN_ON_ONCE_VMA() as to avoid unnecessary > oopses. > > No functional change intended. > > Signed-off-by: Lorenzo Stoakes (ARM) <[email protected]> > --- > arch/arm64/kvm/mmu.c | 4 ++-- > arch/powerpc/mm/book3s64/radix_tlb.c | 6 +++--- > arch/powerpc/mm/nohash/e500_hugetlbpage.c | 2 +- > arch/powerpc/mm/nohash/tlb.c | 2 +- > arch/riscv/kvm/mmu.c | 2 +- > arch/riscv/mm/tlbflush.c | 2 +- > arch/s390/mm/gmap_helpers.c | 6 +++--- > arch/sparc/mm/init_64.c | 2 +- > drivers/gpu/drm/drm_gpusvm.c | 2 +- > fs/coredump.c | 2 +- > fs/hugetlbfs/inode.c | 2 +- > fs/proc/task_mmu.c | 8 ++++---- > include/asm-generic/tlb.h | 2 +- > include/linux/hugetlb.h | 4 ++-- > include/linux/mm.h | 19 ++++++++++++++++--- > include/linux/rmap.h | 2 +- > kernel/events/core.c | 2 +- > kernel/sched/fair.c | 2 +- > mm/gup.c | 4 ++-- > mm/huge_memory.c | 2 +- > mm/hugetlb.c | 14 +++++++------- > mm/internal.h | 2 +- > mm/madvise.c | 4 ++-- > mm/memory.c | 12 ++++++------ > mm/mempolicy.c | 2 +- > mm/migrate_device.c | 2 +- > mm/mmap.c | 2 +- > mm/mmu_gather.c | 2 +- > mm/mprotect.c | 2 +- > mm/mremap.c | 6 +++--- > mm/page_vma_mapped.c | 4 ++-- > mm/pagewalk.c | 2 +- > mm/swapfile.c | 2 +- > mm/userfaultfd.c | 26 +++++++++++++------------- > mm/vma.c | 8 ++++---- > mm/vmscan.c | 2 +- > tools/testing/vma/include/stubs.h | 2 +- > 37 files changed, 92 insertions(+), 79 deletions(-) > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 9ba86450fe4a..a7968f8d24bf 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -1463,13 +1463,13 @@ static int get_vma_page_shift(struct vm_area_struct > *vma, unsigned long hva) > { > unsigned long pa; > > - if (is_vm_hugetlb_page(vma) && !(vma->vm_flags & VM_PFNMAP)) > + if (vma_is_hugetlb(vma) && !(vma->vm_flags & VM_PFNMAP)) > return huge_page_shift(hstate_vma(vma)); > > if (!(vma->vm_flags & VM_PFNMAP)) > return PAGE_SHIFT; > > - VM_BUG_ON(is_vm_hugetlb_page(vma)); > + VM_BUG_ON(vma_is_hugetlb(vma)); > > pa = (vma->vm_pgoff << PAGE_SHIFT) + (hva - vma->vm_start); >
Acked-by: Marc Zyngier <[email protected]> M. -- Without deviation from the norm, progress is not possible.
