linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nathan Fontenot <nfont@austin.ibm.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	linuxppc-dev@ozlabs.org
Cc: greg@kroah.com, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Subject: Re: [PATCH 3/8] v3 Add section count to memory_block
Date: Tue, 20 Jul 2010 08:26:39 -0500	[thread overview]
Message-ID: <4C45A40F.3020703@austin.ibm.com> (raw)
In-Reply-To: <4C451DD6.3080005@austin.ibm.com>

Add a section count property to the memory_block struct to track the number
of memory sections that have been added/removed from a memory block.  Updated
to use atomic_dec_and_test().

Signed-off-by: Nathan Fontenot <nfont@asutin.ibm.com>
---
 drivers/base/memory.c  |   18 +++++++++++-------
 include/linux/memory.h |    2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

Index: linux-2.6/drivers/base/memory.c
===================================================================
--- linux-2.6.orig/drivers/base/memory.c	2010-07-20 06:38:21.000000000 -0500
+++ linux-2.6/drivers/base/memory.c	2010-07-20 06:43:29.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,16 @@ 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, 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);
+
+	if (atomic_dec_and_test(&mem->section_count)) {
+		unregister_mem_sect_under_nodes(mem);
+		mem_remove_simple_file(mem, 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-20 06:35:38.000000000 -0500
+++ linux-2.6/include/linux/memory.h	2010-07-20 06:38:59.000000000 -0500
@@ -19,11 +19,13 @@
 #include <linux/node.h>
 #include <linux/compiler.h>
 #include <linux/mutex.h>
+#include <asm/atomic.h>
 
 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

  parent reply	other threads:[~2010-07-20 13:26 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-20  3:45 [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections Nathan Fontenot
2010-07-20  3:51 ` [PATCH 1/8] v3 Move the find_memory_block() routine up Nathan Fontenot
2010-07-20  6:55   ` KAMEZAWA Hiroyuki
2010-07-20  3:52 ` [PATCH 2/8] v3 Add new phys_index properties Nathan Fontenot
2010-07-20  6:57   ` KAMEZAWA Hiroyuki
2010-07-20 13:24   ` Nathan Fontenot
2010-07-20 19:10     ` Dave Hansen
2010-07-20  3:53 ` [PATCH 3/8] v3 Add section count to memory_block Nathan Fontenot
2010-07-20  7:01   ` KAMEZAWA Hiroyuki
2010-07-20 13:26   ` Nathan Fontenot [this message]
2010-07-20  3:55 ` [PATCH 4/8] v3 Allow memory_block to span multiple memory sections Nathan Fontenot
2010-07-20  7:15   ` KAMEZAWA Hiroyuki
2010-07-20 13:28   ` Nathan Fontenot
2010-07-20 19:18   ` Dave Hansen
2010-07-24  3:09     ` Nathan Fontenot
2010-07-27  2:36       ` Dave Hansen
2010-07-26 19:10     ` Nathan Fontenot
2010-07-20 19:21   ` Dave Hansen
2010-07-20  3:56 ` [PATCH 5/8] v3 Update the find_memory_block declaration Nathan Fontenot
2010-07-20  7:16   ` KAMEZAWA Hiroyuki
2010-07-20  3:57 ` [PATCH 6/8] v3 Update the node sysfs code Nathan Fontenot
2010-07-20  7:17   ` KAMEZAWA Hiroyuki
2010-07-28 13:50   ` Brian King
2010-07-20  3:59 ` [PATCH 7/8] v3 Define memory_block_size_bytes() for ppc/pseries Nathan Fontenot
2010-07-21 20:27   ` Brian King
2010-07-20  3:59 ` [PATCH 8/8] v3 Update memory-hotplug documentation Nathan Fontenot
2010-07-20 19:23   ` Dave Hansen
2010-07-31  5:36 ` [PATCH 0/8] v3 De-couple sysfs memory directories from memory sections Benjamin Herrenschmidt
2010-07-31 19:55   ` Greg KH
2010-08-01  0:27     ` Benjamin Herrenschmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C45A40F.3020703@austin.ibm.com \
    --to=nfont@austin.ibm.com \
    --cc=greg@kroah.com \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).