From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754638AbcGVT7f (ORCPT ); Fri, 22 Jul 2016 15:59:35 -0400 Received: from terminus.zytor.com ([198.137.202.10]:59002 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754494AbcGVT7d (ORCPT ); Fri, 22 Jul 2016 15:59:33 -0400 Date: Fri, 22 Jul 2016 12:59:17 -0700 From: tip-bot for Boris Ostrovsky Message-ID: Cc: boris.ostrovsky@oracle.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com Reply-To: hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com, tglx@linutronix.de In-Reply-To: <1458221613-21563-3-git-send-email-boris.ostrovsky@oracle.com> References: <1458221613-21563-3-git-send-email-boris.ostrovsky@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:smp/hotplug] hotplug: Prevent alloc/free of irq descriptors during cpu up/down (again) Git-Commit-ID: 484afa6961eb9409ea120b38397e6883696d8aa6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 484afa6961eb9409ea120b38397e6883696d8aa6 Gitweb: http://git.kernel.org/tip/484afa6961eb9409ea120b38397e6883696d8aa6 Author: Boris Ostrovsky AuthorDate: Thu, 17 Mar 2016 09:33:33 -0400 Committer: Thomas Gleixner CommitDate: Fri, 22 Jul 2016 21:53:18 +0200 hotplug: Prevent alloc/free of irq descriptors during cpu up/down (again) Now that Xen no longer allocates irqs in _cpu_up() we can restore commit a89941816726 ("hotplug: Prevent alloc/free of irq descriptors during cpu up/down") Signed-off-by: Boris Ostrovsky Cc: xen-devel@lists.xenproject.org Cc: david.vrabel@citrix.com Cc: konrad.wilk@oracle.com Link: http://lkml.kernel.org/r/1458221613-21563-3-git-send-email-boris.ostrovsky@oracle.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/smpboot.c | 11 ----------- kernel/cpu.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index fafe8b9..d5b36ba 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1101,17 +1101,8 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle) common_cpu_up(cpu, tidle); - /* - * We have to walk the irq descriptors to setup the vector - * space for the cpu which comes online. Prevent irq - * alloc/free across the bringup. - */ - irq_lock_sparse(); - err = do_boot_cpu(apicid, cpu, tidle); - if (err) { - irq_unlock_sparse(); pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu); return -EIO; } @@ -1129,8 +1120,6 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle) touch_nmi_watchdog(); } - irq_unlock_sparse(); - return 0; } diff --git a/kernel/cpu.c b/kernel/cpu.c index f24f459..67f4943 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -349,8 +349,16 @@ static int bringup_cpu(unsigned int cpu) struct task_struct *idle = idle_thread_get(cpu); int ret; + /* + * Some architectures have to walk the irq descriptors to + * setup the vector space for the cpu which comes online. + * Prevent irq alloc/free across the bringup. + */ + irq_lock_sparse(); + /* Arch-specific enabling code. */ ret = __cpu_up(cpu, idle); + irq_unlock_sparse(); if (ret) { cpu_notify(CPU_UP_CANCELED, cpu); return ret;