From: Christoph Hellwig For node-aware skb allocations we need information about the node in struct net_device or struct device. Davem suggested to put it into struct device which this patch does. In particular: - struct device gets a new int numa_node member if CONFIG_NUMA is set - there are two new helpers, dev_to_node and set_dev_node to transparently deal with the non-numa case - for pci devices the node-info is set to the value we get from pcibus_to_node. Note that for some architectures pcibus_to_node doesn't work yet at the time we call it currently. This is harmless and will just mean skb allocations aren't node-local on this architectures until the implementation of pcibus_to_node on these architectures have been updated (There are patches for x86 and x86_64 floating around) Signed-off-by: Christoph Hellwig Cc: Christoph Lameter Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/base/core.c | 1 + drivers/pci/probe.c | 1 + include/linux/device.h | 11 +++++++++++ 3 files changed, 13 insertions(+) diff -puN drivers/base/core.c~add-numa-node-information-to-struct-device drivers/base/core.c --- a/drivers/base/core.c~add-numa-node-information-to-struct-device +++ a/drivers/base/core.c @@ -461,6 +461,7 @@ void device_initialize(struct device *de INIT_LIST_HEAD(&dev->node); init_MUTEX(&dev->sem); device_init_wakeup(dev, 0); + set_dev_node(dev, -1); } #ifdef CONFIG_SYSFS_DEPRECATED diff -puN drivers/pci/probe.c~add-numa-node-information-to-struct-device drivers/pci/probe.c --- a/drivers/pci/probe.c~add-numa-node-information-to-struct-device +++ a/drivers/pci/probe.c @@ -873,6 +873,7 @@ void __devinit pci_device_add(struct pci 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; diff -puN include/linux/device.h~add-numa-node-information-to-struct-device include/linux/device.h --- a/include/linux/device.h~add-numa-node-information-to-struct-device +++ a/include/linux/device.h @@ -370,6 +370,9 @@ struct device { core doesn't touch it */ struct dev_pm_info power; +#ifdef CONFIG_NUMA + int numa_node; /* NUMA node this device is close to */ +#endif u64 *dma_mask; /* dma mask (if dma'able device) */ u64 coherent_dma_mask;/* Like dma_mask, but for alloc_coherent mappings as @@ -393,6 +396,14 @@ struct device { void (*release)(struct device * dev); }; +#ifdef CONFIG_NUMA +#define dev_to_node(dev) ((dev)->numa_node) +#define set_dev_node(dev, node) ((dev)->numa_node = node) +#else +#define dev_to_node(dev) (-1) +#define set_dev_node(dev, node) do { } while (0) +#endif + static inline void * dev_get_drvdata (struct device *dev) { _