Skip to content

Commit 8495f7e

Browse files
Sai Praneeth Prakhyatorvalds
authored andcommitted
fork: improve error message for corrupted page tables
When a user process exits, the kernel cleans up the mm_struct of the user process and during cleanup, check_mm() checks the page tables of the user process for corruption (E.g: unexpected page flags set/cleared). For corrupted page tables, the error message printed by check_mm() isn't very clear as it prints the loop index instead of page table type (E.g: Resident file mapping pages vs Resident shared memory pages). The loop index in check_mm() is used to index rss_stat[] which represents individual memory type stats. Hence, instead of printing index, print memory type, thereby improving error message. Without patch: -------------- [ 204.836425] mm/pgtable-generic.c:29: bad p4d 0000000089eb4e92(800000025f941467) [ 204.836544] BUG: Bad rss-counter state mm:00000000f75895ea idx:0 val:2 [ 204.836615] BUG: Bad rss-counter state mm:00000000f75895ea idx:1 val:5 [ 204.836685] BUG: non-zero pgtables_bytes on freeing mm: 20480 With patch: ----------- [ 69.815453] mm/pgtable-generic.c:29: bad p4d 0000000084653642(800000025ca37467) [ 69.815872] BUG: Bad rss-counter state mm:00000000014a6c03 type:MM_FILEPAGES val:2 [ 69.815962] BUG: Bad rss-counter state mm:00000000014a6c03 type:MM_ANONPAGES val:5 [ 69.816050] BUG: non-zero pgtables_bytes on freeing mm: 20480 Also, change print function (from printk(KERN_ALERT, ..) to pr_alert()) so that it matches the other print statement. Link: http://lkml.kernel.org/r/da75b5153f617f4c5739c08ee6ebeb3d19db0fbc.1565123758.git.sai.praneeth.prakhya@intel.com Signed-off-by: Sai Praneeth Prakhya <[email protected]> Reviewed-by: Anshuman Khandual <[email protected]> Suggested-by: Dave Hansen <[email protected]> Acked-by: Michal Hocko <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Acked-by: Dave Hansen <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent aadc4e0 commit 8495f7e

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

include/linux/mm_types_task.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ struct vmacache {
3636
struct vm_area_struct *vmas[VMACACHE_SIZE];
3737
};
3838

39+
/*
40+
* When updating this, please also update struct resident_page_types[] in
41+
* kernel/fork.c
42+
*/
3943
enum {
4044
MM_FILEPAGES, /* Resident file mapping pages */
4145
MM_ANONPAGES, /* Resident anonymous pages */

kernel/fork.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ int nr_threads; /* The idle threads do not count.. */
125125

126126
static int max_threads; /* tunable limit on nr_threads */
127127

128+
#define NAMED_ARRAY_INDEX(x) [x] = __stringify(x)
129+
130+
static const char * const resident_page_types[] = {
131+
NAMED_ARRAY_INDEX(MM_FILEPAGES),
132+
NAMED_ARRAY_INDEX(MM_ANONPAGES),
133+
NAMED_ARRAY_INDEX(MM_SWAPENTS),
134+
NAMED_ARRAY_INDEX(MM_SHMEMPAGES),
135+
};
136+
128137
DEFINE_PER_CPU(unsigned long, process_counts) = 0;
129138

130139
__cacheline_aligned DEFINE_RWLOCK(tasklist_lock); /* outer */
@@ -645,12 +654,15 @@ static void check_mm(struct mm_struct *mm)
645654
{
646655
int i;
647656

657+
BUILD_BUG_ON_MSG(ARRAY_SIZE(resident_page_types) != NR_MM_COUNTERS,
658+
"Please make sure 'struct resident_page_types[]' is updated as well");
659+
648660
for (i = 0; i < NR_MM_COUNTERS; i++) {
649661
long x = atomic_long_read(&mm->rss_stat.count[i]);
650662

651663
if (unlikely(x))
652-
printk(KERN_ALERT "BUG: Bad rss-counter state "
653-
"mm:%p idx:%d val:%ld\n", mm, i, x);
664+
pr_alert("BUG: Bad rss-counter state mm:%p type:%s val:%ld\n",
665+
mm, resident_page_types[i], x);
654666
}
655667

656668
if (mm_pgtables_bytes(mm))

0 commit comments

Comments
 (0)