[RFC 14/16] mm/cma: print stealed page count

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Reserved pages for CMA could be on different zone. To figure out
memory map correctly, per zone number of stealed pages for CMA
would be needed.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
---
 mm/cma.c |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/mm/cma.c b/mm/cma.c
index 267fa14..b165c1a 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -40,6 +40,8 @@ struct cma cma_areas[MAX_CMA_AREAS];
 unsigned cma_area_count;
 static DEFINE_MUTEX(cma_mutex);
 
+static unsigned long __initdata stealed_pages[MAX_NUMNODES][MAX_NR_ZONES];
+
 unsigned long cma_total_pages(unsigned long node_start_pfn,
 				unsigned long node_end_pfn)
 {
@@ -98,6 +100,7 @@ static int __init cma_activate_area(struct cma *cma)
 	unsigned long base_pfn = cma->base_pfn, pfn = base_pfn;
 	unsigned i = cma->count >> pageblock_order;
 	int nid;
+	int zone_index;
 
 	cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
 
@@ -125,6 +128,8 @@ static int __init cma_activate_area(struct cma *cma)
 			if (page_to_nid(pfn_to_page(pfn)) != nid)
 				goto err;
 		}
+		zone_index = zone_idx(page_zone(pfn_to_page(base_pfn)));
+		stealed_pages[nid][zone_index] += pageblock_nr_pages;
 		init_cma_reserved_pageblock(base_pfn);
 	} while (--i);
 
@@ -145,7 +150,9 @@ err:
 
 static int __init cma_init_reserved_areas(void)
 {
-	int i;
+	int i, j;
+	pg_data_t *pgdat;
+	struct zone *zone;
 
 	for (i = 0; i < cma_area_count; i++) {
 		int ret = cma_activate_area(&cma_areas[i]);
@@ -154,6 +161,25 @@ static int __init cma_init_reserved_areas(void)
 			return ret;
 	}
 
+	for (i = 0; i < MAX_NUMNODES; i++) {
+		for (j = 0; j < MAX_NR_ZONES; j++) {
+			if (stealed_pages[i][j])
+				goto print;
+		}
+		continue;
+
+print:
+		pgdat = NODE_DATA(i);
+		for (j = 0; j < MAX_NR_ZONES; j++) {
+			if (!stealed_pages[i][j])
+				continue;
+
+			zone = pgdat->node_zones + j;
+			pr_info("Steal %lu pages from %s\n",
+				stealed_pages[i][j], zone->name);
+		}
+	}
+
 	return 0;
 }
 core_initcall(cma_init_reserved_areas);
-- 
1.7.9.5

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]