From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Toshi Kani <toshi.kani@hp.com>, ACPI Devel Maling List <linux-acpi@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>, isimatu.yasuaki@jp.fujitsu.com, vasilis.liaskovitis@profitbricks.com, Len Brown <lenb@kernel.org>, linux-mm@kvack.org Subject: [PATCH 2/2 v2, RFC] Driver core: Introduce offline/online callbacks for memory blocks Date: Sat, 04 May 2013 13:21:16 +0200 [thread overview] Message-ID: <19540491.PRsM4lKIYM@vostro.rjw.lan> (raw) In-Reply-To: <2376818.CRj1BTLk0Y@vostro.rjw.lan> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Introduce .offline() and .online() callbacks for memory_subsys that will allow the generic device_offline() and device_online() to be used with device objects representing memory blocks. That, in turn, allows the ACPI subsystem to use device_offline() to put removable memory blocks offline, if possible, before removing memory modules holding them. The 'online' sysfs attribute of memory block devices will attempt to put them offline if 0 is written to it and will attempt to apply the previously used online type when onlining them (i.e. when 1 is written to it). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> --- drivers/base/memory.c | 105 +++++++++++++++++++++++++++++++++++++------------ include/linux/memory.h | 1 2 files changed, 81 insertions(+), 25 deletions(-) Index: linux-pm/drivers/base/memory.c =================================================================== --- linux-pm.orig/drivers/base/memory.c +++ linux-pm/drivers/base/memory.c @@ -37,9 +37,14 @@ static inline int base_memory_block_id(i return section_nr / sections_per_block; } +static int memory_subsys_online(struct device *dev); +static int memory_subsys_offline(struct device *dev); + static struct bus_type memory_subsys = { .name = MEMORY_CLASS_NAME, .dev_name = MEMORY_CLASS_NAME, + .online = memory_subsys_online, + .offline = memory_subsys_offline, }; static BLOCKING_NOTIFIER_HEAD(memory_chain); @@ -278,33 +283,64 @@ static int __memory_block_change_state(s { int ret = 0; - if (mem->state != from_state_req) { - ret = -EINVAL; - goto out; - } + if (mem->state != from_state_req) + return -EINVAL; if (to_state == MEM_OFFLINE) mem->state = MEM_GOING_OFFLINE; ret = memory_block_action(mem->start_section_nr, to_state, online_type); - if (ret) { mem->state = from_state_req; - goto out; + } else { + mem->state = to_state; + if (to_state == MEM_ONLINE) + mem->last_online = online_type; } + return ret; +} - mem->state = to_state; - switch (mem->state) { - case MEM_OFFLINE: - kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE); - break; - case MEM_ONLINE: - kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE); - break; - default: - break; +static int memory_subsys_online(struct device *dev) +{ + struct memory_block *mem = container_of(dev, struct memory_block, dev); + int ret; + + mutex_lock(&mem->state_mutex); + ret = __memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, + mem->last_online); + mutex_unlock(&mem->state_mutex); + return ret; +} + +static int memory_subsys_offline(struct device *dev) +{ + struct memory_block *mem = container_of(dev, struct memory_block, dev); + int ret; + + mutex_lock(&mem->state_mutex); + ret = __memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + mutex_unlock(&mem->state_mutex); + return ret; +} + +static int __memory_block_change_state_uevent(struct memory_block *mem, + unsigned long to_state, unsigned long from_state_req, + int online_type) +{ + int ret = __memory_block_change_state(mem, to_state, from_state_req, + online_type); + if (!ret) { + switch (mem->state) { + case MEM_OFFLINE: + kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE); + break; + case MEM_ONLINE: + kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE); + break; + default: + break; + } } -out: return ret; } @@ -315,8 +351,8 @@ static int memory_block_change_state(str int ret; mutex_lock(&mem->state_mutex); - ret = __memory_block_change_state(mem, to_state, from_state_req, - online_type); + ret = __memory_block_change_state_uevent(mem, to_state, from_state_req, + online_type); mutex_unlock(&mem->state_mutex); return ret; @@ -326,22 +362,34 @@ store_mem_state(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct memory_block *mem; + bool offline; int ret = -EINVAL; mem = container_of(dev, struct memory_block, dev); - if (!strncmp(buf, "online_kernel", min_t(int, count, 13))) + lock_device_hotplug(); + + if (!strncmp(buf, "online_kernel", min_t(int, count, 13))) { + offline = false; ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_KERNEL); - else if (!strncmp(buf, "online_movable", min_t(int, count, 14))) + } else if (!strncmp(buf, "online_movable", min_t(int, count, 14))) { + offline = false; ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_MOVABLE); - else if (!strncmp(buf, "online", min_t(int, count, 6))) + } else if (!strncmp(buf, "online", min_t(int, count, 6))) { + offline = false; ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_KEEP); - else if(!strncmp(buf, "offline", min_t(int, count, 7))) + } else if(!strncmp(buf, "offline", min_t(int, count, 7))) { + offline = true; ret = memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + } + if (!ret) + dev->offline = offline; + + unlock_device_hotplug(); if (ret) return ret; @@ -563,6 +611,7 @@ static int init_memory_block(struct memo base_memory_block_id(scn_nr) * sections_per_block; mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; mem->state = state; + mem->last_online = ONLINE_KEEP; mem->section_count++; mutex_init(&mem->state_mutex); start_pfn = section_nr_to_pfn(mem->start_section_nr); @@ -686,10 +735,16 @@ int offline_memory_block(struct memory_b { int ret = 0; + lock_device_hotplug(); mutex_lock(&mem->state_mutex); - if (mem->state != MEM_OFFLINE) - ret = __memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + if (mem->state != MEM_OFFLINE) { + ret = __memory_block_change_state_uevent(mem, MEM_OFFLINE, + MEM_ONLINE, -1); + if (!ret) + mem->dev.offline = true; + } mutex_unlock(&mem->state_mutex); + unlock_device_hotplug(); return ret; } Index: linux-pm/include/linux/memory.h =================================================================== --- linux-pm.orig/include/linux/memory.h +++ linux-pm/include/linux/memory.h @@ -26,6 +26,7 @@ struct memory_block { unsigned long start_section_nr; unsigned long end_section_nr; unsigned long state; + int last_online; int section_count; /* -- 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>
WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@sisk.pl> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Toshi Kani <toshi.kani@hp.com>, ACPI Devel Maling List <linux-acpi@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>, isimatu.yasuaki@jp.fujitsu.com, vasilis.liaskovitis@profitbricks.com, Len Brown <lenb@kernel.org>, linux-mm@kvack.org Subject: [PATCH 2/2 v2, RFC] Driver core: Introduce offline/online callbacks for memory blocks Date: Sat, 04 May 2013 13:21:16 +0200 [thread overview] Message-ID: <19540491.PRsM4lKIYM@vostro.rjw.lan> (raw) In-Reply-To: <2376818.CRj1BTLk0Y@vostro.rjw.lan> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Introduce .offline() and .online() callbacks for memory_subsys that will allow the generic device_offline() and device_online() to be used with device objects representing memory blocks. That, in turn, allows the ACPI subsystem to use device_offline() to put removable memory blocks offline, if possible, before removing memory modules holding them. The 'online' sysfs attribute of memory block devices will attempt to put them offline if 0 is written to it and will attempt to apply the previously used online type when onlining them (i.e. when 1 is written to it). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> --- drivers/base/memory.c | 105 +++++++++++++++++++++++++++++++++++++------------ include/linux/memory.h | 1 2 files changed, 81 insertions(+), 25 deletions(-) Index: linux-pm/drivers/base/memory.c =================================================================== --- linux-pm.orig/drivers/base/memory.c +++ linux-pm/drivers/base/memory.c @@ -37,9 +37,14 @@ static inline int base_memory_block_id(i return section_nr / sections_per_block; } +static int memory_subsys_online(struct device *dev); +static int memory_subsys_offline(struct device *dev); + static struct bus_type memory_subsys = { .name = MEMORY_CLASS_NAME, .dev_name = MEMORY_CLASS_NAME, + .online = memory_subsys_online, + .offline = memory_subsys_offline, }; static BLOCKING_NOTIFIER_HEAD(memory_chain); @@ -278,33 +283,64 @@ static int __memory_block_change_state(s { int ret = 0; - if (mem->state != from_state_req) { - ret = -EINVAL; - goto out; - } + if (mem->state != from_state_req) + return -EINVAL; if (to_state == MEM_OFFLINE) mem->state = MEM_GOING_OFFLINE; ret = memory_block_action(mem->start_section_nr, to_state, online_type); - if (ret) { mem->state = from_state_req; - goto out; + } else { + mem->state = to_state; + if (to_state == MEM_ONLINE) + mem->last_online = online_type; } + return ret; +} - mem->state = to_state; - switch (mem->state) { - case MEM_OFFLINE: - kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE); - break; - case MEM_ONLINE: - kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE); - break; - default: - break; +static int memory_subsys_online(struct device *dev) +{ + struct memory_block *mem = container_of(dev, struct memory_block, dev); + int ret; + + mutex_lock(&mem->state_mutex); + ret = __memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, + mem->last_online); + mutex_unlock(&mem->state_mutex); + return ret; +} + +static int memory_subsys_offline(struct device *dev) +{ + struct memory_block *mem = container_of(dev, struct memory_block, dev); + int ret; + + mutex_lock(&mem->state_mutex); + ret = __memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + mutex_unlock(&mem->state_mutex); + return ret; +} + +static int __memory_block_change_state_uevent(struct memory_block *mem, + unsigned long to_state, unsigned long from_state_req, + int online_type) +{ + int ret = __memory_block_change_state(mem, to_state, from_state_req, + online_type); + if (!ret) { + switch (mem->state) { + case MEM_OFFLINE: + kobject_uevent(&mem->dev.kobj, KOBJ_OFFLINE); + break; + case MEM_ONLINE: + kobject_uevent(&mem->dev.kobj, KOBJ_ONLINE); + break; + default: + break; + } } -out: return ret; } @@ -315,8 +351,8 @@ static int memory_block_change_state(str int ret; mutex_lock(&mem->state_mutex); - ret = __memory_block_change_state(mem, to_state, from_state_req, - online_type); + ret = __memory_block_change_state_uevent(mem, to_state, from_state_req, + online_type); mutex_unlock(&mem->state_mutex); return ret; @@ -326,22 +362,34 @@ store_mem_state(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct memory_block *mem; + bool offline; int ret = -EINVAL; mem = container_of(dev, struct memory_block, dev); - if (!strncmp(buf, "online_kernel", min_t(int, count, 13))) + lock_device_hotplug(); + + if (!strncmp(buf, "online_kernel", min_t(int, count, 13))) { + offline = false; ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_KERNEL); - else if (!strncmp(buf, "online_movable", min_t(int, count, 14))) + } else if (!strncmp(buf, "online_movable", min_t(int, count, 14))) { + offline = false; ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_MOVABLE); - else if (!strncmp(buf, "online", min_t(int, count, 6))) + } else if (!strncmp(buf, "online", min_t(int, count, 6))) { + offline = false; ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_KEEP); - else if(!strncmp(buf, "offline", min_t(int, count, 7))) + } else if(!strncmp(buf, "offline", min_t(int, count, 7))) { + offline = true; ret = memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + } + if (!ret) + dev->offline = offline; + + unlock_device_hotplug(); if (ret) return ret; @@ -563,6 +611,7 @@ static int init_memory_block(struct memo base_memory_block_id(scn_nr) * sections_per_block; mem->end_section_nr = mem->start_section_nr + sections_per_block - 1; mem->state = state; + mem->last_online = ONLINE_KEEP; mem->section_count++; mutex_init(&mem->state_mutex); start_pfn = section_nr_to_pfn(mem->start_section_nr); @@ -686,10 +735,16 @@ int offline_memory_block(struct memory_b { int ret = 0; + lock_device_hotplug(); mutex_lock(&mem->state_mutex); - if (mem->state != MEM_OFFLINE) - ret = __memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + if (mem->state != MEM_OFFLINE) { + ret = __memory_block_change_state_uevent(mem, MEM_OFFLINE, + MEM_ONLINE, -1); + if (!ret) + mem->dev.offline = true; + } mutex_unlock(&mem->state_mutex); + unlock_device_hotplug(); return ret; } Index: linux-pm/include/linux/memory.h =================================================================== --- linux-pm.orig/include/linux/memory.h +++ linux-pm/include/linux/memory.h @@ -26,6 +26,7 @@ struct memory_block { unsigned long start_section_nr; unsigned long end_section_nr; unsigned long state; + int last_online; int section_count; /*
next prev parent reply other threads:[~2013-05-04 11:21 UTC|newest] Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-04-29 12:23 [PATCH 0/3 RFC] Driver core / ACPI: Add offline/online for graceful hot-removal of devices Rafael J. Wysocki 2013-04-29 12:26 ` [PATCH 1/3 RFC] Driver core: Add offline/online device operations Rafael J. Wysocki 2013-04-29 23:10 ` Greg Kroah-Hartman 2013-04-30 11:59 ` Rafael J. Wysocki 2013-04-30 15:32 ` Greg Kroah-Hartman 2013-04-30 20:05 ` Rafael J. Wysocki 2013-04-30 23:38 ` Toshi Kani 2013-05-02 0:58 ` Rafael J. Wysocki 2013-05-02 23:29 ` Toshi Kani 2013-05-03 11:48 ` Rafael J. Wysocki 2013-04-29 12:28 ` [PATCH 2/3 RFC] Driver core: Use generic offline/online for CPU offline/online Rafael J. Wysocki 2013-04-29 23:11 ` Greg Kroah-Hartman 2013-04-30 12:01 ` Rafael J. Wysocki 2013-04-30 15:27 ` Greg Kroah-Hartman 2013-04-30 20:06 ` Rafael J. Wysocki 2013-04-30 23:42 ` Toshi Kani 2013-05-01 14:49 ` Rafael J. Wysocki 2013-05-01 20:07 ` Toshi Kani 2013-05-02 0:26 ` Rafael J. Wysocki 2013-04-29 12:29 ` [PATCH 3/3 RFC] ACPI / hotplug: Use device offline/online for graceful hot-removal Rafael J. Wysocki 2013-04-30 23:49 ` Toshi Kani 2013-05-01 15:05 ` Rafael J. Wysocki 2013-05-01 20:20 ` Toshi Kani 2013-05-02 0:53 ` Rafael J. Wysocki 2013-05-02 12:26 ` [PATCH 0/4] Driver core / ACPI: Add offline/online for graceful hot-removal of devices Rafael J. Wysocki 2013-05-02 12:27 ` [PATCH 1/4] Driver core: Add offline/online device operations Rafael J. Wysocki 2013-05-02 13:57 ` Greg Kroah-Hartman 2013-05-02 23:11 ` Toshi Kani 2013-05-02 23:36 ` Rafael J. Wysocki 2013-05-02 23:23 ` Toshi Kani 2013-05-02 12:28 ` [PATCH 2/4] Driver core: Use generic offline/online for CPU offline/online Rafael J. Wysocki 2013-05-02 13:57 ` Greg Kroah-Hartman 2013-05-02 12:29 ` [PATCH 3/4] ACPI / hotplug: Use device offline/online for graceful hot-removal Rafael J. Wysocki 2013-05-02 12:31 ` [PATCH 4/4] ACPI / processor: Use common hotplug infrastructure Rafael J. Wysocki 2013-05-02 13:59 ` Greg Kroah-Hartman 2013-05-02 23:20 ` Toshi Kani 2013-05-03 12:05 ` Rafael J. Wysocki 2013-05-03 12:21 ` Rafael J. Wysocki 2013-05-03 18:27 ` Toshi Kani 2013-05-03 19:31 ` Rafael J. Wysocki 2013-05-03 19:34 ` Toshi Kani 2013-05-04 1:01 ` [PATCH 0/3 RFC] Driver core: Add offline/online callbacks for memory_subsys Rafael J. Wysocki 2013-05-04 1:01 ` Rafael J. Wysocki 2013-05-04 1:03 ` [PATCH 1/3 RFC] ACPI / memhotplug: Bind removable memory blocks to ACPI device nodes Rafael J. Wysocki 2013-05-04 1:03 ` Rafael J. Wysocki 2013-05-04 1:04 ` [PATCH 2/3 RFC] Driver core: Introduce types of device "online" Rafael J. Wysocki 2013-05-04 1:04 ` Rafael J. Wysocki 2013-05-04 1:06 ` [PATCH 3/3 RFC] Driver core: Introduce offline/online callbacks for memory blocks Rafael J. Wysocki 2013-05-04 1:06 ` Rafael J. Wysocki 2013-05-04 11:11 ` [PATCH 0/2 v2, RFC] Driver core: Add offline/online callbacks for memory_subsys Rafael J. Wysocki 2013-05-04 11:11 ` Rafael J. Wysocki 2013-05-04 11:12 ` [PATCH 1/2 v2, RFC] ACPI / memhotplug: Bind removable memory blocks to ACPI device nodes Rafael J. Wysocki 2013-05-04 11:12 ` Rafael J. Wysocki 2013-05-21 6:50 ` Tang Chen 2013-05-21 6:50 ` Tang Chen 2013-05-04 11:21 ` Rafael J. Wysocki [this message] 2013-05-04 11:21 ` [PATCH 2/2 v2, RFC] Driver core: Introduce offline/online callbacks for memory blocks Rafael J. Wysocki 2013-05-06 16:28 ` Vasilis Liaskovitis 2013-05-06 16:28 ` Vasilis Liaskovitis 2013-05-07 0:59 ` Rafael J. Wysocki 2013-05-07 0:59 ` Rafael J. Wysocki 2013-05-07 10:59 ` Vasilis Liaskovitis 2013-05-07 10:59 ` Vasilis Liaskovitis 2013-05-07 12:11 ` Rafael J. Wysocki 2013-05-07 12:11 ` Rafael J. Wysocki 2013-05-07 21:03 ` Toshi Kani 2013-05-07 21:03 ` Toshi Kani 2013-05-07 22:10 ` Rafael J. Wysocki 2013-05-07 22:10 ` Rafael J. Wysocki 2013-05-07 22:45 ` Toshi Kani 2013-05-07 22:45 ` Toshi Kani 2013-05-07 23:17 ` Rafael J. Wysocki 2013-05-07 23:17 ` Rafael J. Wysocki 2013-05-07 23:59 ` Toshi Kani 2013-05-07 23:59 ` Toshi Kani 2013-05-08 0:24 ` Rafael J. Wysocki 2013-05-08 0:24 ` Rafael J. Wysocki 2013-05-08 0:37 ` Toshi Kani 2013-05-08 0:37 ` Toshi Kani 2013-05-08 11:53 ` Rafael J. Wysocki 2013-05-08 11:53 ` Rafael J. Wysocki 2013-05-08 14:38 ` Toshi Kani 2013-05-08 14:38 ` Toshi Kani 2013-05-06 17:20 ` Greg Kroah-Hartman 2013-05-06 17:20 ` Greg Kroah-Hartman 2013-05-06 19:46 ` Rafael J. Wysocki 2013-05-06 19:46 ` Rafael J. Wysocki 2013-05-21 6:37 ` Tang Chen 2013-05-21 6:37 ` Tang Chen 2013-05-21 11:15 ` Rafael J. Wysocki 2013-05-21 11:15 ` Rafael J. Wysocki 2013-05-22 4:45 ` Tang Chen 2013-05-22 4:45 ` Tang Chen 2013-05-22 10:42 ` Rafael J. Wysocki 2013-05-22 10:42 ` Rafael J. Wysocki 2013-05-22 22:06 ` [PATCH] Driver core / memory: Simplify __memory_block_change_state() Rafael J. Wysocki 2013-05-22 22:06 ` Rafael J. Wysocki 2013-05-22 22:14 ` Greg Kroah-Hartman 2013-05-22 22:14 ` Greg Kroah-Hartman 2013-05-22 23:29 ` Rafael J. Wysocki 2013-05-22 23:29 ` Rafael J. Wysocki 2013-05-23 4:37 ` Tang Chen 2013-05-23 4:37 ` Tang Chen 2013-05-06 10:48 ` [PATCH 0/2 v2, RFC] Driver core: Add offline/online callbacks for memory_subsys Rafael J. Wysocki 2013-05-06 10:48 ` Rafael J. Wysocki
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=19540491.PRsM4lKIYM@vostro.rjw.lan \ --to=rjw@sisk.pl \ --cc=gregkh@linuxfoundation.org \ --cc=isimatu.yasuaki@jp.fujitsu.com \ --cc=lenb@kernel.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=toshi.kani@hp.com \ --cc=vasilis.liaskovitis@profitbricks.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.