x86-numa-simplify-numa_distance-allocation.patch removed from -mm tree
The quilt patch titled
Subject: x86/numa: simplify numa_distance allocation
has been removed from the -mm tree. Its filename was
x86-numa-simplify-numa_distance-allocation.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: x86/numa: simplify numa_distance allocation
Date: Wed, 7 Aug 2024 09:40:54 +0300
Allocation of numa_distance uses memblock_phys_alloc_range() to limit allocation to be below the last mapped page.
But NUMA initializaition runs after the direct map is populated and there is also code in setup_arch() that adjusts memblock limit to reflect how much memory is already mapped in the direct map.
Simplify the allocation of numa_distance and use plain memblock_alloc().
---
arch/x86/mm/numa.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~x86-numa-simplify-numa_distance-allocation +2 -5
@@ -331,7 +331,6 @@ static int __init numa_alloc_distance(vonodemask_t nodes_parsed;size_t size;int i, j, cnt =0 ; -u64 phys;/* size the new table and allocate it */ nodes_parsed = numa_nodes_parsed;
@@ -342,16 +341,14 @@ static int __init numa_alloc_distance(vo cnt++; size = cnt * cnt *sizeof (numa_distance[0 ]); - phys =memblock_phys_alloc_range (size,PAGE_SIZE ,0 , -PFN_PHYS (max_pfn_mapped)); -if (!phys) { + numa_distance =memblock_alloc (size,PAGE_SIZE ); +if (!numa_distance) {pr_warn ("Warning: can't allocate distance table!\n" );/* don't retry until explicitly reset */ numa_distance = (void *)1LU ;return -ENOMEM ; } - numa_distance =__va (phys); numa_distance_cnt = cnt;/* fill with the default distances */
_
Patches currently in -mm which might be from [email protected] are