[PATCH] add numa node information to struct device (87348136) · Commits · 戴 / test

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) [akpm@osdl.org: cleanup] Signed-off-by:

Christoph Hellwig <hch@lst.de> Cc: Christoph Lameter <clameter@engr.sgi.com> Cc: Greg KH <greg@kroah.com> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

drivers/base/core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -386,6 +386,7 @@ void device_initialize(struct device *dev)
		INIT_LIST_HEAD(&dev->node);
		init_MUTEX(&dev->sem);
		device_init_wakeup(dev, 0);
		set_dev_node(dev, -1);
		}

		#ifdef CONFIG_SYSFS_DEPRECATED

drivers/pci/probe.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -873,6 +873,7 @@ void __devinit pci_device_add(struct pci_dev dev, struct pci_bus bus)
		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;

include/linux/device.h

+22 −0

Original line number	Diff line number	Diff line
		@@ -371,6 +371,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
		@@ -394,6 +397,25 @@ struct device {
		void (release)(struct device dev);
		};

		#ifdef CONFIG_NUMA
		static inline int dev_to_node(struct device *dev)
		{
		return dev->numa_node;
		}
		static inline void set_dev_node(struct device *dev, int node)
		{
		dev->numa_node = node;
		}
		#else
		static inline int dev_to_node(struct device *dev)
		{
		return -1;
		}
		static inline void set_dev_node(struct device *dev, int node)
		{
		}
		#endif

		static inline void *
		dev_get_drvdata (struct device *dev)
		{

Admin message