mm/page_alloc: reduce fallbacks to (MIGRATE_PCPTYPES - 1)
Subsystems (2)
PATCH 1/1 mm/page_alloc: reduce fallbacks to (MIGRATE_PCPTYPES - 1)
The commit 1dd214b8f21c ("mm: page_alloc: avoid merging non-fallbackable pageblocks with others") has removed MIGRATE_CMA and MIGRATE_ISOLATE from fallbacks list. so there is no need to add an element at the end of every type.
Reduce fallbacks to (MIGRATE_PCPTYPES - 1).
--- mm/page_alloc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
mm/page_alloc.c +5 -8
@@ -2603,10 +2603,10 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,* * The other migratetypes do not have fallbacks. */ -static int fallbacks[MIGRATE_TYPES ][3 ] = { - [MIGRATE_UNMOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, - [MIGRATE_MOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_UNMOVABLE ,MIGRATE_TYPES }, - [MIGRATE_RECLAIMABLE ] = {MIGRATE_UNMOVABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, +static int fallbacks[MIGRATE_TYPES ][MIGRATE_PCPTYPES -1 ] = { + [MIGRATE_UNMOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_MOVABLE }, + [MIGRATE_MOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_UNMOVABLE }, + [MIGRATE_RECLAIMABLE ] = {MIGRATE_UNMOVABLE ,MIGRATE_MOVABLE }, };#ifdef CONFIG_CMA
@@ -2865,11 +2865,8 @@ int find_suitable_fallback(struct free_area *area, unsigned int order,return -1 ; *can_steal = false; -for (i =0 ;; i++) { +for (i =0 ; i <MIGRATE_PCPTYPES -1 ; i++) { fallback_mt = fallbacks[migratetype][i]; -if (fallback_mt ==MIGRATE_TYPES ) -break ; -if (free_area_empty (area, fallback_mt))continue ;
Signature · 1 line
2.25.1
Andrew Morton
maintainerQuoted 6 lines · On Fri, 3 Feb 2023 18:01:32 +0800 Yajun Deng <[email protected]> wrote:
The commit
1dd214b8f21c("mm:page_alloc: avoid merging non-fallbackable pageblocks with others") has removedMIGRATE_CMAandMIGRATE_ISOLATEfrom fallbacks list. so there is no need to add an element at the end of every type.Reduce fallbacks to (
MIGRATE_PCPTYPES- 1).
Thanks. `git log' suggests who should be cc'ed when fixing things...
Quoted 32 lines
mm/page_alloc.c +5
-8@@ -2603,10 +2603,10 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,* * The other migratetypes do not have fallbacks. */ -static int fallbacks[MIGRATE_TYPES ][3 ] = { - [MIGRATE_UNMOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, - [MIGRATE_MOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_UNMOVABLE ,MIGRATE_TYPES }, - [MIGRATE_RECLAIMABLE ] = {MIGRATE_UNMOVABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, +static int fallbacks[MIGRATE_TYPES ][MIGRATE_PCPTYPES -1 ] = { + [MIGRATE_UNMOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_MOVABLE }, + [MIGRATE_MOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_UNMOVABLE }, + [MIGRATE_RECLAIMABLE ] = {MIGRATE_UNMOVABLE ,MIGRATE_MOVABLE }, };#ifdef CONFIG_CMA @@ -2865,11 +2865,8 @@ int find_suitable_fallback(struct free_area *area, unsigned int order,return -1 ; *can_steal = false; -for (i =0 ;; i++) { +for (i =0 ; i <MIGRATE_PCPTYPES -1 ; i++) { fallback_mt = fallbacks[migratetype][i]; -if (fallback_mt ==MIGRATE_TYPES ) -break ; -if (free_area_empty (area, fallback_mt))continue ;Signature · 1 line
2.25.1
Vlastimil Babka
Acked-byQuoted 8 lines · Andrew Morton
Quoted 6 lines · On Fri, 3 Feb 2023 18:01:32 +0800 Yajun Deng <[email protected]> wrote:
The commit
1dd214b8f21c("mm:page_alloc: avoid merging non-fallbackable pageblocks with others") has removedMIGRATE_CMAandMIGRATE_ISOLATEfrom fallbacks list. so there is no need to add an element at the end of every type.Reduce fallbacks to (
MIGRATE_PCPTYPES- 1).
Quoted 13 lines
Thanks. `git log' suggests who should be cc'ed when fixing things...
mm/page_alloc.c struct page *__rmqueue_smallest(struct zone *zone, unsigned int order, · line 2606
Quoted 11 lines
mm/page_alloc.c +1
-4@@ -2603,10 +2603,10 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,* * The other migratetypes do not have fallbacks. */ -static int fallbacks[MIGRATE_TYPES ][3 ] = { - [MIGRATE_UNMOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, - [MIGRATE_MOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_UNMOVABLE ,MIGRATE_TYPES }, - [MIGRATE_RECLAIMABLE ] = {MIGRATE_UNMOVABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, +static int fallbacks[MIGRATE_TYPES ][MIGRATE_PCPTYPES -1 ] = {
Why not also reduce the first index size from [MIGRATE_TYPES] to [MIGRATE_PCPTYPES] ?
Quoted 21 lines
Quoted 21 lines
mm/page_alloc.c +4
-4+ [MIGRATE_UNMOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_MOVABLE }, + [MIGRATE_MOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_UNMOVABLE }, + [MIGRATE_RECLAIMABLE] = { MIGRATE_UNMOVABLE, MIGRATE_MOVABLE }, };#ifdef CONFIG_CMA @@ -2865,11 +2865,8 @@ int find_suitable_fallback(struct free_area *area, unsigned int order,return -1 ; *can_steal = false; -for (i =0 ;; i++) { +for (i =0 ; i <MIGRATE_PCPTYPES -1 ; i++) { fallback_mt = fallbacks[migratetype][i]; -if (fallback_mt ==MIGRATE_TYPES ) -break ; -if (free_area_empty (area, fallback_mt))continue ;Signature · 1 line
2.25.1
Quoted 15 lines · Vlastimil Babka
Quoted 8 lines · Andrew Morton
Quoted 6 lines · On Fri, 3 Feb 2023 18:01:32 +0800 Yajun Deng <[email protected]> wrote:
The commit
1dd214b8f21c("mm:page_alloc: avoid merging non-fallbackable pageblocks with others") has removedMIGRATE_CMAandMIGRATE_ISOLATEfrom fallbacks list. so there is no need to add an element at the end of every type.Reduce fallbacks to (
MIGRATE_PCPTYPES- 1).Acked-by Vlastimil Babka <[email protected]>Quoted 2 lines
Thanks. `git log' suggests who should be cc'ed when fixing things...
Quoted 15 lines
Quoted 11 lines
mm/page_alloc.c struct page *__rmqueue_smallest(struct zone *zone, unsigned int order, · line 2606
Quoted 11 lines
mm/page_alloc.c +1
-4@@ -2603,10 +2603,10 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,* * The other migratetypes do not have fallbacks. */ -static int fallbacks[MIGRATE_TYPES ][3 ] = { - [MIGRATE_UNMOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, - [MIGRATE_MOVABLE ] = {MIGRATE_RECLAIMABLE ,MIGRATE_UNMOVABLE ,MIGRATE_TYPES }, - [MIGRATE_RECLAIMABLE ] = {MIGRATE_UNMOVABLE ,MIGRATE_MOVABLE ,MIGRATE_TYPES }, +static int fallbacks[MIGRATE_TYPES ][MIGRATE_PCPTYPES -1 ] = {Why not also reduce the first index size from [
MIGRATE_TYPES] to [MIGRATE_PCPTYPES] ?
I overlooked this. I'll do it in the next patch.
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
mm/page_alloc.c +4
-5+ [MIGRATE_UNMOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_MOVABLE }, + [MIGRATE_MOVABLE] = { MIGRATE_RECLAIMABLE, MIGRATE_UNMOVABLE }, + [MIGRATE_RECLAIMABLE] = { MIGRATE_UNMOVABLE, MIGRATE_MOVABLE }, };#ifdef CONFIG_CMA @@ -2865,11 +2865,8 @@ int find_suitable_fallback(struct free_area *area, unsigned int order,return -1 ; *can_steal = false; -for (i =0 ;; i++) { +for (i =0 ; i <MIGRATE_PCPTYPES -1 ; i++) { fallback_mt = fallbacks[migratetype][i]; -if (fallback_mt ==MIGRATE_TYPES ) -break ; -if (free_area_empty (area, fallback_mt))continue ; --2.25.1