sched/isolation: Defer freeing of cpumask memblock memory to initcall
PATCH 1/1 sched/isolation: Defer freeing of cpumask memblock memory to initcall
When testing a linux-next kernel with commit 59bd1d914bb5 ("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.
Cannot free reserved memory because of deferred initialization of the memory map
WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0
:
Call Trace:
<TASK>
memblock_phys_free+0xcb/0x100
housekeeping_init+0x14c/0x170
start_kernel+0x207/0x450
x86_64_start_reservations+0x24/0x30
x86_64_start_kernel+0xda/0xe0
common_startup_64+0x13e/0x141
</TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in deferred_init_memmap().
Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in housekeeping_init() and add a new housekeeping_late_init() helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.
This commit also depends on the presence of commit 7c2eee9c1367 ("memblock: don't touch memblock arrays when memblock_free() is called late") to prevent a KASAN UAF bug report [1].
[1] https://lore.kernel.org/lkml/[email protected]/
--- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
[v3.1] Add __initdata to memblock_freelist
kernel/sched/isolation.c +15 -1
@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/llist.h> #include <linux/pci.h> #include "sched.h"
@@ -27,6 +28,7 @@ struct housekeeping { };static struct housekeeping housekeeping; +static __initdata LLIST_HEAD (memblock_freelist);bool housekeeping_enabled (enum hk_type type) {
@@ -189,10 +191,22 @@ void __init housekeeping_init(void)WARN_ON_ONCE (cpumask_empty (omask));cpumask_copy (nmask, omask);RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); -memblock_free (omask,cpumask_size ()); +__llist_add ((struct llist_node *)omask, &memblock_freelist); } } +static int __init housekeeping_late_init (void ) +{ +struct llist_node *llnode, *pos, *t; + +/* Free allocated memblock memory, if any */ + llnode =__llist_del_all (&memblock_freelist); +llist_for_each_safe (pos, t, llnode) +memblock_free (pos,cpumask_size ()); +return 0 ; +} +pure_initcall (housekeeping_late_init); +static void __init housekeeping_setup_type (enum hk_type type,cpumask_var_t housekeeping_staging) {
Signature · 1 line
2.54.0
Quoted 76 lines · Waiman Long
When testing a linux-next kernel with commit
59bd1d914bb5("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.Cannot free reserved memory because of deferred initialization of the memory map WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: <TASK> memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 </TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in
deferred_init_memmap().Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in
housekeeping_init()and add a newhousekeeping_late_init()helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.This commit also depends on the presence of commit
7c2eee9c1367("memblock: don't touch memblock arrays whenmemblock_free()is called late") to prevent a KASAN UAF bug report [1].[1] https://lore.kernel.org/lkml/[email protected]/
Fixes 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers")Signed-off-by Waiman Long <[email protected]>--- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)[v3.1] Add
__initdatatomemblock_freelistkernel/sched/isolation.c +8
-1@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/llist.h> #include <linux/pci.h> #include "sched.h" @@ -27,6 +28,7 @@ struct housekeeping { };static struct housekeeping housekeeping; +static __initdata LLIST_HEAD (memblock_freelist);bool housekeeping_enabled (enum hk_type type) {@@ -189,10 +191,22 @@ void __init housekeeping_init(void)WARN_ON_ONCE (cpumask_empty (omask));cpumask_copy (nmask, omask);RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); -memblock_free (omask,cpumask_size ()); +__llist_add ((struct llist_node *)omask, &memblock_freelist); } } +static int __init housekeeping_late_init (void ) +{ +struct llist_node *llnode, *pos, *t; + +/* Free allocated memblock memory, if any */
kernel/sched/isolation.c void __init housekeeping_init(void) · line 212
Quoted 10 lines
kernel/sched/isolation.c +7
-0+ llnode =__llist_del_all (&memblock_freelist); +llist_for_each_safe (pos, t, llnode) +memblock_free (pos,cpumask_size ()); +return 0 ; +} +pure_initcall (housekeeping_late_init); +static void __init housekeeping_setup_type (enum hk_type type,cpumask_var_t housekeeping_staging) {
Ping! Does anyone have comment for this patch?
Thanks,
Longman
Quoted 28 lines · Waiman Long
When testing a linux-next kernel with commit
59bd1d914bb5("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.Cannot free reserved memory because of deferred initialization of the memory map
WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: <TASK> memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 </TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in
deferred_init_memmap().Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in
housekeeping_init()and add a newhousekeeping_late_init()helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.
Quoted 8 lines
This commit also depends on the presence of commit
7c2eee9c1367("memblock: don't touch memblock arrays whenmemblock_free()is called late") to prevent a KASAN UAF bug report [1].[1] https://lore.kernel.org/lkml/[email protected]/
Fixes 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers")Signed-off-by Waiman Long <[email protected]>
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Hi Waiman,
Quoted 63 lines · On Thu, Jun 04, 2026 at 02:24:40PM -0400 Waiman Long wrote:
When testing a linux-next kernel with commit
59bd1d914bb5("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.Cannot free reserved memory because of deferred initialization of the memory map
WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: <TASK> memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 </TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in
deferred_init_memmap().Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in
housekeeping_init()and add a newhousekeeping_late_init()helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.This commit also depends on the presence of commit
7c2eee9c1367("memblock: don't touch memblock arrays whenmemblock_free()is called late") to prevent a KASAN UAF bug report [1].[1] https://lore.kernel.org/lkml/[email protected]/
Fixes 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers")Signed-off-by Waiman Long <[email protected]>--- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)[v3.1] Add
__initdatatomemblock_freelistkernel/sched/isolation.c +2
-0@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/llist.h> #include <linux/pci.h> #include "sched.h" @@ -27,6 +28,7 @@ struct housekeeping { };static struct housekeeping housekeeping; +static __initdata LLIST_HEAD (memblock_freelist);bool housekeeping_enabled (enum hk_type type) {
kernel/sched/isolation.c void __init housekeeping_init(void) · line 194
Quoted 5 lines
kernel/sched/isolation.c +1
-1@@ -189,10 +191,22 @@ void __init housekeeping_init(void)WARN_ON_ONCE (cpumask_empty (omask));cpumask_copy (nmask, omask);RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); -memblock_free (omask,cpumask_size ()); +__llist_add ((struct llist_node *)omask, &memblock_freelist);
This cast is somewhat concerning. I think I see why it's needed. Wrapping it in a proper struct would require more allocating and freeing and make the problem worse. It should work though.
Cheers,
Phil
Quoted 22 lines
kernel/sched/isolation.c +12
-0} } +static int __init housekeeping_late_init (void ) +{ +struct llist_node *llnode, *pos, *t; + +/* Free allocated memblock memory, if any */ + llnode =__llist_del_all (&memblock_freelist); +llist_for_each_safe (pos, t, llnode) +memblock_free (pos,cpumask_size ()); +return 0 ; +} +pure_initcall (housekeeping_late_init); +static void __init housekeeping_setup_type (enum hk_type type,cpumask_var_t housekeeping_staging) {Signature · 1 line
2.54.0
Quoted 63 lines · On Wed, Jul 01, 2026 at 10:13:57AM -0400 Phil Auld wrote:
Hi Waiman,
Quoted 60 lines · On Thu, Jun 04, 2026 at 02:24:40PM -0400 Waiman Long wrote:
When testing a linux-next kernel with commit
59bd1d914bb5("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.Cannot free reserved memory because of deferred initialization of the memory map
WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: <TASK> memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 </TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in
deferred_init_memmap().Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in
housekeeping_init()and add a newhousekeeping_late_init()helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.This commit also depends on the presence of commit
7c2eee9c1367("memblock: don't touch memblock arrays whenmemblock_free()is called late") to prevent a KASAN UAF bug report [1].[1] https://lore.kernel.org/lkml/[email protected]/
Fixes 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers")Signed-off-by Waiman Long <[email protected]>--- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)[v3.1] Add
__initdatatomemblock_freelistkernel/sched/isolation.c +2
-0@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/llist.h> #include <linux/pci.h> #include "sched.h" @@ -27,6 +28,7 @@ struct housekeeping { };static struct housekeeping housekeeping; +static __initdata LLIST_HEAD (memblock_freelist);
Quoted 14 lines
kernel/sched/isolation.c void __init housekeeping_init(void) · line 194
Quoted 8 lines
kernel/sched/isolation.c +1
-1bool housekeeping_enabled (enum hk_type type) {@@ -189,10 +191,22 @@ void __init housekeeping_init(void)WARN_ON_ONCE (cpumask_empty (omask));cpumask_copy (nmask, omask);RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); -memblock_free (omask,cpumask_size ()); +__llist_add ((struct llist_node *)omask, &memblock_freelist);This cast is somewhat concerning. I think I see why it's needed. Wrapping it in a proper struct would require more allocating and freeing and make the problem worse. It should work though.
Fwiw, opencode/sonnet suggested a comment like this:
/*
* We can't allocate wrapper structs from memblock as they'd need
* deferred freeing too. Instead, reuse the cpumask memory itself
* as llist nodes. This is safe because:
* - cpumask_size() >= sizeof(struct llist_node)
* - Memory is properly aligned (SMP_CACHE_BYTES)
* - The cpumask is never accessed after being added to the list */
... which may be overkill :)
Cheers,
Phil
Quoted 35 lines
Reviewed-by Phil Auld <[email protected]>Cheers,
PhilQuoted 22 lines
kernel/sched/isolation.c +12
-0} } +static int __init housekeeping_late_init (void ) +{ +struct llist_node *llnode, *pos, *t; + +/* Free allocated memblock memory, if any */ + llnode =__llist_del_all (&memblock_freelist); +llist_for_each_safe (pos, t, llnode) +memblock_free (pos,cpumask_size ()); +return 0 ; +} +pure_initcall (housekeeping_late_init); +static void __init housekeeping_setup_type (enum hk_type type,cpumask_var_t housekeeping_staging) {Signature · 1 line
2.54.0
Quoted 90 lines · Phil Auld
Quoted 63 lines · On Wed, Jul 01, 2026 at 10:13:57AM -0400 Phil Auld wrote:
Hi Waiman,
Quoted 60 lines · On Thu, Jun 04, 2026 at 02:24:40PM -0400 Waiman Long wrote:
When testing a linux-next kernel with commit
59bd1d914bb5("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.Cannot free reserved memory because of deferred initialization of the memory map
WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: <TASK> memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 </TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in
deferred_init_memmap().Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in
housekeeping_init()and add a newhousekeeping_late_init()helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.This commit also depends on the presence of commit
7c2eee9c1367("memblock: don't touch memblock arrays whenmemblock_free()is called late") to prevent a KASAN UAF bug report [1].[1] https://lore.kernel.org/lkml/[email protected]/
Fixes 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers")Signed-off-by Waiman Long <[email protected]>--- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)[v3.1] Add
__initdatatomemblock_freelistkernel/sched/isolation.c +2
-0@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/llist.h> #include <linux/pci.h> #include "sched.h" @@ -27,6 +28,7 @@ struct housekeeping { };static struct housekeeping housekeeping; +static __initdata LLIST_HEAD (memblock_freelist);Quoted 14 lines
kernel/sched/isolation.c void __init housekeeping_init(void) · line 194
Quoted 8 lines
kernel/sched/isolation.c +1
-1bool housekeeping_enabled (enum hk_type type) {@@ -189,10 +191,22 @@ void __init housekeeping_init(void)WARN_ON_ONCE (cpumask_empty (omask));cpumask_copy (nmask, omask);RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); -memblock_free (omask,cpumask_size ()); +__llist_add ((struct llist_node *)omask, &memblock_freelist);This cast is somewhat concerning. I think I see why it's needed. Wrapping it in a proper struct would require more allocating and freeing and make the problem worse. It should work though.
Fwiw, opencode/sonnet suggested a comment like this:
/*
* We can't allocate wrapper structs from memblock as they'd need
* deferred freeing too. Instead, reuse the cpumask memory itself
* as llist nodes. This is safe because:
* -cpumask_size()>=sizeof(struct llist_node)
* - Memory is properly aligned (SMP_CACHE_BYTES)
* - The cpumask is never accessed after being added to the list */
Quoted 1 line
... which may be overkill :)
It tells the truth, just a bit too much :-)
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Quoted 77 lines · Phil Auld
Quoted 63 lines · On Wed, Jul 01, 2026 at 10:13:57AM -0400 Phil Auld wrote:
Hi Waiman,
Quoted 60 lines · On Thu, Jun 04, 2026 at 02:24:40PM -0400 Waiman Long wrote:
When testing a linux-next kernel with commit
59bd1d914bb5("memblock:
warn when freeing reserved memory before memory map is initialized"), the following warning was hit when there was a "nohz_full" kernel boot parameter.Cannot free reserved memory because of deferred initialization of the memory map WARNING: mm/memblock.c:904 at __free_reserved_area+0xde/0xf0, CPU#0: swapper/0/0 : Call Trace: <TASK> memblock_phys_free+0xcb/0x100 housekeeping_init+0x14c/0x170 start_kernel+0x207/0x450 x86_64_start_reservations+0x24/0x30 x86_64_start_kernel+0xda/0xe0 common_startup_64+0x13e/0x141 </TASK>IOW, we shouldn't free memblock allocated memory so early in the boot process when memory map isn't fully initialized in
deferred_init_memmap().Fix it by saving the housekeeping cpumask memblock memory to be freed into a free list in
housekeeping_init()and add a newhousekeeping_late_init()helper to defer the actual freeing of memblock memory to when initcall's are being processed. The non-atomic version of the llist APIs are used as there is no contention.This commit also depends on the presence of commit
7c2eee9c1367("memblock: don't touch memblock arrays whenmemblock_free()is called late") to prevent a KASAN UAF bug report [1].[1] https://lore.kernel.org/lkml/[email protected]/
Fixes 27c3a5967f05 ("sched/isolation: Convert housekeeping cpumasks to rcu pointers")Signed-off-by Waiman Long <[email protected]>--- kernel/sched/isolation.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)[v3.1] Add
__initdatatomemblock_freelistkernel/sched/isolation.c +2
-0@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/llist.h> #include <linux/pci.h> #include "sched.h" @@ -27,6 +28,7 @@ struct housekeeping { };static struct housekeeping housekeeping; +static __initdata LLIST_HEAD (memblock_freelist);Quoted 13 lines
kernel/sched/isolation.c void __init housekeeping_init(void) · line 194
Quoted 8 lines
kernel/sched/isolation.c +1
-1bool housekeeping_enabled (enum hk_type type) {@@ -189,10 +191,22 @@ void __init housekeeping_init(void)WARN_ON_ONCE (cpumask_empty (omask));cpumask_copy (nmask, omask);RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); -memblock_free (omask,cpumask_size ()); +__llist_add ((struct llist_node *)omask, &memblock_freelist);This cast is somewhat concerning. I think I see why it's needed. Wrapping it in a proper struct would require more allocating and freeing and make the problem worse. It should work though.
Quoted 7 lines
Fwiw, opencode/sonnet suggested a comment like this:
/*
* We can't allocate wrapper structs from memblock as they'd need
* deferred freeing too. Instead, reuse the cpumask memory itself
* as llist nodes. This is safe because:
* -cpumask_size()>=sizeof(struct llist_node)
I know that as the smallest allocation size is sizeof(long) which is the size of a llist_node. I should have mentioned that either in the commit log or as a comment.
Cheers,
Longman
Quoted 46 lines
* - Memory is properly aligned (
SMP_CACHE_BYTES)
* - The cpumask is never accessed after being added to the list */... which may be overkill :)
Cheers,
PhilQuoted 34 lines
Reviewed-by Phil Auld <[email protected]>Cheers,
PhilQuoted 22 lines
kernel/sched/isolation.c +12
-0} } +static int __init housekeeping_late_init (void ) +{ +struct llist_node *llnode, *pos, *t; + +/* Free allocated memblock memory, if any */ + llnode =__llist_del_all (&memblock_freelist); +llist_for_each_safe (pos, t, llnode) +memblock_free (pos,cpumask_size ()); +return 0 ; +} +pure_initcall (housekeeping_late_init); +static void __init housekeeping_setup_type (enum hk_type type,cpumask_var_t housekeeping_staging) {Signature · 1 line
2.54.0