2015-11-23 16:22:45

by Vlastimil Babka

Subject: [PATCH] mm: fix swapped Movable and Reclaimable in /proc/pagetypeinfo

Commit 016c13daa5c9 ("mm, page_alloc: use masks and shifts when converting GFP
flags to migrate types") has swapped MIGRATE_MOVABLE and MIGRATE_RECLAIMABLE
in the enum definition. However, migratetype_names wasn't updated to reflect
that. As a result, the file /proc/pagetypeinfo shows the counts for Movable as
Reclaimable and vice versa.

Additionally, commit 0aaa29a56e4f ("mm, page_alloc: reserve pageblocks for
high-order atomic allocations on demand") introduced MIGRATE_HIGHATOMIC, but
did not add a letter to distinguish it into show_migration_types(), so it
doesn't appear in the listing of free areas during page alloc failures or oom
kills.

This patch fixes both problems. The atomic reserves will show with a letter
'H' in the free areas listings.

Fixes: 016c13daa5c9e4827eca703e2f0621c131f2cca3
Fixes: 0aaa29a56e4fb0fc9e24edb649e2733a672ca099
Signed-off-by: Vlastimil Babka <[email protected]>
---
mm/page_alloc.c | 3 ++-
mm/vmstat.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 17a3c66..165980d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3647,8 +3647,9 @@ static void show_migration_types(unsigned char type)
{
static const char types[MIGRATE_TYPES] = {
[MIGRATE_UNMOVABLE] = 'U',
- [MIGRATE_RECLAIMABLE] = 'E',
[MIGRATE_MOVABLE] = 'M',
+ [MIGRATE_RECLAIMABLE] = 'E',
+ [MIGRATE_HIGHATOMIC] = 'H'
#ifdef CONFIG_CMA
[MIGRATE_CMA] = 'C',
#endif
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 879a2be..2ec3434 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -921,8 +921,8 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
#ifdef CONFIG_PROC_FS
static char * const migratetype_names[MIGRATE_TYPES] = {
"Unmovable",
- "Reclaimable",
"Movable",
+ "Reclaimable",
"HighAtomic",
#ifdef CONFIG_CMA
"CMA",
--
2.6.3

2015-11-23 16:53:50

by Vlastimil Babka

Subject: [PATCH v2] mm: fix swapped Movable and Reclaimable in /proc/pagetypeinfo

Commit 016c13daa5c9 ("mm, page_alloc: use masks and shifts when converting GFP
flags to migrate types") has swapped MIGRATE_MOVABLE and MIGRATE_RECLAIMABLE
in the enum definition. However, migratetype_names wasn't updated to reflect
that. As a result, the file /proc/pagetypeinfo shows the counts for Movable as
Reclaimable and vice versa.

Additionally, commit 0aaa29a56e4f ("mm, page_alloc: reserve pageblocks for
high-order atomic allocations on demand") introduced MIGRATE_HIGHATOMIC, but
did not add a letter to distinguish it into show_migration_types(), so it
doesn't appear in the listing of free areas during page alloc failures or oom
kills.

This patch fixes both problems. The atomic reserves will show with a letter
'H' in the free areas listings.

Fixes: 016c13daa5c9e4827eca703e2f0621c131f2cca3
Fixes: 0aaa29a56e4fb0fc9e24edb649e2733a672ca099
Signed-off-by: Vlastimil Babka <[email protected]>
---
Bah, forgot a comma in the previous patch. BTW this is for 4.4, fixes rc1 bugs.

mm/page_alloc.c | 3 ++-
mm/vmstat.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 17a3c66..9d666df 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3647,8 +3647,9 @@ static void show_migration_types(unsigned char type)
{
static const char types[MIGRATE_TYPES] = {
[MIGRATE_UNMOVABLE] = 'U',
- [MIGRATE_RECLAIMABLE] = 'E',
[MIGRATE_MOVABLE] = 'M',
+ [MIGRATE_RECLAIMABLE] = 'E',
+ [MIGRATE_HIGHATOMIC] = 'H',
#ifdef CONFIG_CMA
[MIGRATE_CMA] = 'C',
#endif
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 879a2be..2ec3434 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -921,8 +921,8 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
#ifdef CONFIG_PROC_FS
static char * const migratetype_names[MIGRATE_TYPES] = {
"Unmovable",
- "Reclaimable",
"Movable",
+ "Reclaimable",
"HighAtomic",
#ifdef CONFIG_CMA
"CMA",
--
2.6.3

2015-11-24 08:58:24

by Hillf Danton

Subject: Re: [PATCH v2] mm: fix swapped Movable and Reclaimable in /proc/pagetypeinfo

> Fixes: 016c13daa5c9e4827eca703e2f0621c131f2cca3
> Fixes: 0aaa29a56e4fb0fc9e24edb649e2733a672ca099

The correct format of the tag is
Fixes: commit id ("commit subject")

2015-11-25 11:29:56

by Mel Gorman

Subject: Re: [PATCH v2] mm: fix swapped Movable and Reclaimable in /proc/pagetypeinfo

On Mon, Nov 23, 2015 at 05:53:10PM +0100, Vlastimil Babka wrote:
> Commit 016c13daa5c9 ("mm, page_alloc: use masks and shifts when converting GFP
> flags to migrate types") has swapped MIGRATE_MOVABLE and MIGRATE_RECLAIMABLE
> in the enum definition. However, migratetype_names wasn't updated to reflect
> that. As a result, the file /proc/pagetypeinfo shows the counts for Movable as
> Reclaimable and vice versa.
>
> Additionally, commit 0aaa29a56e4f ("mm, page_alloc: reserve pageblocks for
> high-order atomic allocations on demand") introduced MIGRATE_HIGHATOMIC, but
> did not add a letter to distinguish it into show_migration_types(), so it
> doesn't appear in the listing of free areas during page alloc failures or oom
> kills.
>
> This patch fixes both problems. The atomic reserves will show with a letter
> 'H' in the free areas listings.
>
> Fixes: 016c13daa5c9e4827eca703e2f0621c131f2cca3
> Fixes: 0aaa29a56e4fb0fc9e24edb649e2733a672ca099
> Signed-off-by: Vlastimil Babka <[email protected]>

Thanks

Acked-by: Mel Gorman <[email protected]>

--
Mel Gorman
SUSE Labs