* [PATCH] memblock: use kfree() to release kmalloced memblock regions
@ 2022-02-17 14:53 Miaohe Lin
2022-02-17 21:53 ` Mike Rapoport
0 siblings, 1 reply; 2+ messages in thread
From: Miaohe Lin @ 2022-02-17 14:53 UTC (permalink / raw)
To: akpm, rppt; +Cc: linux-mm, linux-kernel, linmiaohe
memblock.{reserved,memory}.regions may be allocated using kmalloc() in
memblock_double_array(). Use kfree() to release these kmalloced regions
indicated by memblock_{reserved,memory}_in_slab.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Fixes: 3010f876500f ("mm: discard memblock data later")
---
mm/memblock.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 11561bbff8f5..e4f03a6e8e56 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -366,14 +366,20 @@ void __init memblock_discard(void)
addr = __pa(memblock.reserved.regions);
size = PAGE_ALIGN(sizeof(struct memblock_region) *
memblock.reserved.max);
- memblock_free_late(addr, size);
+ if (memblock_reserved_in_slab)
+ kfree(memblock.reserved.regions);
+ else
+ memblock_free_late(addr, size);
}
if (memblock.memory.regions != memblock_memory_init_regions) {
addr = __pa(memblock.memory.regions);
size = PAGE_ALIGN(sizeof(struct memblock_region) *
memblock.memory.max);
- memblock_free_late(addr, size);
+ if (memblock_memory_in_slab)
+ kfree(memblock.memory.regions);
+ else
+ memblock_free_late(addr, size);
}
memblock_memory = NULL;
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] memblock: use kfree() to release kmalloced memblock regions
2022-02-17 14:53 [PATCH] memblock: use kfree() to release kmalloced memblock regions Miaohe Lin
@ 2022-02-17 21:53 ` Mike Rapoport
0 siblings, 0 replies; 2+ messages in thread
From: Mike Rapoport @ 2022-02-17 21:53 UTC (permalink / raw)
To: rppt, Miaohe Lin, akpm; +Cc: Mike Rapoport, linux-kernel, linux-mm
From: Mike Rapoport <rppt@linux.ibm.com>
On Thu, 17 Feb 2022 22:53:27 +0800, Miaohe Lin wrote:
> memblock.{reserved,memory}.regions may be allocated using kmalloc() in
> memblock_double_array(). Use kfree() to release these kmalloced regions
> indicated by memblock_{reserved,memory}_in_slab.
>
>
Applied, thanks!
[1/1] memblock: use kfree() to release kmalloced memblock regions
(no commit info)
Best regards,
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-17 21:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-17 14:53 [PATCH] memblock: use kfree() to release kmalloced memblock regions Miaohe Lin
2022-02-17 21:53 ` Mike Rapoport
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).