diff mbox series

[v1] drivers/base/memory: clarify adding and removing of memory blocks

Message ID 20220221154531.11382-1-david@redhat.com (mailing list archive)
State New
Headers show
Series [v1] drivers/base/memory: clarify adding and removing of memory blocks | expand

Commit Message

David Hildenbrand Feb. 21, 2022, 3:45 p.m. UTC
Let's make it clearer at which places we actually add and remove memory
blocks -- streamlining the terminology -- and highlight which memory
block start out online and which start out as offline.

* rename add_memory_block -> add_boot_memory_block
* rename init_memory_block -> add_memory_block
* rename unregister_memory -> remove_memory_block
* rename register_memory -> __add_memory_block
* add add_hotplug_memory_block
* mark add_boot_memory_block with __init (suggested by Oscar)

__add_memory_block() is  a pure helper for add_memory_block(), remove
the somewhat obvious comment.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: David Hildenbrand <david@redhat.com>
---

Based on v5.17-rc5 and:
	[PATCH v2 0/2] drivers/base/memory: determine and store zone for
	single-zone memory blocks [1]

[1] https://lkml.kernel.org/r/20220210184359.235565-1-david@redhat.com

---
 drivers/base/memory.c | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

Comments

Oscar Salvador Feb. 22, 2022, 5:49 a.m. UTC | #1
On Mon, Feb 21, 2022 at 04:45:31PM +0100, David Hildenbrand wrote:
> Let's make it clearer at which places we actually add and remove memory
> blocks -- streamlining the terminology -- and highlight which memory
> block start out online and which start out as offline.
> 
> * rename add_memory_block -> add_boot_memory_block
> * rename init_memory_block -> add_memory_block
> * rename unregister_memory -> remove_memory_block
> * rename register_memory -> __add_memory_block
> * add add_hotplug_memory_block
> * mark add_boot_memory_block with __init (suggested by Oscar)
> 
> __add_memory_block() is  a pure helper for add_memory_block(), remove
> the somewhat obvious comment.
> 
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Michal Hocko <mhocko@suse.com>
> Cc: Oscar Salvador <osalvador@suse.de>
> Signed-off-by: David Hildenbrand <david@redhat.com>

Thanks for doing this, it makes the code much more clear.

Reviewed-by: Oscar Salvador <osalvador@suse.de>

> ---
> 
> Based on v5.17-rc5 and:
> 	[PATCH v2 0/2] drivers/base/memory: determine and store zone for
> 	single-zone memory blocks [1]

Maybe just my thing, but I also had to pull in [1] in order to apply
this error-free. 

[1] https://patchwork.kernel.org/project/linux-mm/patch/20220128144540.153902-1-david@redhat.com/
David Hildenbrand Feb. 22, 2022, 7:50 p.m. UTC | #2
On 22.02.22 06:49, Oscar Salvador wrote:
> On Mon, Feb 21, 2022 at 04:45:31PM +0100, David Hildenbrand wrote:
>> Let's make it clearer at which places we actually add and remove memory
>> blocks -- streamlining the terminology -- and highlight which memory
>> block start out online and which start out as offline.
>>
>> * rename add_memory_block -> add_boot_memory_block
>> * rename init_memory_block -> add_memory_block
>> * rename unregister_memory -> remove_memory_block
>> * rename register_memory -> __add_memory_block
>> * add add_hotplug_memory_block
>> * mark add_boot_memory_block with __init (suggested by Oscar)
>>
>> __add_memory_block() is  a pure helper for add_memory_block(), remove
>> the somewhat obvious comment.
>>
>> Cc: Andrew Morton <akpm@linux-foundation.org>
>> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
>> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Cc: Michal Hocko <mhocko@suse.com>
>> Cc: Oscar Salvador <osalvador@suse.de>
>> Signed-off-by: David Hildenbrand <david@redhat.com>
> 
> Thanks for doing this, it makes the code much more clear.
> 
> Reviewed-by: Oscar Salvador <osalvador@suse.de>
> 
>> ---
>>
>> Based on v5.17-rc5 and:
>> 	[PATCH v2 0/2] drivers/base/memory: determine and store zone for
>> 	single-zone memory blocks [1]
> 
> Maybe just my thing, but I also had to pull in [1] in order to apply
> this error-free. 
> 
> [1] https://patchwork.kernel.org/project/linux-mm/patch/20220128144540.153902-1-david@redhat.com/

Ah, yes, I forgot to mention that -- also already in -mm and -next.

Thanks!
diff mbox series

Patch

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 5297c8a84428..c7dfd86e960f 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -617,11 +617,7 @@  static const struct attribute_group *memory_memblk_attr_groups[] = {
 	NULL,
 };
 
-/*
- * register_memory - Setup a sysfs device for a memory block
- */
-static
-int register_memory(struct memory_block *memory)
+static int __add_memory_block(struct memory_block *memory)
 {
 	int ret;
 
@@ -721,9 +717,9 @@  void memory_block_add_nid(struct memory_block *mem, int nid,
 }
 #endif
 
-static int init_memory_block(unsigned long block_id, unsigned long state,
-			     unsigned long nr_vmemmap_pages,
-			     struct memory_group *group)
+static int add_memory_block(unsigned long block_id, unsigned long state,
+			    unsigned long nr_vmemmap_pages,
+			    struct memory_group *group)
 {
 	struct memory_block *mem;
 	int ret = 0;
@@ -754,7 +750,7 @@  static int init_memory_block(unsigned long block_id, unsigned long state,
 		mem->zone = early_node_zone_for_memory_block(mem, NUMA_NO_NODE);
 #endif /* CONFIG_NUMA */
 
-	ret = register_memory(mem);
+	ret = __add_memory_block(mem);
 	if (ret)
 		return ret;
 
@@ -766,7 +762,7 @@  static int init_memory_block(unsigned long block_id, unsigned long state,
 	return 0;
 }
 
-static int add_memory_block(unsigned long base_section_nr)
+static int __init add_boot_memory_block(unsigned long base_section_nr)
 {
 	int section_count = 0;
 	unsigned long nr;
@@ -778,11 +774,18 @@  static int add_memory_block(unsigned long base_section_nr)
 
 	if (section_count == 0)
 		return 0;
-	return init_memory_block(memory_block_id(base_section_nr),
-				 MEM_ONLINE, 0,  NULL);
+	return add_memory_block(memory_block_id(base_section_nr),
+				MEM_ONLINE, 0,  NULL);
+}
+
+static int add_hotplug_memory_block(unsigned long block_id,
+				    unsigned long nr_vmemmap_pages,
+				    struct memory_group *group)
+{
+	return add_memory_block(block_id, MEM_OFFLINE, nr_vmemmap_pages, group);
 }
 
-static void unregister_memory(struct memory_block *memory)
+static void remove_memory_block(struct memory_block *memory)
 {
 	if (WARN_ON_ONCE(memory->dev.bus != &memory_subsys))
 		return;
@@ -821,8 +824,7 @@  int create_memory_block_devices(unsigned long start, unsigned long size,
 		return -EINVAL;
 
 	for (block_id = start_block_id; block_id != end_block_id; block_id++) {
-		ret = init_memory_block(block_id, MEM_OFFLINE, vmemmap_pages,
-					group);
+		ret = add_hotplug_memory_block(block_id, vmemmap_pages, group);
 		if (ret)
 			break;
 	}
@@ -833,7 +835,7 @@  int create_memory_block_devices(unsigned long start, unsigned long size,
 			mem = find_memory_block_by_id(block_id);
 			if (WARN_ON_ONCE(!mem))
 				continue;
-			unregister_memory(mem);
+			remove_memory_block(mem);
 		}
 	}
 	return ret;
@@ -862,7 +864,7 @@  void remove_memory_block_devices(unsigned long start, unsigned long size)
 		if (WARN_ON_ONCE(!mem))
 			continue;
 		unregister_memory_block_under_nodes(mem);
-		unregister_memory(mem);
+		remove_memory_block(mem);
 	}
 }
 
@@ -922,7 +924,7 @@  void __init memory_dev_init(void)
 	 */
 	for (nr = 0; nr <= __highest_present_section_nr;
 	     nr += sections_per_block) {
-		ret = add_memory_block(nr);
+		ret = add_boot_memory_block(nr);
 		if (ret)
 			panic("%s() failed to add memory block: %d\n", __func__,
 			      ret);