From: Toshi Kani <toshi.kani@hp.com>
To: rjw@sisk.pl, lenb@kernel.org, gregkh@linuxfoundation.org,
akpm@linux-foundation.org
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, bhelgaas@google.com,
isimatu.yasuaki@jp.fujitsu.com, jiang.liu@huawei.com,
wency@cn.fujitsu.com, guohanjun@huawei.com, yinghai@kernel.org,
srivatsa.bhat@linux.vnet.ibm.com, Toshi Kani <toshi.kani@hp.com>
Subject: [RFC PATCH 04/11] mm: Add memory hotplug handlers
Date: Wed, 12 Dec 2012 16:17:16 -0700 [thread overview]
Message-ID: <1355354243-18657-5-git-send-email-toshi.kani@hp.com> (raw)
In-Reply-To: <1355354243-18657-1-git-send-email-toshi.kani@hp.com>
Added memory hotplug handlers. mm_add_execute() onlines requested
memory ranges for hot-add and online operations, and mm_del_execute()
offlines them for hot-delete and offline operations. They are also
used for rollback as well.
mm_del_validate() fails a request if a requested memory range is
non-movable for delete. This check can be removed if we should
attempt to delete such range anyway (but can cause a rollback).
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
---
mm/memory_hotplug.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index e4eeaca..107a39d 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -29,6 +29,7 @@
#include <linux/suspend.h>
#include <linux/mm_inline.h>
#include <linux/firmware-map.h>
+#include <linux/hotplug.h>
#include <asm/tlbflush.h>
@@ -45,6 +46,9 @@ static void generic_online_page(struct page *page);
static online_page_callback_t online_page_callback = generic_online_page;
+static int mm_add_execute(struct hp_request *req, int rollback);
+static int mm_del_execute(struct hp_request *req, int rollback);
+
DEFINE_MUTEX(mem_hotplug_mutex);
void lock_memory_hotplug(void)
@@ -1055,3 +1059,96 @@ int remove_memory(u64 start, u64 size)
}
#endif /* CONFIG_MEMORY_HOTREMOVE */
EXPORT_SYMBOL_GPL(remove_memory);
+
+static int mm_add_execute(struct hp_request *req, int rollback)
+{
+ struct hp_device *hp_dev;
+ struct hp_memory *hp_mem;
+ int ret;
+
+ if (rollback)
+ return mm_del_execute(req, 0);
+
+ list_for_each_entry(hp_dev, &req->dev_list, list) {
+ if (hp_dev->class != HP_CLS_MEMORY)
+ continue;
+
+ hp_mem = &hp_dev->data.mem;
+
+ ret = add_memory(hp_mem->node,
+ hp_mem->start_addr, hp_mem->length);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int mm_del_validate(struct hp_request *req, int rollback)
+{
+ struct hp_device *hp_dev;
+ struct hp_memory *hp_mem;
+ unsigned long start_pfn, nr_pages;
+
+ if (rollback)
+ return 0;
+
+ list_for_each_entry(hp_dev, &req->dev_list, list) {
+ if (hp_dev->class != HP_CLS_MEMORY)
+ continue;
+
+ hp_mem = &hp_dev->data.mem;
+ start_pfn = hp_mem->start_addr >> PAGE_SHIFT;
+ nr_pages = PAGE_ALIGN(hp_mem->length) >> PAGE_SHIFT;
+
+ /*
+ * Check if this memory range is removable. This check can
+ * be removed if we should attempt to delete a non-movable
+ * range.
+ */
+ if (is_mem_section_removable(start_pfn, nr_pages)) {
+ pr_info("Memory [%#010llx-%#010llx] not removable\n",
+ hp_mem->start_addr,
+ hp_mem->start_addr + hp_mem->length-1);
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
+static int mm_del_execute(struct hp_request *req, int rollback)
+{
+ struct hp_device *hp_dev;
+ struct hp_memory *hp_mem;
+ int ret;
+
+ if (rollback)
+ return mm_add_execute(req, 0);
+
+ list_for_each_entry(hp_dev, &req->dev_list, list) {
+ if (hp_dev->class != HP_CLS_MEMORY)
+ continue;
+
+ hp_mem = &hp_dev->data.mem;
+
+ ret = remove_memory(hp_mem->start_addr, hp_mem->length);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int __init mm_hp_init(void)
+{
+ hp_register_handler(HP_ADD_EXECUTE, mm_add_execute,
+ HP_MEM_ADD_EXECUTE_ORDER);
+ hp_register_handler(HP_DEL_VALIDATE, mm_del_validate,
+ HP_MEM_DEL_VALIDATE_ORDER);
+ hp_register_handler(HP_DEL_EXECUTE, mm_del_execute,
+ HP_MEM_DEL_EXECUTE_ORDER);
+
+ return 0;
+}
+module_init(mm_hp_init);
--
1.7.11.7
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-12-12 23:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 23:17 [RFC PATCH 00/11] Hot-plug and Online/Offline framework Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 01/11] Add hotplug.h for hotplug framework Toshi Kani
2012-12-12 23:53 ` Greg KH
2012-12-13 3:56 ` Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 02/11] drivers/base: Add hotplug framework code Toshi Kani
2012-12-12 23:54 ` Greg KH
2012-12-13 4:02 ` Toshi Kani
2012-12-13 4:24 ` Greg KH
2012-12-13 16:30 ` Toshi Kani
2012-12-13 18:24 ` Greg KH
2012-12-14 1:59 ` Toshi Kani
2012-12-12 23:55 ` Greg KH
2012-12-13 3:58 ` Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 03/11] cpu: Add cpu hotplug handlers Toshi Kani
2012-12-12 23:17 ` Toshi Kani [this message]
2012-12-12 23:17 ` [RFC PATCH 05/11] ACPI: Add ACPI bus " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 06/11] ACPI: Add ACPI resource hotplug handler Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 07/11] ACPI: Update processor driver for hotplug framework Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 08/11] ACPI: Update memory " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 09/11] ACPI: Update container " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 10/11] cpu: Update sysfs cpu/online " Toshi Kani
2012-12-12 23:17 ` [RFC PATCH 11/11] ACPI: Update sysfs eject " Toshi Kani
2012-12-12 23:56 ` [RFC PATCH 00/11] Hot-plug and Online/Offline framework Greg KH
2012-12-13 0:39 ` Toshi Kani
2012-12-13 0:55 ` Greg KH
2012-12-13 3:37 ` Toshi Kani
2012-12-13 4:16 ` Greg KH
2012-12-13 16:03 ` Toshi Kani
2012-12-13 18:30 ` Greg KH
2012-12-14 1:51 ` Toshi Kani
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=1355354243-18657-5-git-send-email-toshi.kani@hp.com \
--to=toshi.kani@hp.com \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=guohanjun@huawei.com \
--cc=isimatu.yasuaki@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rjw@sisk.pl \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=wency@cn.fujitsu.com \
--cc=yinghai@kernel.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).