add numa node information to struct device
Subsystems (5)
PATCH 2/3 add numa node information to struct device
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)
include/linux/device.h +11 -0
@@ -347,6 +347,9 @@BIOS data),reserved for device core*/ 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
@@ -368,6 +371,14 @@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) {
drivers/base/core.c +1 -0
@@ -381,6 +381,7 @@INIT_LIST_HEAD (&dev->node);init_MUTEX (&dev->sem);device_init_wakeup (dev,0 ); +set_dev_node (dev,-1 ); }/**
drivers/pci/probe.c +1 -0
@@ -846,6 +846,7 @@ 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 ;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
include/linux/device.h line 380
Quoted 7 lines · On Wed, 15 Nov 2006 18:37:01 +0100 Christoph Hellwig <[email protected]> wrote:
include/linux/device.h +7
-0+#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
minor point: using inlines here would give typechecking, prevent possible unused-var warnings, etc.
Maybe there was a reason for not doing that.
<does it>
No doubt I'll find out ;)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>