From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933564AbYBTPjy (ORCPT ); Wed, 20 Feb 2008 10:39:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933398AbYBTPiY (ORCPT ); Wed, 20 Feb 2008 10:38:24 -0500 Received: from viefep18-int.chello.at ([213.46.255.22]:42941 "EHLO viefep16-int.chello.at" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1761457AbYBTPiQ (ORCPT ); Wed, 20 Feb 2008 10:38:16 -0500 X-SourceIP: 80.56.237.116 Message-Id: <20080220150306.041993000@chello.nl> References: <20080220144610.548202000@chello.nl> User-Agent: quilt/0.45-1 Date: Wed, 20 Feb 2008 15:46:16 +0100 From: Peter Zijlstra To: Linus Torvalds , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, trond.myklebust@fys.uio.no Cc: Peter Zijlstra Subject: [PATCH 06/28] mm: serialize access to min_free_kbytes Content-Disposition: inline; filename=mm-setup_per_zone_pages_min.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is a small race between the procfs caller and the memory hotplug caller of setup_per_zone_pages_min(). Not a big deal, but the next patch will add yet another caller. Time to close the gap. Signed-off-by: Peter Zijlstra --- mm/page_alloc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) Index: linux-2.6/mm/page_alloc.c =================================================================== --- linux-2.6.orig/mm/page_alloc.c +++ linux-2.6/mm/page_alloc.c @@ -116,6 +116,7 @@ static char * const zone_names[MAX_NR_ZO "Movable", }; +static DEFINE_SPINLOCK(min_free_lock); int min_free_kbytes = 1024; unsigned long __meminitdata nr_kernel_pages; @@ -4087,12 +4088,12 @@ static void setup_per_zone_lowmem_reserv } /** - * setup_per_zone_pages_min - called when min_free_kbytes changes. + * __setup_per_zone_pages_min - called when min_free_kbytes changes. * * Ensures that the pages_{min,low,high} values for each zone are set correctly * with respect to min_free_kbytes. */ -void setup_per_zone_pages_min(void) +static void __setup_per_zone_pages_min(void) { unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10); unsigned long lowmem_pages = 0; @@ -4147,6 +4148,15 @@ void setup_per_zone_pages_min(void) calculate_totalreserve_pages(); } +void setup_per_zone_pages_min(void) +{ + unsigned long flags; + + spin_lock_irqsave(&min_free_lock, flags); + __setup_per_zone_pages_min(); + spin_unlock_irqrestore(&min_free_lock, flags); +} + /* * Initialise min_free_kbytes. * @@ -4182,7 +4192,7 @@ static int __init init_per_zone_pages_mi min_free_kbytes = 128; if (min_free_kbytes > 65536) min_free_kbytes = 65536; - setup_per_zone_pages_min(); + __setup_per_zone_pages_min(); setup_per_zone_lowmem_reserve(); return 0; } --