x86_64: get mp_bus_to_node as early v2
PATCH 1/10 x86_64: get mp_bus_to_node as early v2
[PATCH 1/10] x86_64: get mp_bus_to_node as early v2
In struct device, we already have numa_node member. and we can use dev_to_node() /set_dev_node() to get and set numa_node in the device. set_dev_node is called in pci_device_add() with pcibus_to_node(bus). and pci_bus_to_node use bus->sysdata for nodeid.
the problem is when pci_add_device is called, bus->sysdata is not assigned correct nodeid yet. the result will be numa_node always is 0. pcibios_scan_root and pci_scan_root could take sysdata. So we need to get mp_bus_to_node mapping before these two are called. and get_mp_bus_to_node could get correct node for sysdata in root bus.
in scanning of root bus, all child bus will take parent bus sysdata. So all pci_device->dev.numa_node will be assigned correctly automatically. later we could use dev_to_node(&pci_dev->dev) to numa_node, and we could also could make other bus specific device get the correct numa_node too. and in different driver we could use kmalloc_node instead of kmalloc for skbuff/net or urb/usb etc. That could help improve performance with usb or net or
sata for AMD K8 two sockets beyond system.
For example:
two way opteron system and only one HT chain on node 0. USB controller on SB will be on node0. some dma accessing is used with kmalloc/dma_map_single. and these address will be on node1 instead of node0. and even worse, when node1 ram
is above 4G, we may need to iommu mapping for usb operation.
two way system with one HT chain on different node, we will need to kmalloc/dma_map_single to use ram on corresonding node too. esp for nvidia mcp55/io55 system. the second io55 could have nic/sata/pcie devices.
this is one update version to pci_sysdata ...
also reverse pci_acpi_scan_root to use pcibios_scan_root again.
without this patch: /sys/devices/pci0000:80/*/numa_node for HT chains other than on node0 always 0.
arch/i386/pci/Makefile | 1 arch/i386/pci/acpi.c | 40 +++++-------------- arch/i386/pci/common.c | 7 ++- arch/i386/pci/irq.c | 18 ++++++++ arch/i386/pci/legacy.c | 22 ++++++++++ arch/i386/pci/mp_bus_to_node.c | 24 +++++++++++ arch/x86_64/pci/k8-bus.c | 83 ++++++++++++++++++++++++++++------------- include/asm-i386/topology.h | 10 ++++ include/asm-x86_64/topology.h | 13 ++++++ 9 files changed, 159 insertions(+), 59 deletions(-)
arch/i386/pci/Makefile +1 -0
@@ -10,5 +10,6 @@ pci-y += legacy.o irq.o pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o +pci-$(CONFIG_NUMA) += mp_bus_to_node.o obj-y += $(pci-y) common.o early.o
arch/i386/pci/acpi.c +11 -29
@@ -8,46 +8,28 @@struct pci_bus *__devinit pci_acpi_scan_root (struct acpi_device *device,int domain,int busnum) {struct pci_bus *bus; -struct pci_sysdata *sd; +#ifdef CONFIG_ACPI_NUMA int pxm; - -/* Allocate per-root-bus (not per bus) arch-specific data. -* TODO: leak; this memory is never freed. -* It's arguable whether it's worth the trouble to care. -*/ - sd =kzalloc (sizeof (*sd),GFP_KERNEL ); -if (!sd) { -printk (KERN_ERR "PCI: OOM, not probing PCI bus %02x\n" , busnum); -return NULL ; - } +int node; +#endif if (domain !=0 ) {printk (KERN_WARNING "PCI: Multiple domains not supported\n" ); -kfree (sd);return NULL ; } - sd->node =-1 ; - - pxm =acpi_get_pxm (device->handle);#ifdef CONFIG_ACPI_NUMA -if (pxm >=0 ) - sd->node =pxm_to_node (pxm); + pxm =acpi_get_pxm (device->handle); +if (pxm >=0 ) { + node =pxm_to_node (pxm); +printk (KERN_INFO "bus %02x -> pxm %d -> node %02x\n" , + busnum, pxm, node); +set_mp_bus_to_node (busnum, node); + }#endif - bus =pci_scan_bus_parented (NULL , busnum, &pci_root_ops, sd); -if (!bus) -kfree (sd); + bus =pcibios_scan_root (busnum); -#ifdef CONFIG_ACPI_NUMA -if (bus !=NULL ) { -if (pxm >=0 ) { -printk ("bus %d -> pxm %d -> node %d\n" , - busnum, pxm, sd->node); - } - } -#endif -return bus; }
arch/i386/pci/common.c +6 -1
@@ -314,9 +314,14 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)return NULL ; } + sd->node =get_mp_bus_to_node (busnum); +printk (KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n" , busnum); + bus =pci_scan_bus_parented (NULL , busnum, &pci_root_ops, sd); +if (!bus) +kfree (sd); -return pci_scan_bus_parented (NULL , busnum, &pci_root_ops, sd); +return bus; }extern u8 pci_cache_line_size;
arch/i386/pci/irq.c +17 -1
@@ -136,10 +136,26 @@ static void __init pirq_peer_trick(void) busmap[e->bus] =1 ; }for (i =1 ; i <256 ; i++) { +struct pci_bus *bus =NULL ; +struct pci_sysdata *sd;if (!busmap[i] ||pci_find_bus (0 , i))continue ; -if (pci_scan_bus (i, &pci_root_ops,NULL )) +/* Allocate per-root-bus (not per bus) arch-specific data. +* TODO: leak; this memory is never freed. +* It's arguable whether it's worth the trouble to care. +*/ + sd =kzalloc (sizeof (*sd),GFP_KERNEL ); +if (!sd) { +printk (KERN_ERR "PCI: OOM, not probing PCI bus %02x\n" , + i); +continue ; + } + sd->node =get_mp_bus_to_node (i); + bus =pci_scan_bus (i, &pci_root_ops, sd); +if (bus)printk (KERN_INFO "PCI: Discovered primary peer bus %02x [IRQ]\n" , i); +else +kfree (sd); } pcibios_last_bus =-1 ; }
arch/i386/pci/legacy.c +21 -1
@@ -12,6 +12,9 @@static void __devinit pcibios_fixup_peer_bridges (void ) {int n, devfn; +struct pci_bus *bus =NULL ; +struct pci_sysdata *sd; +long node;if (pcibios_last_bus <=0 || pcibios_last_bus >=0xff )return ;
@@ -21,12 +24,29 @@ static void __devinit pcibios_fixup_peer_bridges(void)u32 l;if (pci_find_bus (0 , n))continue ; + node =get_mp_bus_to_node (n);for (devfn =0 ; devfn <256 ; devfn +=8 ) {if (!raw_pci_ops->read (0 , n, devfn,PCI_VENDOR_ID ,2 , &l) && l !=0x0000 && l !=0xffff ) {DBG ("Found device at %02x:%02x [%04x]\n" , n, devfn, l);printk (KERN_INFO "PCI: Discovered peer bus %02x\n" , n); -pci_scan_bus (n, &pci_root_ops,NULL ); +/* Allocate per-root-bus (not per bus) +* arch-specific data. +* TODO: leak; this memory is never freed. +* It's arguable whether it's worth the trouble +* to care. +*/ + sd =kzalloc (sizeof (*sd),GFP_KERNEL ); +if (!sd) { +printk (KERN_ERR +"PCI: OOM, not probing PCI bus %02x\n" , + n); +break ; + } + sd->node = node; + bus =pci_scan_bus (n, &pci_root_ops, sd); +if (!bus) +kfree (sd);break ; } }
arch/i386/pci/mp_bus_to_node.c new file +23 -0
@@ -0,0 +1,23 @@ +#include <linux/pci.h> +#include <linux/init.h> +#include <linux/topology.h> + +#define BUS_NR 256 + +static unsigned char mp_bus_to_node[BUS_NR ]; + +void set_mp_bus_to_node (int busnum,int node) +{ +if (busnum >=0 && busnum <BUS_NR ) + mp_bus_to_node[busnum] = (unsigned char ) node; +} + +int get_mp_bus_to_node (int busnum) +{ +int node; + +if (busnum <0 || busnum > (BUS_NR -1 ) ) +return 0 ; + node = mp_bus_to_node[busnum]; +return node; +}
-
arch/x86_64/pci/k8-bus.c +57 -26
128 lines not on this page · raw message
include/asm-i386/topology.h +10 -0
@@ -101,7 +101,17 @@ extern unsigned long node_remap_size[];#define node_has_online_mem (nid) (node_start_pfn[nid] != node_end_pfn[nid]) +int get_mp_bus_to_node (int busnum); +void set_mp_bus_to_node (int busnum,int node); +#else /* !CONFIG_NUMA */ +static inline int get_mp_bus_to_node (int busnum) +{ +return 0 ; +} +static inline void set_mp_bus_to_node (int busnum,int node) +{ +}/* * Other i386 platforms should define their own version of the * above macros here.
include/asm-x86_64/topology.h +13 -0
@@ -53,6 +53,19 @@ extern int __node_distance(int, int); .nr_balance_failed = 0, \ } +int get_mp_bus_to_node (int busnum); +void set_mp_bus_to_node (int busnum,int node); + +#else + +static inline int get_mp_bus_to_node (int busnum) +{ +return 0 ; +} +static inline void set_mp_bus_to_node (int busnum,int node) +{ +} +#endif #ifdef CONFIG_SMP