hugetlb: fix hugetlb cgroup refcounting during mremap
Subsystems (2)
PATCH 1/1 hugetlb: fix hugetlb cgroup refcounting during mremap
When hugetlb_vm_op_open() is called during copy_vma(), we may take the reference to resv_map->css. Later, when clearing the reservation pointer of old_vma after transferring it to new_vma, we forget to drop the reference to resv_map->css. This leads to a reference leak of css.
Fixes this by adding a check to drop reservation css reference in clear_vma_resv_huge_pages()
--- include/linux/hugetlb_cgroup.h | 12 ++++++++++++ mm/hugetlb.c | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-)
include/linux/hugetlb_cgroup.h +12 -0
@@ -128,6 +128,13 @@ static inline void resv_map_dup_hugetlb_cgroup_uncharge_info(css_get (resv_map->css); } +static inline void resv_map_put_hugetlb_cgroup_uncharge_info ( +struct resv_map *resv_map) +{ +if (resv_map->css) +css_put (resv_map->css); +} +extern int hugetlb_cgroup_charge_cgroup (int idx,unsigned long nr_pages,struct hugetlb_cgroup **ptr); extern int hugetlb_cgroup_charge_cgroup_rsvd(int idx, unsigned long nr_pages,
@@ -211,6 +218,11 @@ static inline void resv_map_dup_hugetlb_cgroup_uncharge_info( { } +static inline void resv_map_put_hugetlb_cgroup_uncharge_info ( +struct resv_map *resv_map) +{ +} +static inline int hugetlb_cgroup_charge_cgroup (int idx,unsigned long nr_pages,struct hugetlb_cgroup **ptr) {
mm/hugetlb.c +3 -1
@@ -1037,8 +1037,10 @@ void clear_vma_resv_huge_pages(struct vm_area_struct *vma)*/ struct resv_map *reservations =vma_resv_map (vma); -if (reservations &&is_vma_resv_set (vma,HPAGE_RESV_OWNER )) +if (reservations &&is_vma_resv_set (vma,HPAGE_RESV_OWNER )) { +resv_map_put_hugetlb_cgroup_uncharge_info (reservations);kref_put (&reservations->refs, resv_map_release); + }reset_vma_resv_huge_pages (vma); }
Signature · 1 line
2.25.1
Andrew Morton
maintainerQuoted 7 lines · On Sat, 13 Nov 2021 22:44:10 +0700 Bui Quang Minh <[email protected]>…
When
hugetlb_vm_op_open()is called duringcopy_vma(), we may take the reference toresv_map->css. Later, when clearing the reservation pointer ofold_vmaafter transferring it tonew_vma, we forget to drop the reference toresv_map->css. This leads to a reference leak of css.Fixes this by adding a check to drop reservation css reference in
clear_vma_resv_huge_pages()
Thanks. I added cc:stable to this (550a7d60bd5e35a was merged a year ago) and I've queued it for 5.16-rc2, pending suitable reviewer feedback.
Mina Almasry
Reviewed-byQuoted 8 lines · Andrew Morton
Quoted 5 lines · On Sat, 13 Nov 2021 22:44:10 +0700 Bui Quang Minh <[email protected]>…
When
hugetlb_vm_op_open()is called duringcopy_vma(), we may take the reference toresv_map->css. Later, when clearing the reservation pointer ofold_vmaafter transferring it tonew_vma, we forget to drop the reference toresv_map->css. This leads to a reference leak of css.
Quoted 6 lines
Quoted 2 lines
Fixes this by adding a check to drop reservation css reference in
clear_vma_resv_huge_pages()Thanks. I added cc:stable to this (
550a7d60bd5e35awas merged a year ago) and I've queued it for 5.16-rc2, pending suitable reviewer feedback.
Thanks,
Mike Kravetz
Reviewed-bySubject: Re: [PATCH] hugetlb: fix hugetlb cgroup refcounting during mremap
To: Andrew Morton <[email protected]>, Bui Quang Minh <[email protected]>
Bcc:
-=-=-=-=-=-=-=-=-=# Don't remove this line #=-=-=-=-=-=-=-=-=-
Quoted 10 lines · Andrew Morton
Quoted 5 lines · On Sat, 13 Nov 2021 22:44:10 +0700 Bui Quang Minh <[email protected]>…
When
hugetlb_vm_op_open()is called duringcopy_vma(), we may take thereference to
resv_map->css. Later, when clearing the reservation pointerof
old_vmaafter transferring it tonew_vma, we forget to drop the
Quoted 7 lines
Quoted 7 lines
reference to
resv_map->css. This leads to a reference leak of css.Fixes this by adding a check to drop reservation css reference in
clear_vma_resv_huge_pages()
Good catch! Sorry I missed this in my review.
Quoted 3 lines
Thanks. I added cc:stable to this (
550a7d60bd5e35awas merged a yearago) and I've queued it for 5.16-rc2, pending suitable reviewer feedback.
I may be confused, but 550a7d60bd5e35a was just merged in 5.16-rc1 so
no need for cc:stable.
Signature · 1 line
Mike Kravetz