]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm/hugetlb: create hstate_is_gigantic_no_runtime helper
authorUsama Arif <usamaarif642@gmail.com>
Thu, 9 Oct 2025 17:24:30 +0000 (18:24 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Wed, 22 Oct 2025 01:51:31 +0000 (18:51 -0700)
This is a common condition used to skip operations that cannot be
performed on gigantic pages when runtime support is disabled.  This helper
is introduced as the condition will exist even more when allowing
"overcommit" of gigantic hugepages.  No functional change intended with
this patch.

Link: https://lkml.kernel.org/r/20251009172433.4158118-1-usamaarif642@gmail.com
Signed-off-by: Usama Arif <usamaarif642@gmail.com>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Shakeel Butt <shakeel.butt@linux.dev>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Oscar Salvador <osalvador@suse.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Rik van Riel <riel@surriel.com>
Cc: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/hugetlb.c

index 4e016433e32e5bf0c709737532002335d5d68ef4..bd53d367b18b7277d59668e4b5d3f22a4c7ab7bb 100644 (file)
@@ -135,6 +135,17 @@ static void hugetlb_free_folio(struct folio *folio)
        folio_put(folio);
 }
 
+/*
+ * Check if the hstate represents gigantic pages but gigantic page
+ * runtime support is not available. This is a common condition used to
+ * skip operations that cannot be performed on gigantic pages when runtime
+ * support is disabled.
+ */
+static inline bool hstate_is_gigantic_no_runtime(struct hstate *h)
+{
+       return hstate_is_gigantic(h) && !gigantic_page_runtime_supported();
+}
+
 static inline bool subpool_is_free(struct hugepage_subpool *spool)
 {
        if (spool->count)
@@ -1535,7 +1546,7 @@ static void remove_hugetlb_folio(struct hstate *h, struct folio *folio,
        VM_BUG_ON_FOLIO(hugetlb_cgroup_from_folio_rsvd(folio), folio);
 
        lockdep_assert_held(&hugetlb_lock);
-       if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
+       if (hstate_is_gigantic_no_runtime(h))
                return;
 
        list_del(&folio->lru);
@@ -1597,7 +1608,7 @@ static void __update_and_free_hugetlb_folio(struct hstate *h,
 {
        bool clear_flag = folio_test_hugetlb_vmemmap_optimized(folio);
 
-       if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
+       if (hstate_is_gigantic_no_runtime(h))
                return;
 
        /*
@@ -2491,7 +2502,7 @@ static void return_unused_surplus_pages(struct hstate *h,
        /* Uncommit the reservation */
        h->resv_huge_pages -= unused_resv_pages;
 
-       if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
+       if (hstate_is_gigantic_no_runtime(h))
                goto out;
 
        /*
@@ -3705,7 +3716,7 @@ static void __init hugetlb_init_hstates(void)
                 * - If CMA allocation is possible, we can not demote
                 *   HUGETLB_PAGE_ORDER or smaller size pages.
                 */
-               if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
+               if (hstate_is_gigantic_no_runtime(h))
                        continue;
                if (hugetlb_cma_total_size() && h->order <= HUGETLB_PAGE_ORDER)
                        continue;
@@ -4182,7 +4193,7 @@ static ssize_t __nr_hugepages_store_common(bool obey_mempolicy,
        int err;
        nodemask_t nodes_allowed, *n_mask;
 
-       if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
+       if (hstate_is_gigantic_no_runtime(h))
                return -EINVAL;
 
        if (nid == NUMA_NO_NODE) {