linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: wency@cn.fujitsu.com
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org,
	linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
	linux-ia64@vger.kernel.org, cmetcalf@tilera.com
Cc: len.brown@intel.com, Wen Congyang <wency@cn.fujitsu.com>,
	isimatu.yasuaki@jp.fujitsu.com, paulus@samba.org,
	minchan.kim@gmail.com, kosaki.motohiro@jp.fujitsu.com,
	rientjes@google.com, cl@linux.com, akpm@linux-foundation.org,
	liuj97@gmail.com
Subject: [RFC PATCH V6 10/19] memory-hotplug: add memory_block_release
Date: Fri, 3 Aug 2012 15:49:12 +0800	[thread overview]
Message-ID: <1343980161-14254-11-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1343980161-14254-1-git-send-email-wency@cn.fujitsu.com>

From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

When calling remove_memory_block(), the function shows following message at
device_release().

Device 'memory528' does not have a release() function, it is broken and must
be fixed.

remove_memory_block() calls kfree(mem). I think it shouled be called from
device_release(). So the patch implements memory_block_release()

CC: David Rientjes <rientjes@google.com>
CC: Jiang Liu <liuj97@gmail.com>
CC: Len Brown <len.brown@intel.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Christoph Lameter <cl@linux.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
 drivers/base/memory.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 038be73..1cd3ef3 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -109,6 +109,15 @@ bool is_memblk_offline(unsigned long start, unsigned long size)
 }
 EXPORT_SYMBOL(is_memblk_offline);
 
+#define to_memory_block(device) container_of(device, struct memory_block, dev)
+
+static void release_memory_block(struct device *dev)
+{
+	struct memory_block *mem = to_memory_block(dev);
+
+	kfree(mem);
+}
+
 /*
  * register_memory - Setup a sysfs device for a memory block
  */
@@ -119,6 +128,7 @@ int register_memory(struct memory_block *memory)
 
 	memory->dev.bus = &memory_subsys;
 	memory->dev.id = memory->start_section_nr / sections_per_block;
+	memory->dev.release = release_memory_block;
 
 	error = device_register(&memory->dev);
 	return error;
@@ -674,7 +684,6 @@ int remove_memory_block(unsigned long node_id, struct mem_section *section,
 		mem_remove_simple_file(mem, phys_device);
 		mem_remove_simple_file(mem, removable);
 		unregister_memory(mem);
-		kfree(mem);
 	} else
 		kobject_put(&mem->dev.kobj);
 
-- 
1.7.1

  parent reply	other threads:[~2012-08-03  8:00 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-03  7:49 [RFC PATCH V6 00/19] memory-hotplug: hot-remove physical memory wency
2012-08-03  7:49 ` [RFC PATCH V6 01/19] memory-hotplug: rename remove_memory() to offline_memory()/offline_pages() wency
2012-08-03  7:49 ` [RFC PATCH V6 02/19] memory-hotplug: implement offline_memory() wency
2012-08-03  7:49 ` [RFC PATCH V6 03/19] memory-hotplug: store the node id in acpi_memory_device wency
2012-08-03  7:49 ` [RFC PATCH V6 04/19] memory-hotplug: offline and remove memory when removing the memory device wency
2012-08-09 15:41   ` Vasilis Liaskovitis
2012-08-03  7:49 ` [RFC PATCH V6 05/19] memory-hotplug: check whether memory is present or not wency
2012-08-03  7:49 ` [RFC PATCH V6 06/19] memory-hotplug: export the function acpi_bus_remove() wency
2012-08-03  7:49 ` [RFC PATCH V6 07/19] memory-hotplug: call acpi_bus_remove() to remove memory device wency
2012-08-03  7:49 ` [RFC PATCH V6 08/19] memory-hotplug: remove /sys/firmware/memmap/X sysfs wency
2012-08-03  7:49 ` [RFC PATCH V6 09/19] memory-hotplug: does not release memory region in PAGES_PER_SECTION chunks wency
2012-08-03  7:49 ` wency [this message]
2012-09-06  7:06   ` [RFC PATCH V6 10/19] memory-hotplug: add memory_block_release wujianguo
2012-08-03  7:49 ` [RFC PATCH V6 11/19] memory-hotplug: remove_memory calls __remove_pages wency
2012-08-03  7:49 ` [RFC PATCH V6 12/19] memory-hotplug: introduce new function arch_remove_memory() wency
2012-08-03  7:49 ` [RFC PATCH V6 13/19] memory-hotplug: check page type in get_page_bootmem wency
2012-08-07  5:31   ` Wen Congyang
2012-08-03  7:49 ` [RFC PATCH V6 14/19] memory-hotplug: move register_page_bootmem_info_node and put_page_bootmem for sparse-vmemmap wency
2012-08-03  7:49 ` [RFC PATCH V6 15/19] memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap wency
2012-08-07  3:48   ` Wen Congyang
2012-08-03  7:49 ` [RFC PATCH V6 16/19] memory-hotplug: free memmap " wency
2012-08-07  5:17   ` Wen Congyang
2012-08-03  7:49 ` [RFC PATCH V6 17/19] memory_hotplug: clear zone when the memory is removed wency
2012-08-03  7:49 ` [RFC PATCH V6 18/19] memory-hotplug: add node_device_release wency
2012-08-03  7:49 ` [RFC PATCH V6 19/19] memory-hotplug: remove sysfs file of node wency

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=1343980161-14254-11-git-send-email-wency@cn.fujitsu.com \
    --to=wency@cn.fujitsu.com \
    --cc=akpm@linux-foundation.org \
    --cc=cl@linux.com \
    --cc=cmetcalf@tilera.com \
    --cc=isimatu.yasuaki@jp.fujitsu.com \
    --cc=kosaki.motohiro@jp.fujitsu.com \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=liuj97@gmail.com \
    --cc=minchan.kim@gmail.com \
    --cc=paulus@samba.org \
    --cc=rientjes@google.com \
    /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).