mm-hugetlb-add-available_huge_pages-func.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: add available_huge_pages() func
has been removed from the -mm tree. Its filename was
mm-hugetlb-add-available_huge_pages-func.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Xin Hao <[email protected]>
Subject: mm/hugetlb: add available_huge_pages() func
Date: Thu, 22 Sep 2022 10:19:29 +0800
In hugetlb.c there are several places which compare the values of 'h->free_huge_pages' and 'h->resv_huge_pages', it looks a bit messy, so add a new available_huge_pages() function to do these.
---
mm/hugetlb.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-add-available_huge_pages-func +9 -5
@@ -1191,6 +1191,11 @@ retry_cpuset:return NULL ; } +static unsigned long available_huge_pages (struct hstate *h) +{ +return h->free_huge_pages - h->resv_huge_pages; +} + static struct page *dequeue_huge_page_vma(struct hstate *h, struct vm_area_struct *vma, unsigned long address, int avoid_reserve,
@@ -1207,12 +1212,11 @@ static struct page *dequeue_huge_page_vm* have no page reserves. This check ensures that reservations are * not "stolen". The child may still get SIGKILLed */ -if (!vma_has_reserves (vma, chg) && - h->free_huge_pages - h->resv_huge_pages ==0 ) +if (!vma_has_reserves (vma, chg) && !available_huge_pages (h)) goto err;/* If reserves cannot be used, ensure enough pages are in the pool */ -if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages ==0 ) +if (avoid_reserve && !available_huge_pages (h)) goto err; gfp_mask =htlb_alloc_mask (h);
@@ -2124,7 +2128,7 @@ retry:if (!page_count (page)) {struct page *head =compound_head (page);struct hstate *h =page_hstate (head); -if (h->free_huge_pages - h->resv_huge_pages ==0 ) +if (!available_huge_pages (h)) goto out;/*
@@ -2311,7 +2315,7 @@ struct page *alloc_huge_page_nodemask(st nodemask_t *nmask, gfp_t gfp_mask) {spin_lock_irq (&hugetlb_lock); -if (h->free_huge_pages - h->resv_huge_pages >0 ) { +if (available_huge_pages (h)) {struct page *page; page =dequeue_huge_page_nodemask (h, gfp_mask, preferred_nid, nmask);
_
Patches currently in -mm which might be from [email protected] are
mm-damon-move-sz_damon_region-to-damon_sz_region.patch mm-damon-use-damon_sz_region-in-appropriate-place.patch