| Message ID | 5009046C.106@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi Wen, 2012/07/20 16:10, Wen Congyang wrote: > We should remove the following things when removing the memory device: > 1. memmap and related sysfs files > 2. iomem_resource > 3. mem_section and related sysfs files > 4. node and related sysfs files > > The function remove_memory() can do this. So call it after the memory device > is offlined. > > 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: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> > --- I have no comment. Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Thanks, Yasuaki Ishimatsu > drivers/acpi/acpi_memhotplug.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c > index 712e767..58e4e63 100644 > --- a/drivers/acpi/acpi_memhotplug.c > +++ b/drivers/acpi/acpi_memhotplug.c > @@ -315,7 +315,7 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) > { > int result; > struct acpi_memory_info *info, *n; > - > + int node = mem_device->nid; > > /* > * Ask the VM to offline this memory range. > @@ -330,6 +330,11 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) > if (result) > return result; > } > + > + result = remove_memory(node, info->start_addr, > + info->length); > + if (result) > + return result; > } > list_del(&info->list); > kfree(info); >
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 712e767..58e4e63 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -315,7 +315,7 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) { int result; struct acpi_memory_info *info, *n; - + int node = mem_device->nid; /* * Ask the VM to offline this memory range. @@ -330,6 +330,11 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device) if (result) return result; } + + result = remove_memory(node, info->start_addr, + info->length); + if (result) + return result; } list_del(&info->list); kfree(info);
We should remove the following things when removing the memory device: 1. memmap and related sysfs files 2. iomem_resource 3. mem_section and related sysfs files 4. node and related sysfs files The function remove_memory() can do this. So call it after the memory device is offlined. 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: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> --- drivers/acpi/acpi_memhotplug.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)