Parametrize alloc_hugetlb_folio_from_subpool() by resv_map to remove
the use of vma_resv_map() and decouple hugetlb with hugetlbfs.
Signed-off-by: Ackerley Tng <ackerleytng@xxxxxxxxxx>
---
include/linux/hugetlb.h | 2 +-
mm/hugetlb.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 5fe9643826d7..d564802ace4b 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -767,7 +767,7 @@ struct huge_bootmem_page {
int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list);
struct folio *alloc_hugetlb_folio_from_subpool(
- struct hugepage_subpool *spool, struct hstate *h,
+ struct hugepage_subpool *spool, struct hstate *h, struct resv_map *resv,
struct vm_area_struct *vma, unsigned long addr, int avoid_reserve);
struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,
unsigned long addr, int avoid_reserve);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 540634aec181..aebdd8c63439 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3003,7 +3003,7 @@ int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list)
}
struct folio *alloc_hugetlb_folio_from_subpool(
- struct hugepage_subpool *spool, struct hstate *h,
+ struct hugepage_subpool *spool, struct hstate *h, struct resv_map *resv,
struct vm_area_struct *vma, unsigned long addr, int avoid_reserve)
{
struct folio *folio;
@@ -3013,7 +3013,6 @@ struct folio *alloc_hugetlb_folio_from_subpool(
struct hugetlb_cgroup *h_cg = NULL;
bool deferred_reserve;
- struct resv_map *resv = vma_resv_map(vma);
pgoff_t resv_index = vma_hugecache_offset(h, vma, addr);
bool may_share = vma->vm_flags & VM_MAYSHARE;
@@ -3141,8 +3140,9 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,
{
struct hugepage_subpool *spool = subpool_vma(vma);
struct hstate *h = hstate_vma(vma);
+ struct resv_map *resv = vma_resv_map(vma);
- return alloc_hugetlb_folio_from_subpool(spool, h, vma, addr, avoid_reserve);
+ return alloc_hugetlb_folio_from_subpool(spool, h, resv, vma, addr, avoid_reserve);
}
int alloc_bootmem_huge_page(struct hstate *h, int nid)
--
2.41.0.rc0.172.g3f132b7071-goog
