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: [PATCH 2/8] v3 Add new phys_index properties
Date: Mon, 19 Jul 2010 22:52:50 -0500	[thread overview]
Message-ID: <4C451D92.6020406@austin.ibm.com> (raw)
In-Reply-To: <4C451BF5.50304@austin.ibm.com>

Update the 'phys_index' properties of a memory block to include a
'start_phys_index' which is the same as the current 'phys_index' property.
This also adds an 'end_phys_index' property to indicate the id of the
last section in th memory block.

Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
---
 drivers/base/memory.c  |   32 ++++++++++++++++++++++----------
 include/linux/memory.h |    3 ++-
 2 files changed, 24 insertions(+), 11 deletions(-)

Index: linux-2.6/drivers/base/memory.c
===================================================================
--- linux-2.6.orig/drivers/base/memory.c	2010-07-19 20:42:11.000000000 -0500
+++ linux-2.6/drivers/base/memory.c	2010-07-19 20:43:49.000000000 -0500
@@ -109,12 +109,20 @@ unregister_memory(struct memory_block *m
  * uses.
  */
 
-static ssize_t show_mem_phys_index(struct sys_device *dev,
+static ssize_t show_mem_start_phys_index(struct sys_device *dev,
 			struct sysdev_attribute *attr, char *buf)
 {
 	struct memory_block *mem =
 		container_of(dev, struct memory_block, sysdev);
-	return sprintf(buf, "%08lx\n", mem->phys_index);
+	return sprintf(buf, "%08lx\n", mem->start_phys_index);
+}
+
+static ssize_t show_mem_end_phys_index(struct sys_device *dev,
+			struct sysdev_attribute *attr, char *buf)
+{
+	struct memory_block *mem =
+		container_of(dev, struct memory_block, sysdev);
+	return sprintf(buf, "%08lx\n", mem->end_phys_index);
 }
 
 /*
@@ -128,7 +136,7 @@ static ssize_t show_mem_removable(struct
 	struct memory_block *mem =
 		container_of(dev, struct memory_block, sysdev);
 
-	start_pfn = section_nr_to_pfn(mem->phys_index);
+	start_pfn = section_nr_to_pfn(mem->start_phys_index);
 	ret = is_mem_section_removable(start_pfn, PAGES_PER_SECTION);
 	return sprintf(buf, "%d\n", ret);
 }
@@ -191,7 +199,7 @@ memory_block_action(struct memory_block
 	int ret;
 	int old_state = mem->state;
 
-	psection = mem->phys_index;
+	psection = mem->start_phys_index;
 	first_page = pfn_to_page(psection << PFN_SECTION_SHIFT);
 
 	/*
@@ -264,7 +272,7 @@ store_mem_state(struct sys_device *dev,
 	int ret = -EINVAL;
 
 	mem = container_of(dev, struct memory_block, sysdev);
-	phys_section_nr = mem->phys_index;
+	phys_section_nr = mem->start_phys_index;
 
 	if (!present_section_nr(phys_section_nr))
 		goto out;
@@ -296,7 +304,8 @@ static ssize_t show_phys_device(struct s
 	return sprintf(buf, "%d\n", mem->phys_device);
 }
 
-static SYSDEV_ATTR(phys_index, 0444, show_mem_phys_index, NULL);
+static SYSDEV_ATTR(start_phys_index, 0444, show_mem_start_phys_index, NULL);
+static SYSDEV_ATTR(end_phys_index, 0444, show_mem_end_phys_index, NULL);
 static SYSDEV_ATTR(state, 0644, show_mem_state, store_mem_state);
 static SYSDEV_ATTR(phys_device, 0444, show_phys_device, NULL);
 static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);
@@ -476,15 +485,17 @@ static int add_memory_block(int nid, str
 	if (!mem)
 		return -ENOMEM;
 
-	mem->phys_index = __section_nr(section);
+	mem->start_phys_index = __section_nr(section);
 	mem->state = state;
 	mutex_init(&mem->state_mutex);
-	start_pfn = section_nr_to_pfn(mem->phys_index);
+	start_pfn = section_nr_to_pfn(mem->start_phys_index);
 	mem->phys_device = arch_get_memory_phys_device(start_pfn);
 
 	ret = register_memory(mem, section);
 	if (!ret)
-		ret = mem_create_simple_file(mem, phys_index);
+		ret = mem_create_simple_file(mem, start_phys_index);
+	if (!ret)
+		ret = mem_create_simple_file(mem, end_phys_index);
 	if (!ret)
 		ret = mem_create_simple_file(mem, state);
 	if (!ret)
@@ -506,7 +517,8 @@ int remove_memory_block(unsigned long no
 
 	mem = find_memory_block(section);
 	unregister_mem_sect_under_nodes(mem);
-	mem_remove_simple_file(mem, phys_index);
+	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);
Index: linux-2.6/include/linux/memory.h
===================================================================
--- linux-2.6.orig/include/linux/memory.h	2010-07-19 20:42:11.000000000 -0500
+++ linux-2.6/include/linux/memory.h	2010-07-19 20:43:49.000000000 -0500
@@ -21,7 +21,8 @@
 #include <linux/mutex.h>
 
 struct memory_block {
-	unsigned long phys_index;
+	unsigned long start_phys_index;
+	unsigned long end_phys_index;
 	unsigned long state;
 	/*
 	 * This serializes all state change requests.  It isn't

  parent reply	other threads:[~2010-07-20  3:52 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 ` Nathan Fontenot [this message]
2010-07-20  6:57   ` [PATCH 2/8] v3 Add new phys_index properties 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
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=4C451D92.6020406@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).