Messages in this thread Patch in this message | | | Date | Mon, 09 Jan 2006 16:05:02 -0800 | From | Martin Bligh <> | Subject | Re: Problems with 2.6.15-mm1 and mm2. |
| |
>>from the NUMA-Q. http://test.kernel.org/19793/debug/console.log >> > > > Yes, I asked Greg about that - we don't know what's causing it yet. I have > a bad feeling that this bug will go into Linus's tree if we don't fix it > quick. > > I had problems with gregkh-pci-x86-pci-domain-support-the-meat.patch. It > might be worth reverting that.
Andy figured out what caused it.
>>on -mm2 I get the x86_64 seems to lock up (NFI why ... looking at it), >>the NUMA-Q and x440 panic (very similar to the above). >> >>I think Andy figured out what was causing those panics. Can we drop >>those patches until they're fixed? >> > > > I'm not aware of any buggy x86_64 patches in -mm2 :( > > I guess you don't have the time to sit down and do a bisection search. > It'd take a solid few hours...
It's more that I don't have direct access to the machines in question any more. The x86_64 one might just be a machine issue ... trying to confirm that still ... but the PCI one was real.
M.
Below is cut & pasted, so not applyable, and maybe it shouldn't be applied. But ... it worked before whatever is in -mm ... so my personal feeling is that if we don't have a fix for whatever is currently in -mm, it should get dropped until we do ? Going backwards = bad.
Perhaps I'm in a time loop, and just confused. but I don't think so ?
----------------------------------------------
From apw:
pci device ensure sysdata initialised
[Ok, here is a patch to ensure sysdata is valid for all busses.]
We have been seeing panic's on NUMA systems in pci_call_probe() in 2.6.15-rc5-mm2 and -mm3. It seems that some changes have occured to the meaning of the 'sysdata' for a device such that it is no longer just an integer containing the node, it is now a structure containing the node and other data. However, it seems that we do not always initialise this sysdata before we probe the device.
Below are three examples from a boot with this checked for. The attached patch ensures that we supply a valid sysdata for system busses. Currently we take no account of the node for this bus for no ACPI configured systems. This is unchanged from the -mm1 code.
Intel(R) PRO/1000 Network Driver - version 6.1.16-k2 Copyright (c) 1999-2005 Intel Corporation. pci_call_probe: starting drv<c03d4be0> dev<dfd16800> id<c03d4734> pci_call_probe: dev->bus<dfce6800> pci_call_probe: dev->bus->sysdata<00000000> pci_call_probe: node<-1> e1000: eth0: e1000_probe: Intel(R) PRO/1000 Network Connection
pci_call_probe: starting drv<c03ef220> dev<dfd17400> id<c03eed00> pci_call_probe: dev->bus<dfce6800> pci_call_probe: dev->bus->sysdata<00000000> pci_call_probe: node<-1> Linux Tulip driver version 1.1.13 (December 15, 2004) input: AT Translated Set 2 keyboard as /class/input/input0 tulip0: EEPROM default media type Autosense. tulip0: Index #0 - Media 10baseT (#0) described by a 21140 non-MII (0) block. tulip0: Index #1 - Media 100baseTx (#3) described by a 21140 non-MII (0) block. tulip0: Index #2 - Media 10baseT-FDX (#4) described by a 21140 non-MII (0) block. tulip0: Index #3 - Media 100baseTx-FDX (#5) described by a 21140 non-MII (0) block. eth1: Digital DS21140 Tulip rev 33 at 0001fc00, 00:00:BC:0F:08:96, IRQ 28.
pci_call_probe: starting drv<c040a360> dev<dfd14400> id<c040a0fc> pci_call_probe: dev->bus<dfce6600> pci_call_probe: dev->bus->sysdata<dfffafa0> pci_call_probe: node<0> qla1280: QLA1040 found on PCI bus 0, dev 11
Signed-off-by: Andy Whitcroft <apw@shadowen.org> --- arch/i386/pci/common.c | 2 ++ arch/i386/pci/fixup.c | 8 +++++--- arch/i386/pci/legacy.c | 3 ++- arch/i386/pci/numa.c | 8 +++++--- arch/i386/pci/visws.c | 4 ++-- include/asm-i386/pci.h | 1 + 6 files changed, 17 insertions(+), 9 deletions(-) diff -upN reference/arch/i386/pci/common.c current/arch/i386/pci/common.c --- reference/arch/i386/pci/common.c +++ current/arch/i386/pci/common.c @@ -29,6 +29,8 @@ unsigned long pirq_table_addr; struct pci_bus *pci_root_bus; struct pci_raw_ops *raw_pci_ops;
+struct pci_sysdata pci_default_sysdata = { .node = -1 }; + static int pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value) { return raw_pci_ops->read(pci_domain_nr(bus), bus->number, diff -upN reference/arch/i386/pci/fixup.c current/arch/i386/pci/fixup.c --- reference/arch/i386/pci/fixup.c +++ current/arch/i386/pci/fixup.c @@ -25,9 +25,11 @@ static void __devinit pci_fixup_i450nx(s pci_read_config_byte(d, reg++, &subb); DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb); if (busno) - pci_scan_bus(busno, &pci_root_ops, NULL); /* Bus A */ + pci_scan_bus(busno, &pci_root_ops, + &pci_default_sysdata); /* Bus A */ if (suba < subb) - pci_scan_bus(suba+1, &pci_root_ops, NULL); /* Bus B */ + pci_scan_bus(suba+1, &pci_root_ops, + &pci_default_sysdata); /* Bus B */ } pcibios_last_bus = -1; } @@ -42,7 +44,7 @@ static void __devinit pci_fixup_i450gx(s u8 busno; pci_read_config_byte(d, 0x4a, &busno); printk(KERN_INFO "PCI: i440KX/GX host bridge %s: secondary bus %02x\n", pci_name(d), busno); - pci_scan_bus(busno, &pci_root_ops, NULL); + pci_scan_bus(busno, &pci_root_ops, &pci_default_sysdata); pcibios_last_bus = -1; } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454GX, pci_fixup_i450gx); diff -upN reference/arch/i386/pci/legacy.c current/arch/i386/pci/legacy.c --- reference/arch/i386/pci/legacy.c +++ current/arch/i386/pci/legacy.c @@ -26,7 +26,8 @@ static void __devinit pcibios_fixup_peer 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); + pci_scan_bus(n, &pci_root_ops, + &pci_default_sysdata); break; } } diff -upN reference/arch/i386/pci/numa.c current/arch/i386/pci/numa.c --- reference/arch/i386/pci/numa.c +++ current/arch/i386/pci/numa.c @@ -97,9 +97,11 @@ static void __devinit pci_fixup_i450nx(s pci_read_config_byte(d, reg++, &subb); DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb); if (busno) - pci_scan_bus(QUADLOCAL2BUS(quad,busno), &pci_root_ops, NULL); /* Bus A */ + pci_scan_bus(QUADLOCAL2BUS(quad,busno), &pci_root_ops, + &pci_default_sysdata); /* Bus A */ if (suba < subb) - pci_scan_bus(QUADLOCAL2BUS(quad,suba+1), &pci_root_ops, NULL); /* Bus B */ + pci_scan_bus(QUADLOCAL2BUS(quad,suba+1), &pci_root_ops, + &pci_default_sysdata); /* Bus B */ } pcibios_last_bus = -1; } @@ -124,7 +126,7 @@ static int __init pci_numa_init(void) printk("Scanning PCI bus %d for quad %d\n", QUADLOCAL2BUS(quad,0), quad); pci_scan_bus(QUADLOCAL2BUS(quad,0), - &pci_root_ops, NULL); + &pci_root_ops, &pci_default_sysdata); } return 0; } diff -upN reference/arch/i386/pci/visws.c current/arch/i386/pci/visws.c --- reference/arch/i386/pci/visws.c +++ current/arch/i386/pci/visws.c @@ -102,8 +102,8 @@ static int __init pcibios_init(void) "bridge B (PIIX4) bus: %u\n", pci_bus1, pci_bus0);
raw_pci_ops = &pci_direct_conf1; - pci_scan_bus(pci_bus0, &pci_root_ops, NULL); - pci_scan_bus(pci_bus1, &pci_root_ops, NULL); + pci_scan_bus(pci_bus0, &pci_root_ops, &pci_default_sysdata); + pci_scan_bus(pci_bus1, &pci_root_ops, &pci_default_sysdata); pci_fixup_irqs(visws_swizzle, visws_map_irq); pcibios_resource_survey(); return 0; diff -upN reference/include/asm-i386/pci.h current/include/asm-i386/pci.h --- reference/include/asm-i386/pci.h +++ current/include/asm-i386/pci.h @@ -9,6 +9,7 @@ struct pci_sysdata { int domain; /* PCI domain */ int node; /* NUMA node */ }; +extern struct pci_sysdata pci_default_sysdata;
#ifdef CONFIG_PCI_DOMAINS static inline int pci_domain_nr(struct pci_bus *bus) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |