mm: vmstat: add cma statistics
Subsystems (3)
PATCH v2 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.
---
* from v1 - https://lore.kernel.org/linux-mm/[email protected]/
* change alloc_attempt with alloc_success - jhubbard
* item per line for vm_event_item - jhubbard
include/linux/vm_event_item.h | 4 ++++ mm/cma.c | 12 +++++++++--- mm/vmstat.c | 4 ++++ 3 files changed, 17 insertions(+), 3 deletions(-)
include/linux/vm_event_item.h +4 -0
@@ -70,6 +70,10 @@ 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_SUCCESS , +CMA_ALLOC_FAIL , #endifUNEVICTABLE_PGCULLED ,/* culled to noreclaim list */ UNEVICTABLE_PGSCANNED, /* scanned for reclaimability */
mm/cma.c +9 -3
@@ -435,13 +435,13 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,int ret = -ENOMEM ;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 +449,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 +506,12 @@ 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_SUCCESS ); +else +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.1.766.gb4fecdf3b7-goog
Quoted 11 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]>---
* from v1 - https://lore.kernel.org/linux-mm/[email protected]/
* changealloc_attemptwithalloc_success- jhubbard
* item per line forvm_event_item- jhubbard
Quoted 5 lines
include/linux/vm_event_item.h | 4 ++++ mm/cma.c | 12 +++++++++--- mm/vmstat.c | 4 ++++ 3 files changed, 17 insertions(+), 3 deletions(-)
Seems reasonable, and the diffs look good.
thanks,
Signature · 2 lines
John Hubbard NVIDIA
Quoted 73 lines
include/linux/vm_event_item.h +4
-0@@ -70,6 +70,10 @@ 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_SUCCESS , +CMA_ALLOC_FAIL , #endifUNEVICTABLE_PGCULLED ,/* culled to noreclaim list */ UNEVICTABLE_PGSCANNED, /* scanned for reclaimability */mm/cma.c +9
-3@@ -435,13 +435,13 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,int ret = -ENOMEM ;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 +449,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 +506,12 @@ 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_SUCCESS ); +else +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",