From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754214AbaHYFrc (ORCPT ); Mon, 25 Aug 2014 01:47:32 -0400 Received: from mga02.intel.com ([134.134.136.20]:34852 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752334AbaHYFrb (ORCPT ); Mon, 25 Aug 2014 01:47:31 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,395,1406617200"; d="scan'208";a="592760827" From: Wanpeng Li To: linux-kernel@vger.kernel.org Cc: hpa@zytor.com, Ingo Molnar , Peter Zijlstra , x86@kernel.org, Borislav Petkov , Yasuaki Ishimatsu , David Rientjes , Prarit Bhargava , Steven Rostedt , Jan Kiszka , Toshi Kani , Zhang Yang , Wanpeng Li Subject: [PATCH RESEND v4] sched: fix llc shared map unreleased during cpu hotplug Date: Mon, 25 Aug 2014 13:49:36 +0800 Message-Id: <1408945776-92404-1-git-send-email-wanpeng.li@linux.intel.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 220.262245] Call Trace: [ 220.262252] [] load_balance+0x156/0x980 [ 220.262259] [] ? _raw_spin_unlock_irqrestore+0x2e/0xa0 [ 220.262266] [] idle_balance+0xe3/0x150 [ 220.262270] [] __schedule+0x797/0x8d0 [ 220.262277] [] schedule+0x24/0x70 [ 220.262283] [] schedule_timeout+0x119/0x1f0 [ 220.262294] [] ? lock_timer_base+0x70/0x70 [ 220.262301] [] schedule_timeout_uninterruptible+0x19/0x20 [ 220.262308] [] msleep+0x18/0x20 [ 220.262317] [] lock_device_hotplug_sysfs+0x2a/0x50 [ 220.262323] [] online_store+0x2e/0x80 [ 220.262358] [] dev_attr_store+0x1b/0x20 Last level cache shared map is built during cpu up and build sched domain routine takes advantage of it to setup sched domain cpu topology, however, llc shared map is unreleased during cpu disable which lead to invalid sched domain cpu topology. This patch fix it by release llc shared map correctly during cpu disable. Reviewed-by: Toshi Kani Reviewed-by: Yasuaki Ishimatsu Tested-by: Linn Crosetto Signed-off-by: Wanpeng Li --- v3 -> v4: * simplify backtrace v2 -> v3: * simplify backtrace v1 -> v2: * fix subject line arch/x86/kernel/smpboot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 5492798..0134ec7 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1292,6 +1292,9 @@ static void remove_siblinginfo(int cpu) for_each_cpu(sibling, cpu_sibling_mask(cpu)) cpumask_clear_cpu(cpu, cpu_sibling_mask(sibling)); + for_each_cpu(sibling, cpu_llc_shared_mask(cpu)) + cpumask_clear_cpu(cpu, cpu_llc_shared_mask(sibling)); + cpumask_clear(cpu_llc_shared_mask(cpu)); cpumask_clear(cpu_sibling_mask(cpu)); cpumask_clear(cpu_core_mask(cpu)); c->phys_proc_id = 0; -- 1.9.1