Attachment 311839 Details for Bug 455436 – Upstream fix for this issue

[patch] Upstream fix for this issue

1417 (text/plain), 4.91 KB, created by Prarit Bhargava on 2008-07-15 14:21:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-07-15 14:21:10 UTC

Size: 4.91 KB

patch

obsolete

>Return-path: <git-commits-head-owner@vger.kernel.org>
>Envelope-to: arjan@casper.infradead.org
>Delivery-date: Mon, 30 Jun 2008 15:58:53 +0000
>Received: from bombadil.infradead.org ([2001:4830:2446:ff00:214:51ff:fe65:c65c])
>	by casper.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux))
>	id 1KDLmG-0001SW-Ri
>	for arjan@casper.infradead.org; Mon, 30 Jun 2008 15:58:53 +0000
>Received: from vger.kernel.org ([209.132.176.167])
>	by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux))
>	id 1KDLmX-0007Hl-AY
>	for arjan@infradead.org; Mon, 30 Jun 2008 15:59:09 +0000
>Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
>	id S1755288AbYF3P7I (ORCPT <rfc822;arjan@infradead.org>);
>	Mon, 30 Jun 2008 11:59:08 -0400
>Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755034AbYF3P7I
>	(ORCPT <rfc822;git-commits-head-outgoing>);
>	Mon, 30 Jun 2008 11:59:08 -0400
>Received: from hera.kernel.org ([140.211.167.34]:33780 "EHLO hera.kernel.org"
>	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
>	id S1755288AbYF3P7H (ORCPT
>	<rfc822;git-commits-head@vger.kernel.org>);
>	Mon, 30 Jun 2008 11:59:07 -0400
>Received: from hera.kernel.org (IDENT:U2FsdGVkX195RwSNARrTj90kBRr2V4ktHQMTJPdUkOo@localhost [127.0.0.1])
>	by hera.kernel.org (8.13.8/8.13.8) with ESMTP id m5UFx4g8018765
>	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
>	for <git-commits-head@vger.kernel.org>; Mon, 30 Jun 2008 15:59:04 GMT
>Received: (from dwmw2@localhost)
>	by hera.kernel.org (8.13.8/8.13.1/Submit) id m5UFx4w5018734
>	for git-commits-head@vger.kernel.org; Mon, 30 Jun 2008 15:59:04 GMT
>Date:	Mon, 30 Jun 2008 15:59:04 GMT
>Message-Id: <200806301559.m5UFx4w5018734@hera.kernel.org>
>From:	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
>To:	git-commits-head@vger.kernel.org
>Subject: x86: fix cpu hotplug crash
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>X-Git-Commit: fcb43042ef55d2f46b0efa5d7746967cef38f056
>X-Git-Parent: 0b1faeef5f9243bb5fc5713a34bbf1ceab0de562
>X-Spam-Status: No, score=-3.3 required=5.0 tests=AWL,BAYES_00,
>	UNPARSEABLE_RELAY autolearn=ham version=3.2.3
>X-Spam-Checker-Version:	SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org
>X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0rc1 (hera.kernel.org [127.0.0.1]); Mon, 30 Jun 2008 15:59:06 +0000 (UTC)
>Sender:	git-commits-head-owner@vger.kernel.org
>Precedence: bulk
>List-ID: <git-commits-head.vger.kernel.org>
>X-Mailing-List:	git-commits-head@vger.kernel.org
>
>Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fcb43042ef55d2f46b0efa5d7746967cef38f056
>Commit:     fcb43042ef55d2f46b0efa5d7746967cef38f056
>Parent:     0b1faeef5f9243bb5fc5713a34bbf1ceab0de562
>Author:     Zhang, Yanmin <yanmin_zhang@linux.intel.com>
>AuthorDate: Tue Jun 24 16:06:23 2008 +0800
>Committer:  Ingo Molnar <mingo@elte.hu>
>CommitDate: Mon Jun 30 13:15:43 2008 +0200
>
>    x86: fix cpu hotplug crash
>    
>    Vegard Nossum reported crashes during cpu hotplug tests:
>    
>      http://marc.info/?l=linux-kernel&m=121413950227884&w=4
>    
>    In function _cpu_up, the panic happens when calling
>    __raw_notifier_call_chain at the second time. Kernel doesn't panic when
>    calling it at the first time. If just say because of nr_cpu_ids, that's
>    not right.
>    
>    By checking the source code, I found that function do_boot_cpu is the culprit.
>    Consider below call chain:
>     _cpu_up=>__cpu_up=>smp_ops.cpu_up=>native_cpu_up=>do_boot_cpu.
>    
>    So do_boot_cpu is called in the end. In do_boot_cpu, if
>    boot_error==true, cpu_clear(cpu, cpu_possible_map) is executed. So later
>    on, when _cpu_up calls __raw_notifier_call_chain at the second time to
>    report CPU_UP_CANCELED, because this cpu is already cleared from
>    cpu_possible_map, get_cpu_sysdev returns NULL.
>    
>    Many resources are related to cpu_possible_map, so it's better not to
>    change it.
>    
>    Below patch against 2.6.26-rc7 fixes it by removing the bit clearing in
>    cpu_possible_map.
>    
>    Signed-off-by: Zhang Yanmin <yanmin_zhang@linux.intel.com>
>    Tested-by: Vegard Nossum <vegard.nossum@gmail.com>
>    Acked-by: Rusty Russell <rusty@rustcorp.com.au>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>---
> arch/x86/kernel/smpboot.c |    1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
>diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
>index 56078d6..3e1cece 100644
>--- a/arch/x86/kernel/smpboot.c
>+++ b/arch/x86/kernel/smpboot.c
>@@ -996,7 +996,6 @@ do_rest:
> #endif
> 		cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */
> 		cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */
>-		cpu_clear(cpu, cpu_possible_map);
> 		cpu_clear(cpu, cpu_present_map);
> 		per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID;
> 	}
>--
>To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Actions: View | Diff

Attachments on bug 455436: 311839