hugetlb: quota is not freed for unused reserved private huge pages
With shared reservations (and now also with private reservations), we reserve huge pages at mmap time. We also account for the mapping against fs quota to prevent a reservation from being preempted by quota exhaustion. When testing with the libhugetlbfs test suite, I found a problem with quota accounting. FS quota for allocated pages is handled correctly but we are not releasing quota for private pages that were reserved but never allocated. Do this in hugetlb_vm_op_close() at the same time as unused page reservations are released. Signed-off-by: Adam Litke <agl@us.ibm.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Johannes Weiner <hannes@saeurebad.de> Cc: William Lee Irwin III <wli@holomorphy.com> Cc: Hugh Dickins <hugh@veritas.com> Acked-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7f09ca51e9
commit
7251ff78b9
1 changed files with 3 additions and 1 deletions
|
@ -1552,8 +1552,10 @@ static void hugetlb_vm_op_close(struct vm_area_struct *vma)
|
||||||
|
|
||||||
kref_put(&reservations->refs, resv_map_release);
|
kref_put(&reservations->refs, resv_map_release);
|
||||||
|
|
||||||
if (reserve)
|
if (reserve) {
|
||||||
hugetlb_acct_memory(h, -reserve);
|
hugetlb_acct_memory(h, -reserve);
|
||||||
|
hugetlb_put_quota(vma->vm_file->f_mapping, reserve);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue