mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 10:31:33 -04:00
mm/sparse: keep mem_section_usage_size() internal
mem_section_usage_size() is only needed by sparsemem implementation code
after commit ae751d567b ("mm/bootmem_info: stop marking
mem_section_usage as MIX_SECTION_INFO"), so keeping the declaration in
mmzone.h now exposes the helper to all mmzone.h users for no reason.
Move the helper to sparse.h so sparse.c and sparse-vmemmap.c can share it
through the internal header. While doing so, calculate the allocation
size with struct_size_t(), which ties the expression to the
pageblock_flags trailing array instead of open-coding the struct header
plus bitmap size.
Link: https://lore.kernel.org/20260805022536.1206575-1-songmuchun@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Cc: Liam R. Howlett <liam@infradead.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
afff109c2f
commit
e73aeb8a41
@@ -2069,7 +2069,6 @@ static inline struct mem_section *__nr_to_section(unsigned long nr)
|
||||
#endif
|
||||
return &mem_section[root][nr & SECTION_ROOT_MASK];
|
||||
}
|
||||
extern size_t mem_section_usage_size(void);
|
||||
|
||||
/*
|
||||
* We use the lower bits of the mem_map pointer to store a little bit of
|
||||
|
||||
10
mm/sparse.c
10
mm/sparse.c
@@ -213,16 +213,6 @@ static void __init memblocks_present(void)
|
||||
memory_present(nid, start, end);
|
||||
}
|
||||
|
||||
static unsigned long usemap_size(void)
|
||||
{
|
||||
return BITS_TO_LONGS(SECTION_BLOCKFLAGS_BITS) * sizeof(unsigned long);
|
||||
}
|
||||
|
||||
size_t mem_section_usage_size(void)
|
||||
{
|
||||
return sizeof(struct mem_section_usage) + usemap_size();
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
||||
unsigned long __init section_map_size(void)
|
||||
{
|
||||
|
||||
@@ -47,6 +47,12 @@ static inline void __section_mark_present(struct mem_section *ms,
|
||||
|
||||
ms->section_mem_map |= SECTION_MARKED_PRESENT;
|
||||
}
|
||||
|
||||
static inline size_t mem_section_usage_size(void)
|
||||
{
|
||||
return struct_size_t(struct mem_section_usage, pageblock_flags,
|
||||
BITS_TO_LONGS(SECTION_BLOCKFLAGS_BITS));
|
||||
}
|
||||
#else
|
||||
static inline void sparse_init(void) {}
|
||||
#endif /* CONFIG_SPARSEMEM */
|
||||
|
||||
Reference in New Issue
Block a user