Skip to content

Commit 13db8c5

Browse files
Liu Zixiantorvalds
authored andcommitted
mm/hugetlb: initialize hugetlb_usage in mm_init
After fork, the child process will get incorrect (2x) hugetlb_usage. If a process uses 5 2MB hugetlb pages in an anonymous mapping, HugetlbPages: 10240 kB and then forks, the child will show, HugetlbPages: 20480 kB The reason for double the amount is because hugetlb_usage will be copied from the parent and then increased when we copy page tables from parent to child. Child will have 2x actual usage. Fix this by adding hugetlb_count_init in mm_init. Link: https://lkml.kernel.org/r/[email protected] Fixes: 5d317b2 ("mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status") Signed-off-by: Liu Zixian <[email protected]> Reviewed-by: Naoya Horiguchi <[email protected]> Reviewed-by: Mike Kravetz <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 4b42fb2 commit 13db8c5

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

include/linux/hugetlb.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -858,6 +858,11 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
858858

859859
void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm);
860860

861+
static inline void hugetlb_count_init(struct mm_struct *mm)
862+
{
863+
atomic_long_set(&mm->hugetlb_usage, 0);
864+
}
865+
861866
static inline void hugetlb_count_add(long l, struct mm_struct *mm)
862867
{
863868
atomic_long_add(l, &mm->hugetlb_usage);
@@ -1042,6 +1047,10 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h,
10421047
return &mm->page_table_lock;
10431048
}
10441049

1050+
static inline void hugetlb_count_init(struct mm_struct *mm)
1051+
{
1052+
}
1053+
10451054
static inline void hugetlb_report_usage(struct seq_file *f, struct mm_struct *m)
10461055
{
10471056
}

kernel/fork.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p,
10631063
mm->pmd_huge_pte = NULL;
10641064
#endif
10651065
mm_init_uprobes_state(mm);
1066+
hugetlb_count_init(mm);
10661067

10671068
if (current->mm) {
10681069
mm->flags = current->mm->flags & MMF_INIT_MASK;

0 commit comments

Comments
 (0)