From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801Ab1KLFpE (ORCPT ); Sat, 12 Nov 2011 00:45:04 -0500 Received: from mga03.intel.com ([143.182.124.21]:9071 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751051Ab1KLFnw (ORCPT ); Sat, 12 Nov 2011 00:43:52 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.69,498,1315206000"; d="scan'208";a="73897230" From: "Fenghua Yu" To: "Thomas Gleixner" , "H Peter Anvin" , "Ingo Molnar" , "Linus Torvalds" , "Andrew Morton" , "Tony Luck" , "Arjan van de Ven" , "Suresh B Siddha" , "Len Brown" , "Randy Dunlap" , "Srivatsa S. Bhat" , Konrad Rzeszutek Wilk , Peter Zijlstra Cc: "linux-kernel" , "linux-pm" , "x86" , "Fenghua Yu" Subject: [PATCH v4 4/7] x86/smpboot.c: Don't offline BSP if any irq can not be migrated out of it Date: Fri, 11 Nov 2011 21:26:29 -0800 Message-Id: <1321075592-31600-5-git-send-email-fenghua.yu@intel.com> X-Mailer: git-send-email 1.7.2 In-Reply-To: <1321075592-31600-1-git-send-email-fenghua.yu@intel.com> References: <1321075592-31600-1-git-send-email-fenghua.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fenghua Yu Don't offline BSP if any irq can not be migrated out of it. Call identify_boot_cpu_online() for BSP in smp_callin() and continue to online BSP in native_cpu_up(). Signed-off-by: Fenghua Yu --- arch/x86/kernel/smpboot.c | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 9f548cb..83838c5 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -136,8 +136,8 @@ EXPORT_PER_CPU_SYMBOL(cpu_info); atomic_t init_deasserted; /* - * Report back to the Boot Processor. - * Running on AP. + * Report back to the Boot Processor during boot time or to the caller processor + * during CPU online. */ static void __cpuinit smp_callin(void) { @@ -224,6 +224,13 @@ static void __cpuinit smp_callin(void) smp_store_cpu_info(cpuid); /* + * This function won't run on the BSP during boot time. It run + * on BSP only when BSP is offlined and onlined again. + */ + if (cpuid == 0) + identify_boot_cpu_online(); + + /* * This must be done before setting cpu_online_mask * or calling notify_cpu_starting. */ @@ -839,7 +846,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) pr_debug("++++++++++++++++++++=_---CPU UP %u\n", cpu); - if (apicid == BAD_APICID || apicid == boot_cpu_physical_apicid || + if (apicid == BAD_APICID || !physid_isset(apicid, phys_cpu_present_map)) { printk(KERN_ERR "%s: bad cpu %d\n", __func__, cpu); return -EINVAL; @@ -1283,12 +1290,34 @@ int native_cpu_disable(void) * Perhaps use cpufreq to drop frequency, but that could go * into generic code. * - * We won't take down the boot processor on i386 due to some + * We won't take down the boot processor on i386 if some * interrupts only being able to be serviced by the BSP. - * Especially so if we're not using an IOAPIC -zwane + * Especially so if we're not using an IOAPIC + * -original comment from zwane, changed by fyu */ - if (cpu == 0) - return -EBUSY; + if (cpu == 0) { + int irq; + struct irq_desc *desc; + struct irq_data *data; + struct irq_chip *chip; + + for_each_irq_desc(irq, desc) { + raw_spin_lock(&desc->lock); + if (!irq_has_action(irq)) { + raw_spin_unlock(&desc->lock); + continue; + } + + data = irq_desc_get_irq_data(desc); + chip = irq_data_get_irq_chip(data); + if (!chip->irq_set_affinity) { + pr_debug("irq%d can't move out of BSP\n", irq); + raw_spin_unlock(&desc->lock); + return -EBUSY; + } + raw_spin_unlock(&desc->lock); + } + } clear_local_APIC(); -- 1.6.0.3