From 5f3555711331eee4af8eaa6e11d3918cfe69f341 Mon Sep 17 00:00:00 2001 From: Faiyaz Mohammed Date: Wed, 4 Dec 2019 15:44:15 +0530 Subject: [PATCH 1/2] mm: page_alloc: Add debug log in free_reserved_area for static memory For INITRD and initmem memory is reserved through "memblock_reserve" during boot up but it is free via "free_reserved_area" instead of "memblock_free". For example: [ 0.294848] Freeing initrd memory: 12K. [ 0.696688] Freeing unused kernel memory: 4096K. To get the start and end address of the above freed memory and to account proper memblock added memblock_dbg log in "free_reserved_area". After adding log: [ 0.294837] memblock_free: [0x00000083600000-0x00000083603000] free_initrd_mem+0x20/0x28 [ 0.294848] Freeing initrd memory: 12K. [ 0.695246] memblock_free: [0x00000081600000-0x00000081a00000] free_initmem+0x70/0xc8 [ 0.696688] Freeing unused kernel memory: 4096K. Change-Id: I5ebbb9c1ced481e0ce2acd839e85526aa8dadf75 Signed-off-by: Faiyaz Mohammed --- mm/page_alloc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 480b43d685e5..12ca19b055bf 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7665,6 +7665,11 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char pr_info("Freeing %s memory: %ldK\n", s, pages << (PAGE_SHIFT - 10)); +#ifdef CONFIG_HAVE_MEMBLOCK + memblock_dbg("memblock_free: [%#016llx-%#016llx] %pS\n", + __pa(start), __pa(end), (void *)_RET_IP_); +#endif + return pages; } EXPORT_SYMBOL_GPL(free_reserved_area); From 7a9d68ded697adc1a210e4df82b715720e54fc2c Mon Sep 17 00:00:00 2001 From: Faiyaz Mohammed Date: Tue, 10 Dec 2019 12:54:00 +0530 Subject: [PATCH 2/2] ARM64: mm: Add log in fixmap_remap_fdt for static memory memblock_dbg is not up because of parse_early_param get called after setup_machine_fd. To capture fdt reserved info below pr_info is added. Change-Id: Id39ce71c3de63778e987d7ab09a6d41c6aaddc4f Signed-off-by: Faiyaz Mohammed [vinmenon@codeaurora.org: move the location of print for 5.4] Signed-off-by: Vinayak Menon Signed-off-by: Prakash Gupta --- arch/arm64/kernel/setup.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 56f664561754..1825a62df3ba 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -174,8 +174,16 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) void *dt_virt = fixmap_remap_fdt(dt_phys, &size, PAGE_KERNEL); const char *name; - if (dt_virt) + if (dt_virt) { memblock_reserve(dt_phys, size); + /* + * memblock_dbg is not up because of parse_early_param + * get called after setup_machine_fd. To capture fdt + * reserved info below pr_info is added. + */ + pr_info("memblock_reserve: 0x%x %pS\n", size - 1, + (void *) _RET_IP_); + } if (!dt_virt || !early_init_dt_scan(dt_virt)) { pr_crit("\n"