Skip to content

Commit fa759cd

Browse files
soleenakpm00
authored andcommitted
kho: allocate metadata directly from the buddy allocator
KHO allocates metadata for its preserved memory map using the slab allocator via kzalloc(). This metadata is temporary and is used by the next kernel during early boot to find preserved memory. A problem arises when KFENCE is enabled. kzalloc() calls can be randomly intercepted by kfence_alloc(), which services the allocation from a dedicated KFENCE memory pool. This pool is allocated early in boot via memblock. When booting via KHO, the memblock allocator is restricted to a "scratch area", forcing the KFENCE pool to be allocated within it. This creates a conflict, as the scratch area is expected to be ephemeral and overwriteable by a subsequent kexec. If KHO metadata is placed in this KFENCE pool, it leads to memory corruption when the next kernel is loaded. To fix this, modify KHO to allocate its metadata directly from the buddy allocator instead of slab. Link: https://lkml.kernel.org/r/20251021000852.2924827-4-pasha.tatashin@soleen.com Fixes: fc33e4b ("kexec: enable KHO support for memory preservation") Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> Reviewed-by: Pratyush Yadav <pratyush@kernel.org> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org> Reviewed-by: David Matlack <dmatlack@google.com> Cc: Alexander Graf <graf@amazon.com> Cc: Christian Brauner <brauner@kernel.org> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Samiullah Khawaja <skhawaja@google.com> Cc: Tejun Heo <tj@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent a2fff99 commit fa759cd

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

include/linux/gfp.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/mmzone.h>
88
#include <linux/topology.h>
99
#include <linux/alloc_tag.h>
10+
#include <linux/cleanup.h>
1011
#include <linux/sched.h>
1112

1213
struct vm_area_struct;
@@ -463,4 +464,6 @@ static inline struct folio *folio_alloc_gigantic_noprof(int order, gfp_t gfp,
463464
/* This should be paired with folio_put() rather than free_contig_range(). */
464465
#define folio_alloc_gigantic(...) alloc_hooks(folio_alloc_gigantic_noprof(__VA_ARGS__))
465466

467+
DEFINE_FREE(free_page, void *, free_page((unsigned long)_T))
468+
466469
#endif /* __LINUX_GFP_H */

kernel/kexec_handover.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static void *xa_load_or_alloc(struct xarray *xa, unsigned long index)
142142
if (res)
143143
return res;
144144

145-
void *elm __free(kfree) = kzalloc(PAGE_SIZE, GFP_KERNEL);
145+
void *elm __free(free_page) = (void *)get_zeroed_page(GFP_KERNEL);
146146

147147
if (!elm)
148148
return ERR_PTR(-ENOMEM);
@@ -348,9 +348,9 @@ static_assert(sizeof(struct khoser_mem_chunk) == PAGE_SIZE);
348348
static struct khoser_mem_chunk *new_chunk(struct khoser_mem_chunk *cur_chunk,
349349
unsigned long order)
350350
{
351-
struct khoser_mem_chunk *chunk __free(kfree) = NULL;
351+
struct khoser_mem_chunk *chunk __free(free_page) = NULL;
352352

353-
chunk = kzalloc(PAGE_SIZE, GFP_KERNEL);
353+
chunk = (void *)get_zeroed_page(GFP_KERNEL);
354354
if (!chunk)
355355
return ERR_PTR(-ENOMEM);
356356

0 commit comments

Comments
 (0)