From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e33.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 5A6C3B70A5 for ; Tue, 20 Jul 2010 13:54:03 +1000 (EST) Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o6K3nPEf019539 for ; Mon, 19 Jul 2010 21:49:25 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6K3s0xL116926 for ; Mon, 19 Jul 2010 21:54:00 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o6K3rx3K024402 for ; Mon, 19 Jul 2010 21:54:00 -0600 Message-ID: <4C451DD6.3080005@austin.ibm.com> Date: Mon, 19 Jul 2010 22:53:58 -0500 From: Nathan Fontenot MIME-Version: 1.0 To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@ozlabs.org Subject: [PATCH 3/8] v3 Add section count to memory_block References: <4C451BF5.50304@austin.ibm.com> In-Reply-To: <4C451BF5.50304@austin.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Cc: greg@kroah.com, KAMEZAWA Hiroyuki List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Add a section count property to the memory_block struct to track the number of memory sections that have been added/removed from a emory block. Signed-off-by: Nathan Fontenot --- drivers/base/memory.c | 19 ++++++++++++------- include/linux/memory.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) Index: linux-2.6/drivers/base/memory.c =================================================================== --- linux-2.6.orig/drivers/base/memory.c 2010-07-19 20:43:49.000000000 -0500 +++ linux-2.6/drivers/base/memory.c 2010-07-19 20:44:01.000000000 -0500 @@ -487,6 +487,7 @@ static int add_memory_block(int nid, str mem->start_phys_index = __section_nr(section); mem->state = state; + atomic_inc(&mem->section_count); mutex_init(&mem->state_mutex); start_pfn = section_nr_to_pfn(mem->start_phys_index); mem->phys_device = arch_get_memory_phys_device(start_pfn); @@ -516,13 +517,17 @@ int remove_memory_block(unsigned long no struct memory_block *mem; mem = find_memory_block(section); - unregister_mem_sect_under_nodes(mem); - mem_remove_simple_file(mem, start_phys_index); - mem_remove_simple_file(mem, end_phys_index); - mem_remove_simple_file(mem, state); - mem_remove_simple_file(mem, phys_device); - mem_remove_simple_file(mem, removable); - unregister_memory(mem, section); + atomic_dec(&mem->section_count); + + if (atomic_read(&mem->section_count) == 0) { + unregister_mem_sect_under_nodes(mem); + mem_remove_simple_file(mem, start_phys_index); + mem_remove_simple_file(mem, end_phys_index); + mem_remove_simple_file(mem, state); + mem_remove_simple_file(mem, phys_device); + mem_remove_simple_file(mem, removable); + unregister_memory(mem, section); + } return 0; } Index: linux-2.6/include/linux/memory.h =================================================================== --- linux-2.6.orig/include/linux/memory.h 2010-07-19 20:43:49.000000000 -0500 +++ linux-2.6/include/linux/memory.h 2010-07-19 20:44:01.000000000 -0500 @@ -19,11 +19,13 @@ #include #include #include +#include struct memory_block { unsigned long start_phys_index; unsigned long end_phys_index; unsigned long state; + atomic_t section_count; /* * This serializes all state change requests. It isn't * held during creation because the control files are From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757950Ab0GTDyE (ORCPT ); Mon, 19 Jul 2010 23:54:04 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:45796 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757245Ab0GTDyB (ORCPT ); Mon, 19 Jul 2010 23:54:01 -0400 Message-ID: <4C451DD6.3080005@austin.ibm.com> Date: Mon, 19 Jul 2010 22:53:58 -0500 From: Nathan Fontenot User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.10) Gecko/20100527 Thunderbird/3.0.5 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@ozlabs.org CC: KAMEZAWA Hiroyuki , greg@kroah.com Subject: [PATCH 3/8] v3 Add section count to memory_block References: <4C451BF5.50304@austin.ibm.com> In-Reply-To: <4C451BF5.50304@austin.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a section count property to the memory_block struct to track the number of memory sections that have been added/removed from a emory block. Signed-off-by: Nathan Fontenot --- drivers/base/memory.c | 19 ++++++++++++------- include/linux/memory.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) Index: linux-2.6/drivers/base/memory.c =================================================================== --- linux-2.6.orig/drivers/base/memory.c 2010-07-19 20:43:49.000000000 -0500 +++ linux-2.6/drivers/base/memory.c 2010-07-19 20:44:01.000000000 -0500 @@ -487,6 +487,7 @@ static int add_memory_block(int nid, str mem->start_phys_index = __section_nr(section); mem->state = state; + atomic_inc(&mem->section_count); mutex_init(&mem->state_mutex); start_pfn = section_nr_to_pfn(mem->start_phys_index); mem->phys_device = arch_get_memory_phys_device(start_pfn); @@ -516,13 +517,17 @@ int remove_memory_block(unsigned long no struct memory_block *mem; mem = find_memory_block(section); - unregister_mem_sect_under_nodes(mem); - mem_remove_simple_file(mem, start_phys_index); - mem_remove_simple_file(mem, end_phys_index); - mem_remove_simple_file(mem, state); - mem_remove_simple_file(mem, phys_device); - mem_remove_simple_file(mem, removable); - unregister_memory(mem, section); + atomic_dec(&mem->section_count); + + if (atomic_read(&mem->section_count) == 0) { + unregister_mem_sect_under_nodes(mem); + mem_remove_simple_file(mem, start_phys_index); + mem_remove_simple_file(mem, end_phys_index); + mem_remove_simple_file(mem, state); + mem_remove_simple_file(mem, phys_device); + mem_remove_simple_file(mem, removable); + unregister_memory(mem, section); + } return 0; } Index: linux-2.6/include/linux/memory.h =================================================================== --- linux-2.6.orig/include/linux/memory.h 2010-07-19 20:43:49.000000000 -0500 +++ linux-2.6/include/linux/memory.h 2010-07-19 20:44:01.000000000 -0500 @@ -19,11 +19,13 @@ #include #include #include +#include struct memory_block { unsigned long start_phys_index; unsigned long end_phys_index; unsigned long state; + atomic_t section_count; /* * This serializes all state change requests. It isn't * held during creation because the control files are From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail191.messagelabs.com (mail191.messagelabs.com [216.82.242.19]) by kanga.kvack.org (Postfix) with ESMTP id 3C09960080B for ; Mon, 19 Jul 2010 23:54:02 -0400 (EDT) Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id o6K3nPhG019534 for ; Mon, 19 Jul 2010 21:49:25 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6K3s0VF142430 for ; Mon, 19 Jul 2010 21:54:00 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o6K3rx3I024402 for ; Mon, 19 Jul 2010 21:54:00 -0600 Message-ID: <4C451DD6.3080005@austin.ibm.com> Date: Mon, 19 Jul 2010 22:53:58 -0500 From: Nathan Fontenot MIME-Version: 1.0 Subject: [PATCH 3/8] v3 Add section count to memory_block References: <4C451BF5.50304@austin.ibm.com> In-Reply-To: <4C451BF5.50304@austin.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@ozlabs.org Cc: KAMEZAWA Hiroyuki , greg@kroah.com List-ID: Add a section count property to the memory_block struct to track the number of memory sections that have been added/removed from a emory block. Signed-off-by: Nathan Fontenot --- drivers/base/memory.c | 19 ++++++++++++------- include/linux/memory.h | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) Index: linux-2.6/drivers/base/memory.c =================================================================== --- linux-2.6.orig/drivers/base/memory.c 2010-07-19 20:43:49.000000000 -0500 +++ linux-2.6/drivers/base/memory.c 2010-07-19 20:44:01.000000000 -0500 @@ -487,6 +487,7 @@ static int add_memory_block(int nid, str mem->start_phys_index = __section_nr(section); mem->state = state; + atomic_inc(&mem->section_count); mutex_init(&mem->state_mutex); start_pfn = section_nr_to_pfn(mem->start_phys_index); mem->phys_device = arch_get_memory_phys_device(start_pfn); @@ -516,13 +517,17 @@ int remove_memory_block(unsigned long no struct memory_block *mem; mem = find_memory_block(section); - unregister_mem_sect_under_nodes(mem); - mem_remove_simple_file(mem, start_phys_index); - mem_remove_simple_file(mem, end_phys_index); - mem_remove_simple_file(mem, state); - mem_remove_simple_file(mem, phys_device); - mem_remove_simple_file(mem, removable); - unregister_memory(mem, section); + atomic_dec(&mem->section_count); + + if (atomic_read(&mem->section_count) == 0) { + unregister_mem_sect_under_nodes(mem); + mem_remove_simple_file(mem, start_phys_index); + mem_remove_simple_file(mem, end_phys_index); + mem_remove_simple_file(mem, state); + mem_remove_simple_file(mem, phys_device); + mem_remove_simple_file(mem, removable); + unregister_memory(mem, section); + } return 0; } Index: linux-2.6/include/linux/memory.h =================================================================== --- linux-2.6.orig/include/linux/memory.h 2010-07-19 20:43:49.000000000 -0500 +++ linux-2.6/include/linux/memory.h 2010-07-19 20:44:01.000000000 -0500 @@ -19,11 +19,13 @@ #include #include #include +#include struct memory_block { unsigned long start_phys_index; unsigned long end_phys_index; unsigned long state; + atomic_t section_count; /* * This serializes all state change requests. It isn't * held during creation because the control files are -- 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