From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by kanga.kvack.org (Postfix) with ESMTP id E6AD46B0035 for ; Wed, 5 Feb 2014 17:18:53 -0500 (EST) Received: by mail-pa0-f44.google.com with SMTP id kq14so900636pab.3 for ; Wed, 05 Feb 2014 14:18:53 -0800 (PST) Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com. [202.81.31.140]) by mx.google.com with ESMTPS id gx4si30528789pbc.291.2014.02.05.14.18.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Feb 2014 14:18:52 -0800 (PST) Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Feb 2014 08:18:47 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 3E9932BB0054 for ; Thu, 6 Feb 2014 09:18:44 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s15LxNIf65142788 for ; Thu, 6 Feb 2014 08:59:23 +1100 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s15MIg3l018179 for ; Thu, 6 Feb 2014 09:18:43 +1100 From: "Srivatsa S. Bhat" Subject: [PATCH 48/51] mm, vmstat: Fix CPU hotplug callback registration Date: Thu, 06 Feb 2014 03:43:23 +0530 Message-ID: <20140205221322.19080.63386.stgit@srivatsabhat.in.ibm.com> In-Reply-To: <20140205220251.19080.92336.stgit@srivatsabhat.in.ibm.com> References: <20140205220251.19080.92336.stgit@srivatsabhat.in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: paulus@samba.org, oleg@redhat.com, rusty@rustcorp.com.au, peterz@infradead.org, tglx@linutronix.de, akpm@linux-foundation.org Cc: mingo@kernel.org, paulmck@linux.vnet.ibm.com, tj@kernel.org, walken@google.com, ego@linux.vnet.ibm.com, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, srivatsa.bhat@linux.vnet.ibm.com, Christoph Lameter , Rik van Riel , Johannes Weiner , Yasuaki Ishimatsu , Cody P Schafer , Toshi Kani , Dave Hansen , linux-mm@kvack.org"Srivatsa S. Bhat" Subsystems that want to register CPU hotplug callbacks, as well as perform initialization for the CPUs that are already online, often do it as shown below: get_online_cpus(); for_each_online_cpu(cpu) init_cpu(cpu); register_cpu_notifier(&foobar_cpu_notifier); put_online_cpus(); This is wrong, since it is prone to ABBA deadlocks involving the cpu_add_remove_lock and the cpu_hotplug.lock (when running concurrently with CPU hotplug operations). Instead, the correct and race-free way of performing the callback registration is: cpu_maps_update_begin(); for_each_online_cpu(cpu) init_cpu(cpu); /* Note the use of the double underscored version of the API */ __register_cpu_notifier(&foobar_cpu_notifier); cpu_maps_update_done(); Fix the vmstat code in the MM subsystem by using this latter form of callback registration. Cc: Andrew Morton Cc: Christoph Lameter Cc: Rik van Riel Cc: Johannes Weiner Cc: Yasuaki Ishimatsu Cc: Cody P Schafer Cc: Toshi Kani Cc: Dave Hansen Cc: linux-mm@kvack.org Signed-off-by: Srivatsa S. Bhat --- mm/vmstat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/vmstat.c b/mm/vmstat.c index 7249614..70668ba 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1290,14 +1290,14 @@ static int __init setup_vmstat(void) #ifdef CONFIG_SMP int cpu; - register_cpu_notifier(&vmstat_notifier); + cpu_maps_update_begin(); + __register_cpu_notifier(&vmstat_notifier); - get_online_cpus(); for_each_online_cpu(cpu) { start_cpu_timer(cpu); node_set_state(cpu_to_node(cpu), N_CPU); } - put_online_cpus(); + cpu_maps_update_done(); #endif #ifdef CONFIG_PROC_FS proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org