mm/cma: better error handling and count pages per zone
Subsystems (6)
cover mm/cma: better error handling and count pages per zone
Two improvements for CMA:
1. When activation of a CMA area fails, hand back all pages to the buddy
2. Count CMA pages per zone and print them in /proc/zoneinfo
David Hildenbrand (2):
mm/cma: expose all pages to the buddy if activation of an area fails mm/page_alloc: count CMA pages per zone and print them in
/proc/zoneinfo
include/linux/mmzone.h | 4 ++++ mm/cma.c | 43 +++++++++++++++++++++--------------------- mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 4 files changed, 30 insertions(+), 24 deletions(-)
Signature · 1 line
2.29.2
PATCH 1/2 mm/cma: expose all pages to the buddy if activation of an area fails
Right now, if activation fails, we might already have exposed some pages to the buddy for CMA use (although they will never get actually used by CMA), and some pages won't be exposed to the buddy at all.
Let's check for "single zone" early and on error, don't expose any pages for CMA use - instead, expose them to the buddy available for any use. Simply call free_reserved_page() on every single page - easier than going via free_reserved_area(), converting back and forth between pfns and virt addresses.
In addition, make sure to fixup totalcma_pages properly.
Example: 6 GiB QEMU VM with "... hugetlb_cma=2G movablecore=20% ...":
[ 0.006891] hugetlb_cma: reserve 2048 MiB, up to 2048 MiB per node [ 0.006893] cma: Reserved 2048 MiB at 0x0000000100000000 [ 0.006893] hugetlb_cma: reserved 2048 MiB on node 0 ... [ 0.175433] cma: CMA area hugetlb0 could not be activated
Before this patch:
# cat /proc/meminfo MemTotal: 5867348 kB MemFree: 5692808 kB MemAvailable: 5542516 kB ... CmaTotal: 2097152 kB CmaFree: 1884160 kB
After this patch:
# cat /proc/meminfo MemTotal: 6077308 kB MemFree: 5904208 kB MemAvailable: 5747968 kB ... CmaTotal: 0 kB CmaFree: 0 kB
Note: cma_init_reserved_mem() makes sure that we always cover full pageblocks / MAX_ORDER - 1 pages.
--- mm/cma.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-)
mm/cma.c +21 -22
@@ -94,34 +94,29 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,static void __init cma_activate_area (struct cma *cma) { -unsigned long base_pfn = cma->base_pfn, pfn = base_pfn; -unsigned i = cma->count >> pageblock_order; +unsigned long base_pfn = cma->base_pfn, pfn;struct zone *zone; cma->bitmap =bitmap_zalloc (cma_bitmap_maxno (cma),GFP_KERNEL );if (!cma->bitmap) goto out_error; -WARN_ON_ONCE (!pfn_valid (pfn)); - zone =page_zone (pfn_to_page (pfn)); - -do { -unsigned j; - - base_pfn = pfn; -for (j = pageblock_nr_pages; j; --j, pfn++) { -WARN_ON_ONCE (!pfn_valid (pfn)); -/* -* alloc_contig_range requires the pfn range -* specified to be in the same zone. Make this -* simple by forcing the entire CMA resv range -* to be in the same zone. -*/ -if (page_zone (pfn_to_page (pfn)) != zone) - goto not_in_zone; - } -init_cma_reserved_pageblock (pfn_to_page (base_pfn)); - }while (--i); +/* +* alloc_contig_range() requires the pfn range specified to be in the +* same zone. Simplify by forcing the entire CMA resv range to be in the +* same zone. +*/ +WARN_ON_ONCE (!pfn_valid (base_pfn)); + zone =page_zone (pfn_to_page (base_pfn)); +for (pfn = base_pfn +1 ; pfn < base_pfn + cma->count; pfn++) { +WARN_ON_ONCE (!pfn_valid (pfn)); +if (page_zone (pfn_to_page (pfn)) != zone) + goto not_in_zone; + } + +for (pfn = base_pfn; pfn < base_pfn + cma->count; + pfn += pageblock_nr_pages) +init_cma_reserved_pageblock (pfn_to_page (pfn));mutex_init (&cma->lock);
@@ -135,6 +130,10 @@ static void __init cma_activate_area(struct cma *cma) not_in_zone:bitmap_free (cma->bitmap); out_error: +/* Expose all pages to the buddy, they are useless for CMA. */ +for (pfn = base_pfn; pfn < base_pfn + cma->count; pfn++) +free_reserved_page (pfn_to_page (pfn)); + totalcma_pages -= cma->count; cma->count =0 ;pr_err ("CMA area %s could not be activated\n" , cma->name);return ;
Signature · 1 line
2.29.2
PATCH 2/2 mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to David HildenbrandLet's count the number of CMA pages per zone and print them in /proc/zoneinfo.
Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently (e.g., like ZONE_MOVABLE) - even after some of these pages might already have been allocated.
For now, we are only able to get the global nr+free cma pages from /proc/meminfo and the free cma pages per zone from /proc/zoneinfo.
Note: Track/print that information even without CONFIG_CMA, similar to "nr_free_cma" in /proc/zoneinfo. This is different to /proc/meminfo - maybe we want to make that consistent in the future (however, changing /proc/zoneinfo output might uglify the code a bit).
--- include/linux/mmzone.h | 4 ++++ mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-)
include/linux/mmzone.h +4 -0
@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used
@@ -527,6 +530,7 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +unsigned long cma_pages;const char *name;
mm/page_alloc.c +1 -0
@@ -2168,6 +2168,7 @@ void __init init_cma_reserved_pageblock(struct page *page) }adjust_managed_page_count (page, pageblock_nr_pages); +page_zone (page)->cma_pages += pageblock_nr_pages; }#endif
mm/vmstat.c +4 -2
@@ -1642,14 +1642,16 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n high %lu" "\n spanned %lu" "\n present %lu" -"\n managed %lu" , +"\n managed %lu" +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone_managed_pages(zone)); +zone_managed_pages (zone), + zone->cma_pages); seq_printf(m, "\n protection: (%ld",
Signature · 1 line
2.29.2
Zi Yan
reviewerRe: [PATCH v1 1/2] mm/cma: expose all pages to the buddy if activation of an area fails
In reply to David HildenbrandQuoted 48 lines · David Hildenbrand
Right now, if activation fails, we might already have exposed some pages to the buddy for CMA use (although they will never get actually used by CMA), and some pages won't be exposed to the buddy at all.
Let's check for "single zone" early and on error, don't expose any pages for CMA use - instead, expose them to the buddy available for any use. Simply call
free_reserved_page()on every single page - easier than going viafree_reserved_area(), converting back and forth between pfns and virt addresses.In addition, make sure to fixup
totalcma_pagesproperly.Example: 6 GiB QEMU VM with "... hugetlb_cma=2G movablecore=20% ...":
[ 0.006891] hugetlb_cma: reserve 2048 MiB, up to 2048 MiB per node [ 0.006893] cma: Reserved 2048 MiB at 0x0000000100000000 [ 0.006893] hugetlb_cma: reserved 2048 MiB on node 0 ... [ 0.175433] cma: CMA area hugetlb0 could not be activatedBefore this patch:
# cat /proc/meminfo MemTotal: 5867348 kB MemFree: 5692808 kB MemAvailable: 5542516 kB ... CmaTotal: 2097152 kB CmaFree: 1884160 kBAfter this patch:
# cat /proc/meminfo MemTotal: 6077308 kB MemFree: 5904208 kB MemAvailable: 5747968 kB ... CmaTotal: 0 kB CmaFree: 0 kBNote:
cma_init_reserved_mem()makes sure that we always cover full pageblocks /MAX_ORDER- 1 pages.Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 3 lines
--- mm/cma.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-)
LGTM. Reviewed-by: Zi Yan <[email protected]>
—
Best Regards,
Yan Zi
Re: [PATCH v1 1/2] mm/cma: expose all pages to the buddy if activation of an area fails
In reply to David HildenbrandQuoted 40 lines · David Hildenbrand
Right now, if activation fails, we might already have exposed some pages to the buddy for CMA use (although they will never get actually used by CMA), and some pages won't be exposed to the buddy at all.
Let's check for "single zone" early and on error, don't expose any pages for CMA use - instead, expose them to the buddy available for any use. Simply call
free_reserved_page()on every single page - easier than going viafree_reserved_area(), converting back and forth between pfns and virt addresses.In addition, make sure to fixup
totalcma_pagesproperly.Example: 6 GiB QEMU VM with "... hugetlb_cma=2G movablecore=20% ...":
[ 0.006891] hugetlb_cma: reserve 2048 MiB, up to 2048 MiB per node [ 0.006893] cma: Reserved 2048 MiB at 0x0000000100000000 [ 0.006893] hugetlb_cma: reserved 2048 MiB on node 0 ... [ 0.175433] cma: CMA area hugetlb0 could not be activatedBefore this patch:
# cat /proc/meminfo MemTotal: 5867348 kB MemFree: 5692808 kB MemAvailable: 5542516 kB ... CmaTotal: 2097152 kB CmaFree: 1884160 kBAfter this patch:
# cat /proc/meminfo MemTotal: 6077308 kB MemFree: 5904208 kB MemAvailable: 5747968 kB ... CmaTotal: 0 kB CmaFree: 0 kBNote:
cma_init_reserved_mem()makes sure that we always cover full pageblocks /MAX_ORDER- 1 pages.
Quoted 8 lines
Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Besides benefit of the error handling, I find this code much more cleaer:
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v1 2/2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to David HildenbrandQuoted 8 lines · David Hildenbrand
Let's count the number of CMA pages per zone and print them in
/proc/zoneinfo.Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently (e.g., like
ZONE_MOVABLE) - even after some of these pages might already have been allocated.
My knowledge of CMA tends to be quite low, actually I though that CMA was somehow tied to ZONE_MOVABLE.
I see how tracking CMA pages per zona might give you a clue, but what do you mean by "might behave differently - even after some of these pages might already have been allocated"
Quoted 36 lines
For now, we are only able to get the global nr+free cma pages from
/proc/meminfoand the free cma pages per zone from/proc/zoneinfo.Note: Track/print that information even without
CONFIG_CMA, similar to "nr_free_cma" in/proc/zoneinfo. This is different to/proc/meminfo- maybe we want to make that consistent in the future (however, changing/proc/zoneinfooutput might uglify the code a bit).Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- include/linux/mmzone.h | 4 ++++ mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-)include/linux/mmzone.h +3
-0@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used
include/linux/mmzone.h struct zone { · line 533
Quoted 4 lines
include/linux/mmzone.h +1
-0@@ -527,6 +530,7 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +unsigned long cma_pages;
I see that NR_FREE_CMA_PAGES is there even without CONFIG_CMA, as you said, but I am not sure about adding size to a zone unconditionally. I mean, it is not terrible as IIRC, the maximum MAX_NUMNODES can get is 1024, and on x86_64 that would be (1024 * 4 zones) * 8 = 32K. So not a big deal, but still.
Besides following NR_FREE_CMA_PAGES, is there any reason for not doing:
include/linux/mmzone.h +3 -0
@@ -436,6 +436,9 @@ struct zone {unsigned long managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA +unsigned long cma_pages; +#endif const char *name;
mm/vmstat.c +3 -1
@@ -1559,13 +1559,15 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" , +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone->managed_pages); + zone->managed_pages, + IS_ENABLED(CONFIG_CMA) ? zone->cma_pages : 0); seq_printf(m, "\n protection: (%ld",
I do not see it that ugly, but just my taste.
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v1 2/2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 4 lines · Oscar Salvador
Quoted 3 lines · David Hildenbrand
Let's count the number of CMA pages per zone and print them in
/proc/zoneinfo.
Quoted 8 lines
Quoted 5 lines
Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently (e.g., like
ZONE_MOVABLE) - even after some of these pages might already have been allocated.My knowledge of CMA tends to be quite low, actually I though that CMA was somehow tied to
ZONE_MOVABLE.
CMA is often placed into one of the kernel zones, but can also end up in the movable zone.
Quoted 4 lines
I see how tracking CMA pages per zona might give you a clue, but what do you mean by "might behave differently - even after some of these pages might already have been allocated"
Assume you have 4GB in ZONE_NORMAL but 1GB is assigned for CMA. You actually only have 3GB available for random kernel allocations, not 4GB.
Currently, you can only observe the free CMA pages, excluding any pages that are already allocated. Having that information how many CMA pages we have can be helpful - similar to what we already have in /proc/meminfo.
Quoted 39 lines
Quoted 39 lines
For now, we are only able to get the global nr+free cma pages from
/proc/meminfoand the free cma pages per zone from/proc/zoneinfo.Note: Track/print that information even without
CONFIG_CMA, similar to "nr_free_cma" in/proc/zoneinfo. This is different to/proc/meminfo- maybe we want to make that consistent in the future (however, changing/proc/zoneinfooutput might uglify the code a bit).Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- include/linux/mmzone.h | 4 ++++ mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-)include/linux/mmzone.h +3
-0@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used @@ -527,6 +530,7 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;
Quoted 8 lines
include/linux/mmzone.h struct zone { · line 533
Quoted 2 lines
include/linux/mmzone.h +1
-0unsigned long present_pages; +unsigned long cma_pages;I see that
NR_FREE_CMA_PAGESis there even withoutCONFIG_CMA, as you said, but I am not sure about adding size to a zone unconditionally. I mean, it is not terrible as IIRC, the maximumMAX_NUMNODEScan get is 1024, and onx86_64that would be (1024 * 4 zones) * 8 = 32K. So not a big deal, but still.
I'm asking myself how many such systems will run without CONFIG_CMA in the future.
Quoted 40 lines
Besides following
NR_FREE_CMA_PAGES, is there any reason for not doing:include/linux/mmzone.h +3
-0@@ -436,6 +436,9 @@ struct zone {unsigned long managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA +unsigned long cma_pages; +#endif const char *name;mm/vmstat.c +3
-1@@ -1559,13 +1559,15 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" , +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone->managed_pages); + zone->managed_pages, + IS_ENABLED(CONFIG_CMA) ? zone->cma_pages : 0); seq_printf(m, "\n protection: (%ld",
Quoted 1 line
I do not see it that ugly, but just my taste.
IIRC, that does not work. The compiler will still complain about a missing struct members. We would have to provide a zone_cma_pages() helper with some ifdefery.
We could do something like this on top
include/linux/mmzone.h +2 -0
@@ -530,7 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA unsigned long cma_pages; +#endif const char *name;
mm/vmstat.c +8 -2
@@ -1643,7 +1643,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" -"\n cma %lu" , +#ifdef CONFIG_CMA +"\n cma %lu" +#endif + "%s", zone_page_state(zone,NR_FREE_PAGES ),min_wmark_pages (zone), low_wmark_pages(zone),
@@ -1651,7 +1654,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages, zone->present_pages,zone_managed_pages (zone), - zone->cma_pages); +#ifdef CONFIG_CMA + zone->cma_pages, +#endif + ""); seq_printf(m, "\n protection: (%ld",
Getting rid of NR_FREE_CMA_PAGES will be more ugly.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v1 2/2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 4 lines · David Hildenbrand
Quoted 2 lines
My knowledge of CMA tends to be quite low, actually I though that CMA was somehow tied to
ZONE_MOVABLE.CMA is often placed into one of the kernel zones, but can also end up in the movable zone.
Ok good to know.
Quoted 7 lines
Quoted 3 lines
I see how tracking CMA pages per zona might give you a clue, but what do you mean by "might behave differently - even after some of these pages might already have been allocated"
Assume you have 4GB in
ZONE_NORMALbut 1GB is assigned for CMA. You actually only have 3GB available for random kernel allocations, not 4GB.Currently, you can only observe the free CMA pages, excluding any pages that are already allocated. Having that information how many CMA pages we have can be helpful - similar to what we already have in
/proc/meminfo.
I see, I agree that it can provide some guidance.
Quoted 8 lines
Quoted 5 lines
I see that
NR_FREE_CMA_PAGESis there even withoutCONFIG_CMA, as you said, but I am not sure about adding size to a zone unconditionally. I mean, it is not terrible as IIRC, the maximumMAX_NUMNODEScan get is 1024, and onx86_64that would be (1024 * 4 zones) * 8 = 32K. So not a big deal, but still.I'm asking myself how many such systems will run without
CONFIG_CMAin the future.
I am not sure, my comment was just to point out that even the added size might not be that large, hiding it under CONFIG_CMA seemed the right thing to do.
Quoted 22 lines
Quoted 22 lines
mm/vmstat.c +3
-1@@ -1559,13 +1559,15 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" , +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone->managed_pages); + zone->managed_pages, + IS_ENABLED(CONFIG_CMA) ? zone->cma_pages : 0); seq_printf(m, "\n protection: (%ld",
Quoted 5 lines
Quoted 1 line
I do not see it that ugly, but just my taste.
IIRC, that does not work. The compiler will still complain about a missing struct members. We would have to provide a
zone_cma_pages()helper with some ifdefery.
Of course, it seems I switched off my brain.
Quoted 29 lines
We could do something like this on top
include/linux/mmzone.h +2
-0@@ -530,7 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA unsigned long cma_pages; +#endif const char *name;mm/vmstat.c +4
-1@@ -1643,7 +1643,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" -"\n cma %lu" , +#ifdef CONFIG_CMA +"\n cma %lu" +#endif + "%s", zone_page_state(zone,NR_FREE_PAGES ),min_wmark_pages (zone), low_wmark_pages(zone),
mm/vmstat.c static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, · line 1662
Quoted 10 lines
mm/vmstat.c +4
-1@@ -1651,7 +1654,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages, zone->present_pages,zone_managed_pages (zone), - zone->cma_pages); +#ifdef CONFIG_CMA + zone->cma_pages, +#endif + ""); seq_printf(m, "\n protection: (%ld",
Looks good to me, but I can see how those #ifdef can raise some eyebrows.
Let us see what other thinks as well.
Btw, should linux-uapi be CCed, as /proc/vmstat layout will change?
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v1 2/2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 1 line · Oscar Salvador
Btw, should linux-uapi be CCed, as
/proc/vmstatlayout will change?
I meant /proc/zoneinfo
Quoted 5 lines
Signature · 3 lines
-- Oscar Salvador SUSE L3
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v1 2/2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to Oscar SalvadorQuoted 95 lines · Oscar Salvador
Quoted 4 lines · David Hildenbrand
Quoted 2 lines
My knowledge of CMA tends to be quite low, actually I though that CMA was somehow tied to
ZONE_MOVABLE.CMA is often placed into one of the kernel zones, but can also end up in the movable zone.
Ok good to know.
Quoted 7 lines
Quoted 3 lines
I see how tracking CMA pages per zona might give you a clue, but what do you mean by "might behave differently - even after some of these pages might already have been allocated"
Assume you have 4GB in
ZONE_NORMALbut 1GB is assigned for CMA. You actually only have 3GB available for random kernel allocations, not 4GB.Currently, you can only observe the free CMA pages, excluding any pages that are already allocated. Having that information how many CMA pages we have can be helpful - similar to what we already have in
/proc/meminfo.I see, I agree that it can provide some guidance.
Quoted 8 lines
Quoted 5 lines
I see that
NR_FREE_CMA_PAGESis there even withoutCONFIG_CMA, as you said, but I am not sure about adding size to a zone unconditionally. I mean, it is not terrible as IIRC, the maximumMAX_NUMNODEScan get is 1024, and onx86_64that would be (1024 * 4 zones) * 8 = 32K. So not a big deal, but still.I'm asking myself how many such systems will run without
CONFIG_CMAin the future.I am not sure, my comment was just to point out that even the added size might not be that large, hiding it under
CONFIG_CMAseemed the right thing to do.Quoted 22 lines
Quoted 22 lines
mm/vmstat.c +3
-1@@ -1559,13 +1559,15 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" , +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone->managed_pages); + zone->managed_pages, + IS_ENABLED(CONFIG_CMA) ? zone->cma_pages : 0); seq_printf(m, "\n protection: (%ld",Quoted 5 lines
Quoted 1 line
I do not see it that ugly, but just my taste.
IIRC, that does not work. The compiler will still complain about a missing struct members. We would have to provide a
zone_cma_pages()helper with some ifdefery.Of course, it seems I switched off my brain.
Quoted 34 lines
We could do something like this on top
include/linux/mmzone.h +2
-0@@ -530,7 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA unsigned long cma_pages; +#endif const char *name;mm/vmstat.c +5
-2@@ -1643,7 +1643,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n spanned %lu" "\n present %lu" "\n managed %lu" -"\n cma %lu" , +#ifdef CONFIG_CMA +"\n cma %lu" +#endif + "%s", zone_page_state(zone,NR_FREE_PAGES ),min_wmark_pages (zone), low_wmark_pages(zone),@@ -1651,7 +1654,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages, zone->present_pages,zone_managed_pages (zone), - zone->cma_pages); +#ifdef CONFIG_CMA
Quoted 8 lines
mm/vmstat.c static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, · line 1663
Quoted 5 lines
mm/vmstat.c +3
-0+ zone->cma_pages, +#endif + ""); seq_printf(m, "\n protection: (%ld",Looks good to me, but I can see how those #ifdef can raise some eyebrows.
We could print it further above to avoid the "%s" ... "", or print it separately below. Then we'd only need a single ifdef. Might make sense
Quoted 3 lines
Let us see what other thinks as well.
Btw, should linux-uapi be CCed, as
/proc/vmstatlayout will change?
Is there a linux-uapi@ list? I know linux-api@ ("forum to discuss changes that affect the Linux programming interface (API or ABI)".
Good question, I can certainly cc linux-api@, although I doubt it's strictly necessary when adding something here.
Thanks!
Signature · 3 lines
Thanks, David / dhildenb
PATCH v2 1/1 mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to David HildenbrandLet's count the number of CMA pages per zone and print them in /proc/zoneinfo.
Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently, even after some of these pages might already have been allocated.
As one example, CMA pages part of a kernel zone cannot be used for ordinary kernel allocations but instead behave more like ZONE_MOVABLE.
For now, we are only able to get the global nr+free cma pages from /proc/meminfo and the free cma pages per zone from /proc/zoneinfo.
Example after this patch when booting a 6 GiB QEMU VM with "hugetlb_cma=2G":
# cat /proc/zoneinfo | grep cma
cma 0
nr_free_cma 0
cma 0
nr_free_cma 0
cma 524288
nr_free_cma 493016
cma 0
cma 0
# cat /proc/meminfo | grep Cma
CmaTotal: 2097152 kB
CmaFree: 1972064 kBNote: We track/print only with CONFIG_CMA; "nr_free_cma" in /proc/zoneinfo is currently also printed without CONFIG_CMA.
---
v1 -> v2:
- Print/track only with CONFIG_CMA
- Extend patch description
--- include/linux/mmzone.h | 6 ++++++ mm/page_alloc.c | 1 + mm/vmstat.c | 5 +++++ 3 files changed, 12 insertions(+)
include/linux/mmzone.h +6 -0
@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used
@@ -527,6 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA +unsigned long cma_pages; +#endif const char *name;
mm/page_alloc.c +1 -0
@@ -2168,6 +2168,7 @@ void __init init_cma_reserved_pageblock(struct page *page) }adjust_managed_page_count (page, pageblock_nr_pages); +page_zone (page)->cma_pages += pageblock_nr_pages; }#endif
mm/vmstat.c +5 -0
@@ -1650,6 +1650,11 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages, zone->present_pages, zone_managed_pages(zone)); +#ifdef CONFIG_CMA +seq_printf (m, +"\n cma %lu" , + zone->cma_pages); +#endif seq_printf(m, "\n protection: (%ld",
Signature · 1 line
2.29.2
Re: [PATCH v2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 32 lines · David Hildenbrand
Let's count the number of CMA pages per zone and print them in
/proc/zoneinfo.Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently, even after some of these pages might already have been allocated.
As one example, CMA pages part of a kernel zone cannot be used for ordinary kernel allocations but instead behave more like
ZONE_MOVABLE.For now, we are only able to get the global nr+free cma pages from
/proc/meminfoand the free cma pages per zone from/proc/zoneinfo.Example after this patch when booting a 6 GiB QEMU VM with "hugetlb_cma=2G":
# cat /proc/zoneinfo | grep cma cma 0 nr_free_cma 0 cma 0 nr_free_cma 0 cma 524288 nr_free_cma 493016 cma 0 cma 0 # cat /proc/meminfo | grep Cma CmaTotal: 2097152 kB CmaFree: 1972064 kBNote: We track/print only with
CONFIG_CMA; "nr_free_cma" in/proc/zoneinfois currently also printed withoutCONFIG_CMA.
Quoted 9 lines
Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
IMHO looks better to me, thanks:
Quoted 67 lines
---
v1 -> v2:
- Print/track only withCONFIG_CMA
- Extend patch description--- include/linux/mmzone.h | 6 ++++++ mm/page_alloc.c | 1 + mm/vmstat.c | 5 +++++ 3 files changed, 12 insertions(+)include/linux/mmzone.h +6
-0@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used @@ -527,6 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA +unsigned long cma_pages; +#endif const char *name;mm/page_alloc.c +1
-0@@ -2168,6 +2168,7 @@ void __init init_cma_reserved_pageblock(struct page *page) }adjust_managed_page_count (page, pageblock_nr_pages); +page_zone (page)->cma_pages += pageblock_nr_pages; }#endif mm/vmstat.c +5
-0@@ -1650,6 +1650,11 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages, zone->present_pages, zone_managed_pages(zone)); +#ifdef CONFIG_CMA +seq_printf (m, +"\n cma %lu" , + zone->cma_pages); +#endif seq_printf(m, "\n protection: (%ld",Signature · 1 line
2.29.2
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to David HildenbrandQuoted 6 lines · David Hildenbrand
mm/vmstat.c +0
-0@@ -1650,6 +1650,11 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages,
mm/vmstat.c static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, · line 1660
Quoted 10 lines
mm/vmstat.c +5
-0zone->present_pages, zone_managed_pages(zone)); +#ifdef CONFIG_CMA +seq_printf (m, +"\n cma %lu" , + zone->cma_pages); +#endif seq_printf(m, "\n protection: (%ld",
Hmm, not sure about this. If cma is only printed for CONFIG_CMA, we can't distinguish between (1) a kernel without your patch without including some version checking and (2) a kernel without CONFIG_CMA enabled. IOW, "cma 0" carries value: we know immediately that we do not have any CMA pages on this zone, period.
/proc/zoneinfo is also not known for its conciseness so I think printing "cma 0" even for !CONFIG_CMA is helpful :)
I think this #ifdef should be removed and it should call into a zone_cma_pages(struct zone *zone) which returns 0UL if disabled.
Re: [PATCH v2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 28 lines
Am 28.01.2021 um 22:54 schrieb David Rientjes <[email protected]>:
Quoted 6 lines · David Hildenbrand
mm/vmstat.c +0
-0@@ -1650,6 +1650,11 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages,mm/vmstat.c static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, · line 1660
Quoted 10 lines
mm/vmstat.c +5
-0zone->present_pages, zone_managed_pages(zone)); +#ifdef CONFIG_CMA +seq_printf (m, +"\n cma %lu" , + zone->cma_pages); +#endif seq_printf(m, "\n protection: (%ld",Hmm, not sure about this. If cma is only printed for
CONFIG_CMA, we can't distinguish between (1) a kernel without your patch without including some version checking and (2) a kernel withoutCONFIG_CMAenabled. IOW, "cma 0" carries value: we know immediately that we do not have any CMA pages on this zone, period.
Quoted 6 lines
/proc/zoneinfois also not known for its conciseness so I think printing "cma 0" even for !CONFIG_CMA is helpful :)I think this #ifdef should be removed and it should call into a
zone_cma_pages(struct zone *zone)which returns 0UL if disabled.
Yeah, that’s also what I proposed in a sub-thread here.
The last option would be going the full mile and not printing nr_free_cma. Code might get a bit uglier though, but we could also remove that stats counter ;)
I don‘t particularly care, while printing „0“ might be easier, removing nr_free_cma might be cleaner.
But then, maybe there are tools that expect that value to be around on any kernel?
Thoughts?
Thanks
Re: [PATCH v2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 25 lines · David Hildenbrand
Quoted 25 lines
Quoted 6 lines · David Hildenbrand
mm/vmstat.c +0
-0@@ -1650,6 +1650,11 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages,mm/vmstat.c static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, · line 1660
Quoted 10 lines
mm/vmstat.c +5
-0zone->present_pages, zone_managed_pages(zone)); +#ifdef CONFIG_CMA +seq_printf (m, +"\n cma %lu" , + zone->cma_pages); +#endif seq_printf(m, "\n protection: (%ld",Hmm, not sure about this. If cma is only printed for
CONFIG_CMA, we can't distinguish between (1) a kernel without your patch without including some version checking and (2) a kernel withoutCONFIG_CMAenabled. IOW, "cma 0" carries value: we know immediately that we do not have any CMA pages on this zone, period.
Quoted 9 lines
Quoted 6 lines
/proc/zoneinfois also not known for its conciseness so I think printing "cma 0" even for !CONFIG_CMA is helpful :)I think this #ifdef should be removed and it should call into a
zone_cma_pages(struct zone *zone)which returns 0UL if disabled.Yeah, that’s also what I proposed in a sub-thread here.
Ah, I certainly think your original intuition was correct.
Quoted 6 lines
The last option would be going the full mile and not printing
nr_free_cma. Code might get a bit uglier though, but we could also remove that stats counter ;)I don‘t particularly care, while printing „0“ might be easier, removing
nr_free_cmamight be cleaner.But then, maybe there are tools that expect that value to be around on any kernel?
Yeah, that's probably undue risk, the ship has sailed and there's no significant upside.
I still think "cma 0" in /proc/zoneinfo carries value, though, especially for NUMA and it looks like this is how it's done in linux-next. With a single read of the file, userspace can make the determination what CMA pages exist on this node.
In general, I think the rule-of-thumb is that the fewer ifdefs in /proc/zoneinfo, the easier it is for userspace to parse it.
(I made that change to /proc/zoneinfo to even print non-existant zones for each node because otherwise you cannot determine what the indices of things like vm.lowmem_reserve_ratio represent.)
Re: [PATCH v2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 52 lines
Am 28.01.2021 um 23:28 schrieb David Rientjes <[email protected]>:
Quoted 25 lines · David Hildenbrand
Quoted 25 lines
Quoted 6 lines · David Hildenbrand
mm/vmstat.c +0
-0@@ -1650,6 +1650,11 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, zone->spanned_pages,mm/vmstat.c static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, · line 1660
Quoted 10 lines
mm/vmstat.c +5
-0zone->present_pages, zone_managed_pages(zone)); +#ifdef CONFIG_CMA +seq_printf (m, +"\n cma %lu" , + zone->cma_pages); +#endif seq_printf(m, "\n protection: (%ld",Hmm, not sure about this. If cma is only printed for
CONFIG_CMA, we can't distinguish between (1) a kernel without your patch without including some version checking and (2) a kernel withoutCONFIG_CMAenabled. IOW, "cma 0" carries value: we know immediately that we do not have any CMA pages on this zone, period.Quoted 9 lines
Quoted 6 lines
/proc/zoneinfois also not known for its conciseness so I think printing "cma 0" even for !CONFIG_CMA is helpful :)I think this #ifdef should be removed and it should call into a
zone_cma_pages(struct zone *zone)which returns 0UL if disabled.Yeah, that’s also what I proposed in a sub-thread here.
Ah, I certainly think your original intuition was correct.
Quoted 6 lines
The last option would be going the full mile and not printing
nr_free_cma. Code might get a bit uglier though, but we could also remove that stats counter ;)I don‘t particularly care, while printing „0“ might be easier, removing
nr_free_cmamight be cleaner.But then, maybe there are tools that expect that value to be around on any kernel?
Yeah, that's probably undue risk, the ship has sailed and there's no significant upside.
Quoted 7 lines
I still think "cma 0" in
/proc/zoneinfocarries value, though, especially for NUMA and it looks like this is how it's done in linux-next. With a single read of the file, userspace can make the determination what CMA pages exist on this node.In general, I think the rule-of-thumb is that the fewer ifdefs in
/proc/zoneinfo, the easier it is for userspace to parse it.
Makes sense, I‘ll send an updated version tomorrow - thanks!
Quoted 4 lines
(I made that change to
/proc/zoneinfoto even print non-existant zones for each node because otherwise you cannot determine what the indices of things like vm.lowmem_reserve_ratio represent.)
PATCH v3 1/1 mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to David HildenbrandLet's count the number of CMA pages per zone and print them in /proc/zoneinfo.
Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently, even after some of these pages might already have been allocated.
As one example, CMA pages part of a kernel zone cannot be used for ordinary kernel allocations but instead behave more like ZONE_MOVABLE.
For now, we are only able to get the global nr+free cma pages from /proc/meminfo and the free cma pages per zone from /proc/zoneinfo.
Example after this patch when booting a 6 GiB QEMU VM with "hugetlb_cma=2G":
# cat /proc/zoneinfo | grep cma
cma 0
nr_free_cma 0
cma 0
nr_free_cma 0
cma 524288
nr_free_cma 493016
cma 0
cma 0
# cat /proc/meminfo | grep Cma
CmaTotal: 2097152 kB
CmaFree: 1972064 kBNote: We print even without CONFIG_CMA, just like "nr_free_cma"; this way,
one can be sure when spotting "cma 0", that there are definetly no CMA pages located in a zone.
---
The third time is the charm.
v2 -> v3:
- Print even without CONFIG_CMA. Use zone_cma_pages().
- Adjust patch description
- Dropped Oscar's RB due to the changes
v1 -> v2:
- Print/track only with CONFIG_CMA
- Extend patch description
--- include/linux/mmzone.h | 15 +++++++++++++++ mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-)
include/linux/mmzone.h +15 -0
@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used
@@ -527,6 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA +unsigned long cma_pages; +#endif const char *name;
@@ -624,6 +630,15 @@ static inline unsigned long zone_managed_pages(struct zone *zone)return (unsigned long )atomic_long_read (&zone->managed_pages); } +static inline unsigned long zone_cma_pages (struct zone *zone) +{ +#ifdef CONFIG_CMA +return zone->cma_pages; +#else +return 0 ; +#endif +} +static inline unsigned long zone_end_pfn (const struct zone *zone) {return zone->zone_start_pfn + zone->spanned_pages;
mm/page_alloc.c +1 -0
@@ -2168,6 +2168,7 @@ void __init init_cma_reserved_pageblock(struct page *page) }adjust_managed_page_count (page, pageblock_nr_pages); +page_zone (page)->cma_pages += pageblock_nr_pages; }#endif
mm/vmstat.c +4 -2
@@ -1642,14 +1642,16 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n high %lu" "\n spanned %lu" "\n present %lu" -"\n managed %lu" , +"\n managed %lu" +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone_managed_pages(zone)); +zone_managed_pages (zone), + zone_cma_pages(zone)); seq_printf(m, "\n protection: (%ld",
Signature · 1 line
2.29.2
Re: [PATCH v3] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 33 lines · David Hildenbrand
Let's count the number of CMA pages per zone and print them in
/proc/zoneinfo.Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently, even after some of these pages might already have been allocated.
As one example, CMA pages part of a kernel zone cannot be used for ordinary kernel allocations but instead behave more like
ZONE_MOVABLE.For now, we are only able to get the global nr+free cma pages from
/proc/meminfoand the free cma pages per zone from/proc/zoneinfo.Example after this patch when booting a 6 GiB QEMU VM with "hugetlb_cma=2G":
# cat /proc/zoneinfo | grep cma cma 0 nr_free_cma 0 cma 0 nr_free_cma 0 cma 524288 nr_free_cma 493016 cma 0 cma 0 # cat /proc/meminfo | grep Cma CmaTotal: 2097152 kB CmaFree: 1972064 kBNote: We print even without
CONFIG_CMA, just like "nr_free_cma"; this way,
one can be sure when spotting "cma 0", that there are definetly no CMA pages located in a zone.
Quoted 10 lines
Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Cc David Rientjes <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Looks good to me, I guess it is better to print it unconditionally so the layout does not change.
thanks
Quoted 98 lines
---
The third time is the charm.
v2 -> v3:
- Print even withoutCONFIG_CMA. Usezone_cma_pages().
- Adjust patch description
- Dropped Oscar's RB due to the changesv1 -> v2:
- Print/track only withCONFIG_CMA
- Extend patch description--- include/linux/mmzone.h | 15 +++++++++++++++ mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-)include/linux/mmzone.h +15
-0@@ -503,6 +503,9 @@ struct zone {* bootmem allocator): * managed_pages = present_pages - reserved_pages; * +* cma pages is present pages that are assigned for CMA use +* (MIGRATE_CMA). +* * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used @@ -527,6 +530,9 @@ struct zone {atomic_long_t managed_pages;unsigned long spanned_pages;unsigned long present_pages; +#ifdef CONFIG_CMA +unsigned long cma_pages; +#endif const char *name;@@ -624,6 +630,15 @@ static inline unsigned long zone_managed_pages(struct zone *zone)return (unsigned long )atomic_long_read (&zone->managed_pages); } +static inline unsigned long zone_cma_pages (struct zone *zone) +{ +#ifdef CONFIG_CMA +return zone->cma_pages; +#else +return 0 ; +#endif +} +static inline unsigned long zone_end_pfn (const struct zone *zone) {return zone->zone_start_pfn + zone->spanned_pages;mm/page_alloc.c +1
-0@@ -2168,6 +2168,7 @@ void __init init_cma_reserved_pageblock(struct page *page) }adjust_managed_page_count (page, pageblock_nr_pages); +page_zone (page)->cma_pages += pageblock_nr_pages; }#endif mm/vmstat.c +4
-2@@ -1642,14 +1642,16 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,"\n high %lu" "\n spanned %lu" "\n present %lu" -"\n managed %lu" , +"\n managed %lu" +"\n cma %lu" ,zone_page_state (zone,NR_FREE_PAGES ),min_wmark_pages (zone),low_wmark_pages (zone),high_wmark_pages (zone), zone->spanned_pages, zone->present_pages, - zone_managed_pages(zone)); +zone_managed_pages (zone), + zone_cma_pages(zone)); seq_printf(m, "\n protection: (%ld",Signature · 1 line
2.29.2
Signature · 2 lines
Oscar Salvador SUSE L3
Re: [PATCH v3] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
Quoted 45 lines · Oscar Salvador
Quoted 33 lines · David Hildenbrand
Let's count the number of CMA pages per zone and print them in
/proc/zoneinfo.Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently, even after some of these pages might already have been allocated.
As one example, CMA pages part of a kernel zone cannot be used for ordinary kernel allocations but instead behave more like
ZONE_MOVABLE.For now, we are only able to get the global nr+free cma pages from
/proc/meminfoand the free cma pages per zone from/proc/zoneinfo.Example after this patch when booting a 6 GiB QEMU VM with "hugetlb_cma=2G":
# cat /proc/zoneinfo | grep cma cma 0 nr_free_cma 0 cma 0 nr_free_cma 0 cma 524288 nr_free_cma 493016 cma 0 cma 0 # cat /proc/meminfo | grep Cma CmaTotal: 2097152 kB CmaFree: 1972064 kBNote: We print even without
CONFIG_CMA, just like "nr_free_cma"; this way,
one can be sure when spotting "cma 0", that there are definetly no CMA pages located in a zone.Quoted 10 lines
Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Cc David Rientjes <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 4 lines
Looks good to me, I guess it is better to print it unconditionally so the layout does not change.
Reviewed-by Oscar Salvador <[email protected]>
Thanks for the fast review!
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo
In reply to David HildenbrandQuoted 33 lines · David Hildenbrand
Let's count the number of CMA pages per zone and print them in
/proc/zoneinfo.Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently, even after some of these pages might already have been allocated.
As one example, CMA pages part of a kernel zone cannot be used for ordinary kernel allocations but instead behave more like
ZONE_MOVABLE.For now, we are only able to get the global nr+free cma pages from
/proc/meminfoand the free cma pages per zone from/proc/zoneinfo.Example after this patch when booting a 6 GiB QEMU VM with "hugetlb_cma=2G":
# cat /proc/zoneinfo | grep cma cma 0 nr_free_cma 0 cma 0 nr_free_cma 0 cma 524288 nr_free_cma 493016 cma 0 cma 0 # cat /proc/meminfo | grep Cma CmaTotal: 2097152 kB CmaFree: 1972064 kBNote: We print even without
CONFIG_CMA, just like "nr_free_cma"; this way,
one can be sure when spotting "cma 0", that there are definetly no CMA pages located in a zone.
Quoted 10 lines
Cc Andrew Morton <[email protected]>Cc Thomas Gleixner <[email protected]>Cc "Peter Zijlstra (Intel)" <[email protected]>Cc Mike Rapoport <[email protected]>Cc Oscar Salvador <[email protected]>Cc Michal Hocko <[email protected]>Cc Wei Yang <[email protected]>Cc David Rientjes <[email protected]>Signed-off-by David Hildenbrand <[email protected]>