memblock: Move late alloc warning down to phys alloc
PATCH v2 1/1 memblock: Move late alloc warning down to phys alloc
If a driver/subsystem tries to do an allocation after the memblock allocations have been freed and the memory handed to the buddy allocator, it will not actually be legal to use that allocation: the buddy allocator owns the memory. Currently this mis-use is handled by the memblock function which does allocations and returns virtual addresses by printing a warning and doing a kmalloc instead. However the physical allocation function does not to do this check - callers of the physical alloc function are unprotected against mis-use.
Improve the error catching here by moving the check into the physical allocation function which is used by the virtual addr allocation function.
---
Notes:
Changes since v1: https://lore.kernel.org/all/[email protected]/
- Move this late usage check before alignment check
- Replace memblocks with memblock
mm/memblock.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
mm/memblock.c +11 -7
@@ -1451,6 +1451,17 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,if (WARN_ONCE (nid ==MAX_NUMNODES ,"Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n" )) nid =NUMA_NO_NODE ; +/* +* Detect any accidental use of these APIs after slab is ready, as at +* this moment memblock may be deinitialized already and its +* internal data may be destroyed (after execution of memblock_free_all) +*/ +if (WARN_ON_ONCE (slab_is_available ())) { +void *vaddr =kzalloc_node (size,GFP_NOWAIT , nid); + +return vaddr ?virt_to_phys (vaddr) :0 ; + } +if (!align) {/* Can't use WARNs this early in boot on powerpc */ dump_stack ();
@@ -1576,13 +1587,6 @@ static void * __init memblock_alloc_internal( {phys_addr_t alloc; -/* -* Detect any accidental use of these APIs after slab is ready, as at -* this moment memblock may be deinitialized already and its -* internal data may be destroyed (after execution of memblock_free_all) -*/ -if (WARN_ON_ONCE (slab_is_available ())) -return kzalloc_node (size,GFP_NOWAIT , nid);if (max_addr > memblock.current_limit) max_addr = memblock.current_limit;
Signature · 1 line
2.34.1
From: Mike Rapoport (IBM) <[email protected]>
Quoted 10 lines · James Gowans
If a driver/subsystem tries to do an allocation after the memblock allocations have been freed and the memory handed to the buddy allocator, it will not actually be legal to use that allocation: the buddy allocator owns the memory. Currently this mis-use is handled by the memblock function which does allocations and returns virtual addresses by printing a warning and doing a kmalloc instead. However the physical allocation function does not to do this check - callers of the physical alloc function are unprotected against mis-use.
[...]
Applied to for-next branch of memblock.git tree, thanks!
[1/1] memblock: Move late alloc warning down to phys alloc
commit: 94ff46de4a738e7916b68ab5cc0b0380729f02af
tree: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
branch: for-next
--
Sincerely yours,
Mike.
Quoted 9 lines · James Gowans
If a driver/subsystem tries to do an allocation after the memblock allocations have been freed and the memory handed to the buddy allocator, it will not actually be legal to use that allocation: the buddy allocator owns the memory. Currently this mis-use is handled by the memblock function which does allocations and returns virtual addresses by printing a warning and doing a kmalloc instead. However the physical allocation function does not to do this check - callers of the physical alloc function are unprotected against mis-use.
Quoted 8 lines
Improve the error catching here by moving the check into the physical allocation function which is used by the virtual addr allocation function.
Signed-off-by James Gowans <[email protected]>Cc Mike Rapoport <[email protected]>Cc Andrew Morton <[email protected]>Cc Alex Graf <[email protected]>
Quoted 49 lines
---
Notes:
Changes since v1: https://lore.kernel.org/all/[email protected]/
- Move this late usage check before alignment check
- Replace memblocks with memblock
mm/memblock.c| 18 +++++++++++-------1 file changed, 11 insertions(+), 7 deletions(-)mm/memblock.c +11
-7@@ -1451,6 +1451,17 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,if (WARN_ONCE (nid ==MAX_NUMNODES ,"Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n" )) nid =NUMA_NO_NODE ; +/* +* Detect any accidental use of these APIs after slab is ready, as at +* this moment memblock may be deinitialized already and its +* internal data may be destroyed (after execution of memblock_free_all) +*/ +if (WARN_ON_ONCE (slab_is_available ())) { +void *vaddr =kzalloc_node (size,GFP_NOWAIT , nid); + +return vaddr ?virt_to_phys (vaddr) :0 ; + } +if (!align) {/* Can't use WARNs this early in boot on powerpc */ dump_stack ();@@ -1576,13 +1587,6 @@ static void * __init memblock_alloc_internal( {phys_addr_t alloc; -/* -* Detect any accidental use of these APIs after slab is ready, as at -* this moment memblock may be deinitialized already and its -* internal data may be destroyed (after execution of memblock_free_all) -*/ -if (WARN_ON_ONCE (slab_is_available ())) -return kzalloc_node (size,GFP_NOWAIT , nid);if (max_addr > memblock.current_limit) max_addr = memblock.current_limit;Signature · 1 line
2.34.1
Signature · 2 lines
Wei Yang Help you, Help me