mm: vmstat: add cma statistics
Subsystems (3)
PATCH 1/1 mm: vmstat: add cma statistics
Since CMA is used more widely, it's worth to have CMA allocation statistics into vmstat. With it, we could know how agressively system uses cma allocation and how often it fails.
--- include/linux/vm_event_item.h | 3 +++ mm/cma.c | 12 +++++++++--- mm/vmstat.c | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-)
include/linux/vm_event_item.h +3 -0
@@ -70,6 +70,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,#endif #ifdef CONFIG_HUGETLB_PAGE HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL, +#endif +#ifdef CONFIG_CMA +CMA_ALLOC ,CMA_ALLOC_FAIL , #endifUNEVICTABLE_PGCULLED ,/* culled to noreclaim list */ UNEVICTABLE_PGSCANNED, /* scanned for reclaimability */
mm/cma.c +9 -3
@@ -434,14 +434,16 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,struct page *page =NULL ;int ret = -ENOMEM ; +count_vm_event (CMA_ALLOC ); +if (!cma || !cma->count || !cma->bitmap) -return NULL ; + goto out;pr_debug ("%s(cma %p, count %zu, align %d)\n" , __func__, (void *)cma, count, align);if (!count) -return NULL ; + goto out; mask =cma_bitmap_aligned_mask (cma, align); offset =cma_bitmap_aligned_offset (cma, align);
@@ -449,7 +451,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, bitmap_count =cma_bitmap_pages_to_bits (cma, count);if (bitmap_count > bitmap_maxno) -return NULL ; + goto out;for (;;) {mutex_lock (&cma->lock);
@@ -506,6 +508,10 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, }pr_debug ("%s(): returned %p\n" , __func__, page); +out: +if (!page) +count_vm_event (CMA_ALLOC_FAIL ); +return page; }
mm/vmstat.c +4 -0
@@ -1305,6 +1305,10 @@ const char * const vmstat_text[] = {#ifdef CONFIG_HUGETLB_PAGE "htlb_buddy_alloc_success" ,"htlb_buddy_alloc_fail" , +#endif +#ifdef CONFIG_CMA +"cma_alloc_success" , +"cma_alloc_fail" , #endif"unevictable_pgs_culled" , "unevictable_pgs_scanned",
Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 17 lines · Minchan Kim
Since CMA is used more widely, it's worth to have CMA allocation statistics into vmstat. With it, we could know how agressively system uses cma allocation and how often it fails.
Signed-off-by Minchan Kim <[email protected]>--- include/linux/vm_event_item.h | 3 +++ mm/cma.c | 12 +++++++++--- mm/vmstat.c | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-)include/linux/vm_event_item.h +0
-0
include/linux/vm_event_item.h enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, · line 75
Quoted 6 lines
include/linux/vm_event_item.h +3
-0@@ -70,6 +70,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,#endif #ifdef CONFIG_HUGETLB_PAGE HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL, +#endif +#ifdef CONFIG_CMA + CMA_ALLOC, CMA_ALLOC_FAIL,
This seems wrong: here it's called "alloc", but in the output it's called "alloc success", and in the implementation it's clearly "alloc attempt" that is being counted.
Once these are all made consistent, then the bug should naturally go away as part of that.
nit: I think the multiple items per line is a weak idea at best, even though it's used here already. Each item is important and needs to be visually compared to it's output item later. So one per line might have helped avoid mismatches, and I think we should change to that to encourage that trend.
thanks,
Signature · 2 lines
John Hubbard NVIDIA
Quoted 62 lines
include/linux/vm_event_item.h +0
-0#endif UNEVICTABLE_PGCULLED ,/* culled to noreclaim list */ UNEVICTABLE_PGSCANNED, /* scanned for reclaimability */mm/cma.c +9
-3@@ -434,14 +434,16 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,struct page *page =NULL ;int ret = -ENOMEM ; +count_vm_event (CMA_ALLOC ); +if (!cma || !cma->count || !cma->bitmap) -return NULL ; + goto out;pr_debug ("%s(cma %p, count %zu, align %d)\n" , __func__, (void *)cma, count, align);if (!count) -return NULL ; + goto out; mask =cma_bitmap_aligned_mask (cma, align); offset =cma_bitmap_aligned_offset (cma, align);@@ -449,7 +451,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, bitmap_count =cma_bitmap_pages_to_bits (cma, count);if (bitmap_count > bitmap_maxno) -return NULL ; + goto out;for (;;) {mutex_lock (&cma->lock);@@ -506,6 +508,10 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, }pr_debug ("%s(): returned %p\n" , __func__, page); +out: +if (!page) +count_vm_event (CMA_ALLOC_FAIL ); +return page; }mm/vmstat.c +4
-0@@ -1305,6 +1305,10 @@ const char * const vmstat_text[] = {#ifdef CONFIG_HUGETLB_PAGE "htlb_buddy_alloc_success" ,"htlb_buddy_alloc_fail" , +#endif +#ifdef CONFIG_CMA +"cma_alloc_success" , +"cma_alloc_fail" , #endif"unevictable_pgs_culled" , "unevictable_pgs_scanned",
Quoted 13 lines · John Hubbard
Quoted 12 lines · Minchan Kim
Since CMA is used more widely, it's worth to have CMA allocation statistics into vmstat. With it, we could know how agressively system uses cma allocation and how often it fails.
Signed-off-by Minchan Kim <[email protected]>--- include/linux/vm_event_item.h | 3 +++ mm/cma.c | 12 +++++++++--- mm/vmstat.c | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-)
Quoted 15 lines
include/linux/vm_event_item.h enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, · line 75
Quoted 11 lines
include/linux/vm_event_item.h +3
-0@@ -70,6 +70,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,#endif #ifdef CONFIG_HUGETLB_PAGE HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL, +#endif +#ifdef CONFIG_CMA + CMA_ALLOC, CMA_ALLOC_FAIL,This seems wrong: here it's called "alloc", but in the output it's called "alloc success", and in the implementation it's clearly "alloc attempt" that is being counted.
Argh, I wanted to introduce CMA_ALLOC, not ALLOC_ATTEMPTS. Let me fix.
Quoted 9 lines
Once these are all made consistent, then the bug should naturally go away as part of that.
nit: I think the multiple items per line is a weak idea at best, even though it's used here already. Each item is important and needs to be visually compared to it's output item later. So one per line might have helped avoid mismatches, and I think we should change to that to encourage that trend.
No problem.
Thanks for the review, John.