The patch titled
try parent numa_node at first before using default
has been removed from the -mm tree. Its filename was
try-parent-numa_node-at-first-before-using-default.patch
This patch was dropped because it was nacked
------------------------------------------------------
Subject: try parent numa_node at first before using default
From: Yinghai Lu <Yinghai.Lu@xxxxxxx>
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@xxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/core.c | 15 +++++++++++++--
drivers/pci/probe.c | 4 +++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff -puN drivers/base/core.c~try-parent-numa_node-at-first-before-using-default drivers/base/core.c
--- a/drivers/base/core.c~try-parent-numa_node-at-first-before-using-default
+++ a/drivers/base/core.c
@@ -718,6 +718,11 @@ int device_add(struct device *dev)
if (error)
goto Error;
+ /* use parent numa_node */
+ if (parent) {
+ set_dev_node(dev, dev_to_node(parent));
+ }
+
/* first, register with generic layer. */
kobject_set_name(&dev->kobj, "%s", dev->bus_id);
error = kobject_add(&dev->kobj);
@@ -1306,8 +1311,11 @@ int device_move(struct device *dev, stru
dev->parent = new_parent;
if (old_parent)
klist_remove(&dev->knode_parent);
- if (new_parent)
+ if (new_parent) {
klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
+ set_dev_node(dev, dev_to_node(new_parent));
+ }
+
if (!dev->class)
goto out_put;
error = device_move_class_links(dev, old_parent, new_parent);
@@ -1317,9 +1325,12 @@ int device_move(struct device *dev, stru
if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
if (new_parent)
klist_remove(&dev->knode_parent);
- if (old_parent)
+ dev->parent = old_parent;
+ if (old_parent) {
klist_add_tail(&dev->knode_parent,
&old_parent->klist_children);
+ set_dev_node(dev, dev_to_node(old_parent));
+ }
}
put_device(new_parent);
goto out;
diff -puN drivers/pci/probe.c~try-parent-numa_node-at-first-before-using-default drivers/pci/probe.c
--- a/drivers/pci/probe.c~try-parent-numa_node-at-first-before-using-default
+++ a/drivers/pci/probe.c
@@ -1019,7 +1019,6 @@ void pci_device_add(struct pci_dev *dev,
dev->dev.release = pci_release_dev;
pci_dev_get(dev);
- set_dev_node(&dev->dev, pcibus_to_node(bus));
dev->dev.dma_mask = &dev->dma_mask;
dev->dev.coherent_dma_mask = 0xffffffffull;
@@ -1180,6 +1179,9 @@ struct pci_bus * pci_create_bus(struct d
goto dev_reg_err;
b->bridge = get_device(dev);
+ if (!parent)
+ set_dev_node(b->bridge, pcibus_to_node(b));
+
b->class_dev.class = &pcibus_class;
sprintf(b->class_dev.class_id, "%04x:%02x", pci_domain_nr(b), bus);
error = class_device_register(&b->class_dev);
_
Patches currently in -mm which might be from Yinghai.Lu@xxxxxxx are
serial-keep-the-dtr-setting-for-serial-console.patch
try-parent-numa_node-at-first-before-using-default.patch
net-use-numa_node-in-net_devcice-dev-instead-of-parent.patch
dma-use-dev_to_node-to-get-node-for-device-in-dma_alloc_pages.patch
x86-make-io-apic-not-connected-pin-print-complete.patch
x86-use-num_online_nodes-to-get-physical-cpus-numbers-for.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
