From patchwork Mon Nov 26 10:20:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 1801611 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CD43B3FC54 for ; Mon, 26 Nov 2012 10:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755035Ab2KZKvP (ORCPT ); Mon, 26 Nov 2012 05:51:15 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:60805 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754900Ab2KZKtx (ORCPT ); Mon, 26 Nov 2012 05:49:53 -0500 X-IronPort-AV: E=Sophos;i="4.83,320,1352044800"; d="scan'208";a="6277343" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 26 Nov 2012 18:48:04 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qAQADxOG012889; Mon, 26 Nov 2012 18:14:03 +0800 Received: from ghost.fnst.cn.fujitsu.com ([10.167.225.226]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012112618133528-63623 ; Mon, 26 Nov 2012 18:13:35 +0800 From: Wen Congyang To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, x86@kernel.org Cc: Yasuaki Ishimatsu , David Rientjes , Jiang Liu , Minchan Kim , KOSAKI Motohiro , Andrew Morton , Mel Gorman , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Tang Chen , "Rafael J. Wysocki" , Len Brown , Lai Jiangshan , Wen Congyang Subject: [PATCH 5/5] Do not use cpu_to_node() to find an offlined cpu's node. Date: Mon, 26 Nov 2012 18:20:27 +0800 Message-Id: <1353925227-1877-6-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353925227-1877-1-git-send-email-wency@cn.fujitsu.com> References: <1353925227-1877-1-git-send-email-wency@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/26 18:13:35, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/26 18:13:40, Serialize complete at 2012/11/26 18:13:40 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Tang Chen If a cpu is offline, its nid will be set to -1, and cpu_to_node(cpu) will return -1. As a result, cpumask_of_node(nid) will return NULL. In this case, find_next_bit() in for_each_cpu will get a NULL pointer and cause panic. Here is a call trace: [ 609.824017] Call Trace: [ 609.824017] [ 609.824017] [] select_fallback_rq+0x71/0x190 [ 609.824017] [] ? try_to_wake_up+0x2e/0x2f0 [ 609.824017] [] try_to_wake_up+0x2cb/0x2f0 [ 609.824017] [] ? __run_hrtimer+0x78/0x320 [ 609.824017] [] wake_up_process+0x15/0x20 [ 609.824017] [] hrtimer_wakeup+0x22/0x30 [ 609.824017] [] __run_hrtimer+0x83/0x320 [ 609.824017] [] ? update_rmtp+0x80/0x80 [ 609.824017] [] hrtimer_interrupt+0x106/0x280 [ 609.824017] [] ? sd_free_ctl_entry+0x68/0x70 [ 609.824017] [] smp_apic_timer_interrupt+0x69/0x99 [ 609.824017] [] apic_timer_interrupt+0x6f/0x80 There is a hrtimer process sleeping, whose cpu has already been offlined. When it is waken up, it tries to find another cpu to run, and get a -1 nid. As a result, cpumask_of_node(-1) returns NULL, and causes ernel panic. This patch fixes this problem by judging if the nid is -1. If nid is not -1, a cpu on the same node will be picked. Else, a online cpu on another node will be picked. Cc: Yasuaki Ishimatsu Cc: David Rientjes Cc: Jiang Liu Cc: Minchan Kim Cc: KOSAKI Motohiro Cc: Andrew Morton Cc: Mel Gorman Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Peter Zijlstra Signed-off-by: Tang Chen Signed-off-by: Wen Congyang --- kernel/sched/core.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2d8927f..4e6404e 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1106,18 +1106,28 @@ EXPORT_SYMBOL_GPL(kick_process); */ static int select_fallback_rq(int cpu, struct task_struct *p) { - const struct cpumask *nodemask = cpumask_of_node(cpu_to_node(cpu)); + int nid = cpu_to_node(cpu); + const struct cpumask *nodemask = NULL; enum { cpuset, possible, fail } state = cpuset; int dest_cpu; - /* Look for allowed, online CPU in same node. */ - for_each_cpu(dest_cpu, nodemask) { - if (!cpu_online(dest_cpu)) - continue; - if (!cpu_active(dest_cpu)) - continue; - if (cpumask_test_cpu(dest_cpu, tsk_cpus_allowed(p))) - return dest_cpu; + /* + * If the node that the cpu is on has been offlined, cpu_to_node() + * will return -1. There is no cpu on the node, and we should + * select the cpu on the other node. + */ + if (nid != -1) { + nodemask = cpumask_of_node(nid); + + /* Look for allowed, online CPU in same node. */ + for_each_cpu(dest_cpu, nodemask) { + if (!cpu_online(dest_cpu)) + continue; + if (!cpu_active(dest_cpu)) + continue; + if (cpumask_test_cpu(dest_cpu, tsk_cpus_allowed(p))) + return dest_cpu; + } } for (;;) {