When we try to get a huge page with avoid_reserve, we don't consume
a reserved page. So it is treated like as non-reserve case.
Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1426c03..749629e 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1149,12 +1149,13 @@ static struct page *alloc_huge_page(struct
vm_area_struct *vma,
if (has_reserve < 0)
return ERR_PTR(-ENOMEM);
- if (!has_reserve && (hugepage_subpool_get_pages(spool, 1) < 0))
+ if ((!has_reserve || avoid_reserve)
+ && (hugepage_subpool_get_pages(spool, 1) < 0))
return ERR_PTR(-ENOSPC);
ret = hugetlb_cgroup_charge_cgroup(idx, pages_per_huge_page(h), &h_cg);
if (ret) {
- if (!has_reserve)
+ if (!has_reserve || avoid_reserve)
hugepage_subpool_put_pages(spool, 1);
return ERR_PTR(-ENOSPC);
}
@@ -1167,7 +1168,7 @@ static struct page *alloc_huge_page(struct vm_area_struct
*vma,
hugetlb_cgroup_uncharge_cgroup(idx,
pages_per_huge_page(h),
h_cg);
- if (!has_reserve)
+ if (!has_reserve || avoid_reserve)
hugepage_subpool_put_pages(spool, 1);
return ERR_PTR(-ENOSPC);
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
