Commit 2848a28b authored by David Hildenbrand's avatar David Hildenbrand Committed by Linus Torvalds
Browse files

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: early during boot, arch code determines node and
zone ranges and sets the relevant nodes online; usually this happens in
setup_arch().

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().

Link: https://lkml.kernel.org/r/20220203105212.30385-1-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Tested-by: Anatoly Pugachev <matorola@gmail.com> (sparc64)
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ea0d2d7

arch/arm64/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);