From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754009AbZKLSJ2 (ORCPT ); Thu, 12 Nov 2009 13:09:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753811AbZKLSJ1 (ORCPT ); Thu, 12 Nov 2009 13:09:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30663 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753705AbZKLSJ1 (ORCPT ); Thu, 12 Nov 2009 13:09:27 -0500 Date: Thu, 12 Nov 2009 13:09:31 -0500 From: Prarit Bhargava To: linux-kernel@vger.kernel.org, bhavna.sarathy@amd.com, jbarnes@virtuousgeek.org, andreas.herrmann3@amd.com, mingo@elte.hu Cc: Prarit Bhargava Message-Id: <20091112180933.12532.98685.sendpatchset@prarit.bos.redhat.com> Subject: [PATCH]: AMD Northbridge: Verify NB's node is online Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Panic seen on some IBM and HP systems on 2.6.32-rc6. BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] find_next_bit+0x77/0x9c PGD 2735ba067 PUD 2735d5067 PMD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/platform/pcspkr/modalias CPU 7 Modules linked in: k8temp(+) pcspkr edac_core serio_raw hwmon shpchp cciss dm_snapshot dm_zero dm_mirror dm_region_hash dm_log dm_mod Pid: 616, comm: modprobe Not tainted 2.6.32-rc6 #2 ProLiant DL585 G2 RIP: 0010:[] [] find_next_bit+0x77/0x9c RSP: 0018:ffff8802736fdd18 EFLAGS: 00010202 RAX: 0000000000000000 RBX: ffffffff8182f680 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000008 RDI: 0000000000000008 RBP: ffff8802736fdd18 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff81d922e0 R11: 0000000000000000 R12: 0000000000000000 R13: ffffffffa007e720 R14: 0000000000000001 R15: 00000000015b19e0 FS: 00007f0a474086f0(0000) GS:ffff880036400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000000 CR3: 0000000273cbb000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process modprobe (pid: 616, threadinfo ffff8802736fc000, task ffff8802743b5c00) Stack: ffff8802736fdd38 ffffffff8120bbde ffff88027646b0d8 ffff88027646b168 <0> ffff8802736fdd88 ffffffff81225c62 ffffffffa007e720 ffff88027646b0d8 <0> ffffffffa007e930 ffffffff812b9be6 ffff88027646b168 ffffffffa007e780 Call Trace: [] cpumask_next_and+0x2e/0x3b [] pci_device_probe+0x8e/0xf5 [] ? driver_sysfs_add+0x47/0x6c [] driver_probe_device+0xd9/0x1f9 [] __driver_attach+0x58/0x7c [] ? __driver_attach+0x0/0x7c [] bus_for_each_dev+0x54/0x89 [] driver_attach+0x19/0x1b [] bus_add_driver+0xd3/0x23d [] driver_register+0x98/0x109 [] __pci_register_driver+0x63/0xd3 [] ? up_read+0x26/0x2a [] ? k8temp_init+0x0/0x20 [k8temp] [] k8temp_init+0x1e/0x20 [k8temp] [] do_one_initcall+0x6d/0x185 [] sys_init_module+0xd3/0x236 [] system_call_fastpath+0x16/0x1b Code: 49 83 c0 40 eb 14 49 8b 01 48 85 c0 75 39 49 83 c1 08 49 83 c0 40 48 83 ef 40 48 f7 c7 c0 ff ff ff 75 e3 48 85 ff 4c 89 c0 74 23 <49> 8b 01 b9 40 00 00 00 48 83 ca ff 29 f9 48 d3 ea 48 21 d0 75 RIP [] find_next_bit+0x77/0x9c RSP CR2: 0000000000000000 ---[ end trace a3d7e2941e8a6320 ]--- Hardware maybe programmed incorrectly and return a bogus node ID. Check to see if the node is actually online before setting the numa node for an AMD northbridge in quirk_amd_nb_node(). Signed-off-by: Prarit Bhargava diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 6c3b2c6..9308ba7 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -507,7 +507,8 @@ static void __init quirk_amd_nb_node(struct pci_dev *dev) return; pci_read_config_dword(nb_ht, 0x60, &val); - set_dev_node(&dev->dev, val & 7); + if (node_online(val & 7)) + set_dev_node(&dev->dev, val & 7); pci_dev_put(nb_ht); }