Commit da56388c authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

mm/hugeltb: handle the error case in hugetlb_fix_reserve_counts()

A rare out of memory error would prevent removal of the reserve map region
for a page.  hugetlb_fix_reserve_counts() handles this rare case to avoid
dangling with incorrect counts.  Unfortunately, hugepage_subpool_get_pages
and hugetlb_acct_memory could possibly fail too.  We should correctly
handle these cases.

Link: https://lkml.kernel.org/r/20210410072348.20437-5-linmiaohe@huawei.com
Fixes: b5cec28d ("hugetlbfs: truncate_hugepages() takes a range of pages")
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Cc: Feilong Lin <linfeilong@huawei.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dddf31a4
...@@ -742,13 +742,20 @@ void hugetlb_fix_reserve_counts(struct inode *inode) ...@@ -742,13 +742,20 @@ void hugetlb_fix_reserve_counts(struct inode *inode)
{ {
struct hugepage_subpool *spool = subpool_inode(inode); struct hugepage_subpool *spool = subpool_inode(inode);
long rsv_adjust; long rsv_adjust;
bool reserved = false;
rsv_adjust = hugepage_subpool_get_pages(spool, 1); rsv_adjust = hugepage_subpool_get_pages(spool, 1);
if (rsv_adjust) { if (rsv_adjust > 0) {
struct hstate *h = hstate_inode(inode); struct hstate *h = hstate_inode(inode);
hugetlb_acct_memory(h, 1); if (!hugetlb_acct_memory(h, 1))
reserved = true;
} else if (!rsv_adjust) {
reserved = true;
} }
if (!reserved)
pr_warn("hugetlb: Huge Page Reserved count may go negative.\n");
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment