Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

driver core: try parent numa_node at first before using default

in the device_add, we try to use use parent numa_node.
need to make sure pci root bus's bridge device numa_node is set.
then we could use device->numa_node direclty for all device.
and don't need to call pcibus_to_node().

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

Yinghai Lu and committed by
Ingo Molnar
0d358f22 d39398a3

+15 -3
+12 -2
drivers/base/core.c
··· 787 787 parent = get_device(dev->parent); 788 788 setup_parent(dev, parent); 789 789 790 + /* use parent numa_node */ 791 + if (parent) 792 + set_dev_node(dev, dev_to_node(parent)); 793 + 790 794 /* first, register with generic layer. */ 791 795 error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id); 792 796 if (error) ··· 1310 1306 dev->parent = new_parent; 1311 1307 if (old_parent) 1312 1308 klist_remove(&dev->knode_parent); 1313 - if (new_parent) 1309 + if (new_parent) { 1314 1310 klist_add_tail(&dev->knode_parent, &new_parent->klist_children); 1311 + set_dev_node(dev, dev_to_node(new_parent)); 1312 + } 1313 + 1315 1314 if (!dev->class) 1316 1315 goto out_put; 1317 1316 error = device_move_class_links(dev, old_parent, new_parent); ··· 1324 1317 if (!kobject_move(&dev->kobj, &old_parent->kobj)) { 1325 1318 if (new_parent) 1326 1319 klist_remove(&dev->knode_parent); 1327 - if (old_parent) 1320 + dev->parent = old_parent; 1321 + if (old_parent) { 1328 1322 klist_add_tail(&dev->knode_parent, 1329 1323 &old_parent->klist_children); 1324 + set_dev_node(dev, dev_to_node(old_parent)); 1325 + } 1330 1326 } 1331 1327 cleanup_glue_dir(dev, new_parent_kobj); 1332 1328 put_device(new_parent);
+3 -1
drivers/pci/probe.c
··· 973 973 dev->dev.release = pci_release_dev; 974 974 pci_dev_get(dev); 975 975 976 - set_dev_node(&dev->dev, pcibus_to_node(bus)); 977 976 dev->dev.dma_mask = &dev->dma_mask; 978 977 dev->dev.dma_parms = &dev->dma_parms; 979 978 dev->dev.coherent_dma_mask = 0xffffffffull; ··· 1126 1127 if (error) 1127 1128 goto dev_reg_err; 1128 1129 b->bridge = get_device(dev); 1130 + 1131 + if (!parent) 1132 + set_dev_node(b->bridge, pcibus_to_node(b)); 1129 1133 1130 1134 b->dev.class = &pcibus_class; 1131 1135 b->dev.parent = b->bridge;