diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index f2dab6c2edb3..35cbb7bcbfd3 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -144,6 +144,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) #ifdef CONFIG_CMA show_val_kb(m, "CmaTotal: ", totalcma_pages); + show_val_kb(m, "CmaAllocated: ", cma_used_pages()); + show_val_kb(m, "CmaReleased: ", totalcma_pages - cma_used_pages()); show_val_kb(m, "CmaFree: ", global_zone_page_state(NR_FREE_CMA_PAGES)); #endif diff --git a/include/linux/cma.h b/include/linux/cma.h index 20cac3e866dc..28f59c1f6f38 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -35,6 +35,7 @@ extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, bool no_warn); extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count); +extern unsigned long cma_used_pages(void); extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data); diff --git a/mm/cma.c b/mm/cma.c index ca0e116fb3a9..0fa4d338303d 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -555,6 +555,24 @@ bool cma_release(struct cma *cma, const struct page *pages, unsigned int count) } EXPORT_SYMBOL_GPL(cma_release); +unsigned long cma_used_pages(void) +{ + struct cma *cma; + unsigned long used; + unsigned long val = 0; + int i; + + for (i = 0; i < cma_area_count; i++) { + cma = &cma_areas[i]; + mutex_lock(&cma->lock); + used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma)); + mutex_unlock(&cma->lock); + val += used << cma->order_per_bit; + } + return val; +} +EXPORT_SYMBOL_GPL(cma_used_pages); + int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data) { int i;