]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mm/huge_memory: remove unnecessary sanity checks
authorLorenzo Stoakes (Oracle) <ljs@kernel.org>
Fri, 20 Mar 2026 18:07:25 +0000 (18:07 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 5 Apr 2026 20:53:46 +0000 (13:53 -0700)
These checks have been in place since 2014, I think we can safely assume
that we are in a place where we don't need these as runtime checks.

In addition there are 4 other invocations of folio_remove_rmap_pmd(), none
of which make this assertion.

If we need to add this assertion, it should be in folio_remove_rmap_pmd(),
and as a VM_WARN_ON_ONCE(), however these seem superfluous so just remove
them.

Link: https://lkml.kernel.org/r/0c4c5ab247c90f80cf44718e8124b217d6a22544.1774029655.git.ljs@kernel.org
Signed-off-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nico Pache <npache@redhat.com>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/huge_memory.c

index 41506f376f4beb63a5bacb57d1d3f1af03fc0e60..d7c1c8f55c1365d8d5b6055698692c89d80b3d1b 100644 (file)
@@ -2448,7 +2448,6 @@ bool zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 
                flush_needed = true;
                folio_remove_rmap_pmd(folio, &folio->page, vma);
-               WARN_ON_ONCE(folio_mapcount(folio) < 0);
        } else if (pmd_is_valid_softleaf(orig_pmd)) {
                const softleaf_t entry = softleaf_from_pmd(orig_pmd);
 
@@ -2479,7 +2478,6 @@ bool zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
 
        if (folio_is_device_private(folio)) {
                folio_remove_rmap_pmd(folio, &folio->page, vma);
-               WARN_ON_ONCE(folio_mapcount(folio) < 0);
                folio_put(folio);
        }