qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/hugetlb: fix sysfs group leak in hugetlb_unregister_node() 

commit 01088a603660dfa240ba3331f0a49a3e9797cad1
Author: Miaohe Lin <linmiaohe@huawei.com>
Date:   Tue Aug 16 21:05:52 2022 +0800

    mm/hugetlb: fix sysfs group leak in hugetlb_unregister_node()

    The sysfs group per_node_hstate_attr_group and hstate_demote_attr_group
    when h->demote_order != 0 are created in hugetlb_register_node().  But
    these sysfs groups are not removed when unregister the node, thus sysfs
    group is leaked.  Using sysfs_remove_group() to fix this issue.

    Link: https://lkml.kernel.org/r/20220816130553.31406-6-linmiaohe@huawei.com
    Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
    Reviewed-by: Fengwei Yin <fengwei.yin@intel.com>
    Cc: Mike Kravetz <mike.kravetz@oracle.com>
    Cc: Muchun Song <songmuchun@bytedance.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168372
Signed-off-by: Nico Pache <npache@redhat.com>
This commit is contained in:
Nico Pache 2023-05-08 17:26:31 -06:00
parent 12e538a729
commit e4a806b0b9
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mm/hugetlb.c
View File

@ -3852,12 +3852,18 @@ static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent,
}
if (h->demote_order) {
if (sysfs_create_group(hstate_kobjs[hi],
&hstate_demote_attr_group))
retval = sysfs_create_group(hstate_kobjs[hi],
&hstate_demote_attr_group);
if (retval) {
pr_warn("HugeTLB unable to create demote interfaces for %s\n", h->name);
sysfs_remove_group(hstate_kobjs[hi], hstate_attr_group);
kobject_put(hstate_kobjs[hi]);
hstate_kobjs[hi] = NULL;
return retval;
}
}
return retval;
return 0;
}
static void __init hugetlb_sysfs_init(void)
@ -3943,10 +3949,15 @@ static void hugetlb_unregister_node(struct node *node)
for_each_hstate(h) {
int idx = hstate_index(h);
if (nhs->hstate_kobjs[idx]) {
kobject_put(nhs->hstate_kobjs[idx]);
nhs->hstate_kobjs[idx] = NULL;
}
struct kobject *hstate_kobj = nhs->hstate_kobjs[idx];
if (!hstate_kobj)
continue;
if (h->demote_order)
sysfs_remove_group(hstate_kobj, &hstate_demote_attr_group);
sysfs_remove_group(hstate_kobj, &per_node_hstate_attr_group);
kobject_put(hstate_kobj);
nhs->hstate_kobjs[idx] = NULL;
}
kobject_put(nhs->hugepages_kobj);