From 9841264fcbda29b4d67927b5168954066879e93f Mon Sep 17 00:00:00 2001 From: Jaewon Kim Date: Fri, 28 Aug 2020 15:42:44 +0900 Subject: [PATCH] ANDROID: memblock: recognize late freed size by checking PageReserved There are some cases in which reserved pages are freed late after the initial memblock_free_all of mem_init. We'd like to recognize this late free pages, and update the memsize information. Because additional job is needed to a no-map or reusable region, the late free is usually done to a map and unusable region. So only for map and unusable region, check if some pages within the region is freed. The freed pages can be recoginzed by checking if PageReserved flag is clear. To be fast, let's skip other pages within 64 KB range. And this check is done when a user wants to see the memsize information. This is an example. If all pages are freed the region size will be 0. Before 0x0a2300000-0x0a2400000 0x00100000 ( 1024 KB ) map unusable latefree After 0x0a2300000-0x0a2300000 0x00000000 ( 0 KB ) map unusable latefree Bug: 340432773 Signed-off-by: Jaewon Kim Link: https://lore.kernel.org/linux-mm/20240521023957.2587005-7-jaewon31.kim@samsung.com/ Change-Id: I467d7df93b4af242f7e145fc6bfca7b3d44e0336 --- mm/memblock.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/mm/memblock.c b/mm/memblock.c index 0fe2c1dcdd92..9351f9cba46b 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2635,7 +2635,7 @@ DEFINE_SHOW_ATTRIBUTE(memblock_debug); #ifdef CONFIG_MEMBLOCK_MEMSIZE /* assume that freeing region is NOT bigger than the previous region */ -static void __maybe_unused memblock_memsize_free(phys_addr_t free_base, +static void memblock_memsize_free(phys_addr_t free_base, phys_addr_t free_size) { int i; @@ -2682,6 +2682,39 @@ static int memsize_rgn_cmp(const void *a, const void *b) return 0; } +/* assume that freed size is always 64 KB aligned */ +static inline void memblock_memsize_check_size(struct memsize_rgn_struct *rgn) +{ + phys_addr_t phy, end, freed = 0; + bool has_freed = false; + struct page *page; + + if (rgn->reusable || rgn->nomap) + return; + + /* check the first page of each 1 MB */ + phy = rgn->base; + end = rgn->base + rgn->size; + while (phy < end) { + unsigned long pfn = __phys_to_pfn(phy); + + if (!pfn_valid(pfn)) + return; + page = pfn_to_page(pfn); + if (!has_freed && !PageReserved(page)) { + has_freed = true; + freed = phy; + } else if (has_freed && PageReserved(page)) { + has_freed = false; + memblock_memsize_free(freed, phy - freed); + } + + if (has_freed && (phy + SZ_64K >= end)) + memblock_memsize_free(freed, end - freed); + phy += SZ_64K; + } +} + static int memblock_memsize_show(struct seq_file *m, void *private) { int i; @@ -2695,6 +2728,7 @@ static int memblock_memsize_show(struct seq_file *m, void *private) long size; rgn = &memsize_rgn[i]; + memblock_memsize_check_size(rgn); base = rgn->base; size = rgn->size; end = base + size;