On Mon, Oct 30, 2006 at 02:33:57PM -0800, David Miller wrote:
> It may be a bit much to be calling all the way through up to the PCI
> layer just to pluck out a simple integer, don't you think? The PCI
> bus pointer comparison is just a symptom of how silly this is.
>
> Especially since this will be used for every packet allocation a
> device makes.
>
> So, please add some sanity to this situation and just put the node
> into the generic struct device. :-)
I was concerned about growing struct device, on smaller system it
already eats up a lot of memory. But we can make the node member
conditional on CONFIG_NUMA, as I did in the patch below.
This directly replaces PATCH 2/2 (the one we're replying to), all
others remain unmodified.
Index: linux-2.6/include/linux/device.h
===================================================================
--- linux-2.6.orig/include/linux/device.h 2006-10-29 16:02:38.000000000 +0100
+++ linux-2.6/include/linux/device.h 2006-11-02 12:47:17.000000000 +0100
@@ -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,12 @@
void (*release)(struct device * dev);
};
+#ifdef CONFIG_NUMA
+#define dev_to_node(dev) ((dev)->numa_node)
+#else
+#define dev_to_node(dev) (-1)
+#endif
+
static inline void *
dev_get_drvdata (struct device *dev)
{
Index: linux-2.6/drivers/base/core.c
===================================================================
--- linux-2.6.orig/drivers/base/core.c 2006-10-23 17:21:44.000000000 +0200
+++ linux-2.6/drivers/base/core.c 2006-11-02 12:48:12.000000000 +0100
@@ -381,6 +381,7 @@
INIT_LIST_HEAD(&dev->node);
init_MUTEX(&dev->sem);
device_init_wakeup(dev, 0);
+ dev->numa_node = -1;
}
/**
Index: linux-2.6/drivers/pci/probe.c
===================================================================
--- linux-2.6.orig/drivers/pci/probe.c 2006-10-23 17:21:46.000000000 +0200
+++ linux-2.6/drivers/pci/probe.c 2006-11-02 12:47:35.000000000 +0100
@@ -846,6 +846,7 @@
dev->dev.release = pci_release_dev;
pci_dev_get(dev);
+ dev->dev.numa_node = pcibus_to_node(bus);
dev->dev.dma_mask = &dev->dma_mask;
dev->dev.coherent_dma_mask = 0xffffffffull;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
