Skip to contentSkip to conversation

drivers/base/node: consolidate node device subsystem initialization in node_dev_init()

RFC PATCH In review David Hildenbrand 3 participants 8 messages Jan 28, 2022 – Feb 2, 2022

Subsystems (10)
Memory management x86 PowerPC MIPS +6 more subsystems
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 drivers/base/node: consolidate node device subsystem initialization in node_dev_init()

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point.

This is in line with memory_dev_init(), which initializes the memory device subsystem and creates all memory block devices.

Similar to memory_dev_init(), panic() if anything goes wrong, we don't want to continue with such basic initialization errors.

The important part is that node_dev_init() gets called after memory_dev_init() and after cpu_dev_init(), but before any of the relevant archs call register_cpu() to register the new cpu device under the node device. The latter should be the case for the current users of topology_init().

Cc Andrew Morton <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>

---

RFC because I tested only on x86-64 and s390x, I think I cross-compiled all applicable architectures except riscv and sparc.

This is somewhat a preparation for detecting if a memory block (/sys/devices/system/memory/memory*) is managed by a single zone, and storing the zone for the memory block -- to get rid of test_pages_in_a_zone(). For that, we want to know all nodes that are applicable for a single memory block (mem->nid), which is determined when registering the node.

While this change might not be strictly required for that change, this way it's easier to see when the nodes are gettin created and consequently when the node ids for a memory block are determined.

---
 arch/arm64/kernel/setup.c   |  3 ---
 arch/ia64/kernel/topology.c | 10 ----------
 arch/mips/kernel/topology.c |  5 -----
 arch/powerpc/kernel/sysfs.c | 17 -----------------
 arch/riscv/kernel/setup.c   |  3 ---
 arch/s390/kernel/numa.c     |  7 -------
 arch/sh/kernel/topology.c   |  5 -----
 arch/sparc/kernel/sysfs.c   | 12 ------------
 arch/x86/kernel/topology.c  |  5 -----
 drivers/base/init.c         |  1 +
 drivers/base/node.c         | 30 +++++++++++++++++-------------
 include/linux/node.h        |  4 ++++
 12 files changed, 22 insertions(+), 80 deletions(-)
arch/arm64/kernel/setup.c +0 -3
index f70573928f1b..3505789cf4bd 100644
@@ -406,9 +406,6 @@ static int __init topology_init(void)
 {
 	int i;
 
-	for_each_online_node(i)
-		register_one_node(i);
-
 	for_each_possible_cpu(i) {
 		struct cpu *cpu = &per_cpu(cpu_data.cpu, i);
 		cpu->hotpluggable = cpu_can_disable(i);
arch/ia64/kernel/topology.c +0 -10
index e4992917a24b..94a848b06f15 100644
@@ -70,16 +70,6 @@ static int __init topology_init(void)
 {
 	int i, err = 0;
 
-#ifdef CONFIG_NUMA
-	/*
-	 * MCD - Do we want to register all ONLINE nodes, or all POSSIBLE nodes?
-	 */
-	for_each_online_node(i) {
-		if ((err = register_one_node(i)))
-			goto out;
-	}
-#endif
-
 	sysfs_cpus = kcalloc(NR_CPUS, sizeof(struct ia64_cpu), GFP_KERNEL);
 	if (!sysfs_cpus)
 		panic("kzalloc in topology_init failed - NR_CPUS too big?");
arch/mips/kernel/topology.c +0 -5
index 08ad6371fbe0..9429d85a4703 100644
@@ -12,11 +12,6 @@ static int __init topology_init(void)
 {
 	int i, ret;
 
-#ifdef CONFIG_NUMA
-	for_each_online_node(i)
-		register_one_node(i);
-#endif /* CONFIG_NUMA */
-
 	for_each_present_cpu(i) {
 		struct cpu *c = &per_cpu(cpu_devices, i);
 
arch/powerpc/kernel/sysfs.c +0 -17
index d45a415d5374..2069bbb90a9a 100644
@@ -1110,14 +1110,6 @@ EXPORT_SYMBOL_GPL(cpu_remove_dev_attr_group);
 /* NUMA stuff */
 
 #ifdef CONFIG_NUMA
-static void __init register_nodes(void)
-{
-	int i;
-
-	for (i = 0; i < MAX_NUMNODES; i++)
-		register_one_node(i);
-}
-
 int sysfs_add_device_to_node(struct device *dev, int nid)
 {
 	struct node *node = node_devices[nid];
@@ -1132,13 +1124,6 @@ void sysfs_remove_device_from_node(struct device *dev, int nid)
 	sysfs_remove_link(&node->dev.kobj, kobject_name(&dev->kobj));
 }
 EXPORT_SYMBOL_GPL(sysfs_remove_device_from_node);
-
-#else
-static void __init register_nodes(void)
-{
-	return;
-}
-
 #endif
 
 /* Only valid if CPU is present. */
@@ -1155,8 +1140,6 @@ static int __init topology_init(void)
 {
 	int cpu, r;
 
-	register_nodes();
-
 	for_each_possible_cpu(cpu) {
 		struct cpu *c = &per_cpu(cpu_devices, cpu);
 
arch/riscv/kernel/setup.c +0 -3
index b42bfdc67482..834eb652a7b9 100644
@@ -301,9 +301,6 @@ static int __init topology_init(void)
 {
 	int i, ret;
 
-	for_each_online_node(i)
-		register_one_node(i);
-
 	for_each_possible_cpu(i) {
 		struct cpu *cpu = &per_cpu(cpu_devices, i);
 
arch/s390/kernel/numa.c +0 -7
index 51c5a9f6e525..23ab9f02f278 100644
@@ -33,10 +33,3 @@ void __init numa_setup(void)
 	NODE_DATA(0)->node_spanned_pages = memblock_end_of_DRAM() >> PAGE_SHIFT;
 	NODE_DATA(0)->node_id = 0;
 }
-
-static int __init numa_init_late(void)
-{
-	register_one_node(0);
-	return 0;
-}
-arch_initcall(numa_init_late);
arch/sh/kernel/topology.c +0 -5
index 76af6db9daa2..2d2a7509b565 100644
@@ -46,11 +46,6 @@ static int __init topology_init(void)
 {
 	int i, ret;
 
-#ifdef CONFIG_NUMA
-	for_each_online_node(i)
-		register_one_node(i);
-#endif
-
 	for_each_present_cpu(i) {
 		struct cpu *c = &per_cpu(cpu_devices, i);
 
arch/sparc/kernel/sysfs.c +0 -12
index 6d60d416f0dd..f19487e4cc71 100644
@@ -244,22 +244,10 @@ static void __init check_mmu_stats(void)
 		mmu_stats_supported = 1;
 }
 
-static void register_nodes(void)
-{
-#ifdef CONFIG_NUMA
-	int i;
-
-	for (i = 0; i < MAX_NUMNODES; i++)
-		register_one_node(i);
-#endif
-}
-
 static int __init topology_init(void)
 {
 	int cpu, ret;
 
-	register_nodes();
-
 	check_mmu_stats();
 
 	for_each_possible_cpu(cpu) {
arch/x86/kernel/topology.c +0 -5
index bd83748e2bde..8617d1ed9d31 100644
@@ -154,11 +154,6 @@ static int __init topology_init(void)
 {
 	int i;
 
-#ifdef CONFIG_NUMA
-	for_each_online_node(i)
-		register_one_node(i);
-#endif
-
 	for_each_present_cpu(i)
 		arch_register_cpu(i);
 
drivers/base/init.c +1 -0
index a9f57c22fb9e..d8d0fe687111 100644
@@ -35,5 +35,6 @@ void __init driver_init(void)
 	auxiliary_bus_init();
 	cpu_dev_init();
 	memory_dev_init();
+	node_dev_init();
 	container_dev_init();
 }
drivers/base/node.c +17 -13
index 87acc47e8951..a133981a12fc 100644
@@ -1065,26 +1065,30 @@ static const struct attribute_group *cpu_root_attr_groups[] = {
 };
 
 #define NODE_CALLBACK_PRI	2	/* lower than SLAB */
-static int __init register_node_type(void)
+void __init node_dev_init(void)
 {
-	int ret;
+	static struct notifier_block node_memory_callback_nb = {
+		.notifier_call = node_memory_callback,
+		.priority = NODE_CALLBACK_PRI,
+	};
+	int ret, i;
 
  	BUILD_BUG_ON(ARRAY_SIZE(node_state_attr) != NR_NODE_STATES);
  	BUILD_BUG_ON(ARRAY_SIZE(node_state_attrs)-1 != NR_NODE_STATES);
 
 	ret = subsys_system_register(&node_subsys, cpu_root_attr_groups);
-	if (!ret) {
-		static struct notifier_block node_memory_callback_nb = {
-			.notifier_call = node_memory_callback,
-			.priority = NODE_CALLBACK_PRI,
-		};
-		register_hotmemory_notifier(&node_memory_callback_nb);
-	}
+	if (ret)
+		panic("%s() failed to register subsystem: %d\n", __func__, ret);
+
+	register_hotmemory_notifier(&node_memory_callback_nb);
 
 	/*
-	 * Note:  we're not going to unregister the node class if we fail
-	 * to register the node state class attribute files.
+	 * Create all node devices, which will properly link the node
+	 * to applicable memory block devices and already created cpu devices.
 	 */
-	return ret;
+	for_each_online_node(i) {
+		ret = register_one_node(i);
+		if (ret)
+			panic("%s() failed to add node: %d\n", __func__, ret);
+	}
 }
-postcore_initcall(register_node_type);
include/linux/node.h +4 -0
index bb21fd631b16..f3be6ccfebed 100644
@@ -112,6 +112,7 @@ static inline void link_mem_sections(int nid, unsigned long start_pfn,
 
 extern void unregister_node(struct node *node);
 #ifdef CONFIG_NUMA
+extern void node_dev_init(void);
 /* Core of the node registration - only memory hotplug should use this */
 extern int __register_one_node(int nid);
 
@@ -149,6 +150,9 @@ extern void register_hugetlbfs_with_node(node_registration_func_t doregister,
 					 node_registration_func_t unregister);
 #endif
 #else
+static inline void node_dev_init(void)
+{
+}
 static inline int __register_one_node(int nid)
 {
 	return 0;

base-commit: e783362eb54cd99b2cac8b3a9aeac942e6f6ac07

Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · David Hildenbrand

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point.

This is in line with memory_dev_init(), which initializes the memory device subsystem and creates all memory block devices.

Quoted 8 lines

Similar to memory_dev_init(), panic() if anything goes wrong, we don't want to continue with such basic initialization errors.

The important part is that node_dev_init() gets called after memory_dev_init() and after cpu_dev_init(), but before any of the relevant archs call register_cpu() to register the new cpu device under the node device. The latter should be the case for the current users of topology_init().

So, before this change we had something like this:

do_basic_setup
driver_init
memory_dev_init
do_init_calls
...
topology_init
register_nodes/register_one_node

And after the patch all happens in driver_init()

driver_init
memory_dev_init
node_dev_init

I guess this is fine as we do not have any ordering problems (aka: none of the functions we used to call before expect the nodes not to be there for some weird reason).

So, no functional change, right?

This certainly looks like an improvment.

Signature · 2 lines
Oscar Salvador
SUSE Labs
#2 lore raw
Quoted 8 lines · Oscar Salvador
Quoted 7 lines · David Hildenbrand

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point.

This is in line with memory_dev_init(), which initializes the memory device subsystem and creates all memory block devices.

Quoted 9 lines
Quoted 8 lines

Similar to memory_dev_init(), panic() if anything goes wrong, we don't want to continue with such basic initialization errors.

The important part is that node_dev_init() gets called after memory_dev_init() and after cpu_dev_init(), but before any of the relevant archs call register_cpu() to register the new cpu device under the node device. The latter should be the case for the current users of topology_init().

Hi Oscar,

Quoted 16 lines

So, before this change we had something like this:

do_basic_setup
driver_init
memory_dev_init
do_init_calls
...
topology_init
register_nodes/register_one_node

And after the patch all happens in driver_init()

driver_init
memory_dev_init
node_dev_init

Quoted 6 lines

I guess this is fine as we do not have any ordering problems (aka: none of the functions we used to call before expect the nodes not to be there for some weird reason).

So, no functional change, right?

Right, and the idea is that the online state of nodes (+ node/zone ranges) already has to be known at that point in time, because otherwise, we'd be in bigger trouble.

Thanks!

Signature · 3 lines
Thanks,

David / dhildenb
#3 lore raw
Quoted 1 line · David Hildenbrand

Hi Oscar,

Hi David :-),

Quoted 3 lines

Right, and the idea is that the online state of nodes (+ node/zone ranges) already has to be known at that point in time, because otherwise, we'd be in bigger trouble.

Yeah, I wanted to check where exactly did we mark the nodes online, and for the few architectures I checked it happens in setup_arch(), which is called very early in start_kernel(), while driver_init() gets called through arch_call_rest_init(), which happens at the end of the function.

I am not sure whether we want to remark that somehow in the changelog, so it is crystal clear that by the time the node_dev_init() gets called, we already set the nodes online.

Anyway, just saying, but is fine as is.

Signature · 2 lines
Oscar Salvador
SUSE Labs
#4 lore raw
Quoted 15 lines · Oscar Salvador
Quoted 1 line · David Hildenbrand

Hi Oscar,

Hi David :-),

Quoted 3 lines

Right, and the idea is that the online state of nodes (+ node/zone ranges) already has to be known at that point in time, because otherwise, we'd be in bigger trouble.

Yeah, I wanted to check where exactly did we mark the nodes online, and for the few architectures I checked it happens in setup_arch(), which is called very early in start_kernel(), while driver_init() gets called through arch_call_rest_init(), which happens at the end of the function.

Quoted 5 lines

I am not sure whether we want to remark that somehow in the changelog, so it is crystal clear that by the time the node_dev_init() gets called, we already set the nodes online.

Anyway, just saying, but is fine as is.

I'll adjust the first paragraph to:

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point: early during boot, arch code determines node and zone ranges and sets the relevant nodes online; usually this happens in setup_arch().

Thanks!

Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v1 1/1
#5 lore raw
In reply to David Hildenbrand
Quoted 43 lines · David Hildenbrand

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point.

This is in line with memory_dev_init(), which initializes the memory device subsystem and creates all memory block devices.

Similar to memory_dev_init(), panic() if anything goes wrong, we don't want to continue with such basic initialization errors.

The important part is that node_dev_init() gets called after memory_dev_init() and after cpu_dev_init(), but before any of the relevant archs call register_cpu() to register the new cpu device under the node device. The latter should be the case for the current users of topology_init().

Cc Andrew Morton <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Quoted 8 lines
Signature · 2 lines
Oscar Salvador
SUSE Labs
Tested-by on v1 1/1
#6 lore raw
In reply to David Hildenbrand
Quoted 11 lines · David Hildenbrand

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point.

This is in line with memory_dev_init(), which initializes the memory device subsystem and creates all memory block devices.

Similar to memory_dev_init(), panic() if anything goes wrong, we don't want to continue with such basic initialization errors.

Quoted 8 lines

The important part is that node_dev_init() gets called after memory_dev_init() and after cpu_dev_init(), but before any of the relevant archs call register_cpu() to register the new cpu device under the node device. The latter should be the case for the current users of topology_init().

RFC because I tested only on x86-64 and s390x, I think I cross-compiled all applicable architectures except riscv and sparc.

Compiled and boot tested on sparc.

#7 lore raw
In reply to David Hildenbrand
Quoted 43 lines · David Hildenbrand

... and call node_dev_init() after memory_dev_init() from driver_init(), so before any of the existing arch/subsys calls. All online nodes should be known at that point.

This is in line with memory_dev_init(), which initializes the memory device subsystem and creates all memory block devices.

Similar to memory_dev_init(), panic() if anything goes wrong, we don't want to continue with such basic initialization errors.

The important part is that node_dev_init() gets called after memory_dev_init() and after cpu_dev_init(), but before any of the relevant archs call register_cpu() to register the new cpu device under the node device. The latter should be the case for the current users of topology_init().

Cc Andrew Morton <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Quoted 8 lines

If there are no further comments, then I'll resend as !RFC with a slightly extended patch description, testing at least under arm64 and ppc64 as they are relatively easy to test for me.

Signature · 3 lines
Thanks,

David / dhildenb