mm-numa_memblks-introduce-numa_memblks_init.patch removed from -mm tree
The quilt patch titled
Subject: mm: numa_memblks: introduce numa_memblks_init
has been removed from the -mm tree. Its filename was
mm-numa_memblks-introduce-numa_memblks_init.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: mm: numa_memblks: introduce numa_memblks_init
Date: Wed, 7 Aug 2024 09:41:04 +0300
Move most of x86::numa_init() to numa_memblks so that the latter will be more self-contained.
With this numa_memblk data structures should not be exposed to the architecture specific code.
---
arch/x86/mm/numa.c | 40 +++----------------------------- include/linux/numa_memblks.h | 3 ++ mm/numa_memblks.c | 41 +++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 36 deletions(-)
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~mm-numa_memblks-introduce-numa_memblks_init +4 -36
@@ -115,13 +115,9 @@ void __init setup_node_to_cpumask_map(vopr_debug ("Node to cpumask map for %u nodes\n" , nr_node_ids); } -static int __init numa_register_memblks (struct numa_meminfo *mi) +static int __init numa_register_nodes (void ) { -int nid, err; - - err =numa_register_meminfo (mi); -if (err) -return err; +int nid;if (!memblock_validate_numa_coverage (SZ_1M ))return -EINVAL ;
@@ -175,39 +171,11 @@ static int __init numa_init(int (*init_ffor (i =0 ; i <MAX_LOCAL_APIC ; i++)set_apicid_to_node (i,NUMA_NO_NODE ); -nodes_clear (numa_nodes_parsed); -nodes_clear (node_possible_map); -nodes_clear (node_online_map); -memset (&numa_meminfo,0 ,sizeof (numa_meminfo)); -WARN_ON (memblock_set_node (0 ,ULLONG_MAX , &memblock.memory, -NUMA_NO_NODE )); -WARN_ON (memblock_set_node (0 ,ULLONG_MAX , &memblock.reserved, -NUMA_NO_NODE )); -/* In case that parsing SRAT failed. */ -WARN_ON (memblock_clear_hotplug (0 ,ULLONG_MAX )); -numa_reset_distance (); - - ret =init_func (); + ret =numa_memblks_init (init_func,/* memblock_force_top_down */ true);if (ret <0 )return ret; -/* -* We reset memblock back to the top-down direction -* here because if we configured ACPI_NUMA, we have -* parsed SRAT in init_func(). It is ok to have the -* reset here even if we did't configure ACPI_NUMA -* or acpi numa init fails and fallbacks to dummy -* numa init. -*/ -memblock_set_bottom_up (false); - - ret =numa_cleanup_meminfo (&numa_meminfo); -if (ret <0 ) -return ret; - -numa_emulation (&numa_meminfo, numa_distance_cnt); - - ret =numa_register_memblks (&numa_meminfo); + ret =numa_register_nodes ();if (ret <0 )return ret;
include/linux/numa_memblks.h renamed from include/linux/numa_memblks.h~mm-numa_memblks-introduce-numa_memblks_init +3 -0
@@ -34,6 +34,9 @@ int __init numa_register_meminfo(structvoid __init numa_nodemask_from_meminfo (nodemask_t *nodemask,const struct numa_meminfo *mi); +int __init numa_memblks_init (int (*init_func)(void ), +bool memblock_force_top_down); +#ifdef CONFIG_NUMA_EMU int numa_emu_cmdline (char *str); void __init numa_emu_update_cpu_to_node(int *emu_nid_to_phys,
mm/numa_memblks.c renamed from mm/numa_memblks.c~mm-numa_memblks-introduce-numa_memblks_init +41 -0
47 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are