mm-hugetlb-initialize-hugetlb_usage-in-mm_init.patch removed from -mm tree
The patch titled
Subject: mm/hugetlb: initialize hugetlb_usage in mm_init
has been removed from the -mm tree. Its filename was
mm-hugetlb-initialize-hugetlb_usage-in-mm_init.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Liu Zixian <[email protected]>
Subject: 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.
---
include/linux/hugetlb.h | 9 +++++++++ kernel/fork.c | 1 + 2 files changed, 10 insertions(+)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-initialize-hugetlb_usage-in-mm_init +9 -0
@@ -858,6 +858,11 @@ static inline spinlock_t *huge_pte_lockpvoid hugetlb_report_usage (struct seq_file *m,struct mm_struct *mm); +static inline void hugetlb_count_init (struct mm_struct *mm) +{ +atomic_long_set (&mm->hugetlb_usage,0 ); +} +static inline void hugetlb_count_add (long l,struct mm_struct *mm) {atomic_long_add (l, &mm->hugetlb_usage);
@@ -1042,6 +1047,10 @@ static inline spinlock_t *huge_pte_lockpreturn &mm->page_table_lock; } +static inline void hugetlb_count_init (struct mm_struct *mm) +{ +} +static inline void hugetlb_report_usage (struct seq_file *f,struct mm_struct *m) { }
kernel/fork.c renamed from kernel/fork.c~mm-hugetlb-initialize-hugetlb_usage-in-mm_init +1 -0
@@ -1063,6 +1063,7 @@ static struct mm_struct *mm_init(struct mm->pmd_huge_pte =NULL ;#endif mm_init_uprobes_state (mm); +hugetlb_count_init (mm);if (current->mm) { mm->flags = current->mm->flags &MMF_INIT_MASK ;
_
Patches currently in -mm which might be from [email protected] are