The patch titled
Subject: mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4
has been added to the -mm tree. Its filename is
mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Wei Yang <richard.weiyang@xxxxxxxxx>
Subject: mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4
v4:
* fix typo in changelog
* adjust second paragraph of changelog
v3:
* adjust the changelog with the reason for this change
* remove a comment for pgdat_resize_lock
* separate the prototype change of sparse_add_one_section() to
another one
Link: http://lkml.kernel.org/r/20181204085657.20472-1-richard.weiyang@xxxxxxxxx
Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memory_hotplug.h | 2 +-
include/linux/mmzone.h | 3 +--
mm/memory_hotplug.c | 2 +-
mm/sparse.c | 8 ++++----
4 files changed, 7 insertions(+), 8 deletions(-)
--- a/include/linux/memory_hotplug.h~mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4
+++ a/include/linux/memory_hotplug.h
@@ -335,7 +335,7 @@ extern void move_pfn_range_to_zone(struc
unsigned long nr_pages, struct vmem_altmap *altmap);
extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
extern bool is_memblock_offlined(struct memory_block *mem);
-extern int sparse_add_one_section(int nid,
+extern int sparse_add_one_section(struct pglist_data *pgdat,
unsigned long start_pfn, struct vmem_altmap *altmap);
extern void sparse_remove_one_section(int nid, struct mem_section *ms,
unsigned long map_offset, struct vmem_altmap *altmap);
--- a/include/linux/mmzone.h~mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4
+++ a/include/linux/mmzone.h
@@ -637,8 +637,7 @@ typedef struct pglist_data {
#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_DEFERRED_STRUCT_PAGE_INIT)
/*
* Must be held any time you expect node_start_pfn, node_present_pages
- * or node_spanned_pages stay constant. Holding this will also
- * guarantee that any pfn_valid() stays that way.
+ * or node_spanned_pages stay constant.
*
* pgdat_resize_lock() and pgdat_resize_unlock() are provided to
* manipulate node_size_lock without checking for CONFIG_MEMORY_HOTPLUG
--- a/mm/memory_hotplug.c~mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4
+++ a/mm/memory_hotplug.c
@@ -253,7 +253,7 @@ static int __meminit __add_section(int n
if (pfn_valid(phys_start_pfn))
return -EEXIST;
- ret = sparse_add_one_section(nid, phys_start_pfn, altmap);
+ ret = sparse_add_one_section(NODE_DATA(nid), phys_start_pfn, altmap);
if (ret < 0)
return ret;
--- a/mm/sparse.c~mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4
+++ a/mm/sparse.c
@@ -662,8 +662,8 @@ static void free_map_bootmem(struct page
* set. If this is <=0, then that means that the passed-in
* map was not consumed and must be freed.
*/
-int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
- struct vmem_altmap *altmap)
+int __meminit sparse_add_one_section(struct pglist_data *pgdat,
+ unsigned long start_pfn, struct vmem_altmap *altmap)
{
unsigned long section_nr = pfn_to_section_nr(start_pfn);
struct mem_section *ms;
@@ -675,11 +675,11 @@ int __meminit sparse_add_one_section(int
* no locking for this, because it does its own
* plus, it does a kmalloc
*/
- ret = sparse_index_init(section_nr, nid);
+ ret = sparse_index_init(section_nr, pgdat->node_id);
if (ret < 0 && ret != -EEXIST)
return ret;
ret = 0;
- memmap = kmalloc_section_memmap(section_nr, nid, altmap);
+ memmap = kmalloc_section_memmap(section_nr, pgdat->node_id, altmap);
if (!memmap)
return -ENOMEM;
usemap = __kmalloc_section_usemap();
_
Patches currently in -mm which might be from richard.weiyang@xxxxxxxxx are
mm-slub-remove-validation-on-cpu_slab-in-__flush_cpu_slab.patch
mm-slub-page-is-always-non-null-for-node_match.patch
mm-slub-record-final-state-of-slub-action-in-deactivate_slab.patch
mm-slub-improve-performance-by-skipping-checked-node-in-get_any_partial.patch
mm-remove-reset-of-pcp-counter-in-pageset_init.patch
vmscan-return-node_reclaim_noscan-in-node_reclaim-when-config_numa-is-n.patch
drivers-base-memoryc-remove-an-unnecessary-check-on-nr_mem_sections.patch
mm-check-nr_initialised-with-pages_per_section-directly-in-defer_init.patch
mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section.patch
mm-sparse-drop-pgdat_resize_lock-in-sparse_add-remove_one_section-v4.patch
mm-sparse-pass-nid-instead-of-pgdat-to-sparse_add_one_section.patch
mm-hotplug-move-init_currently_empty_zone-under-zone_span_lock-protection.patch
mm-show_mem-drop-pgdat_resize_lock-in-show_mem.patch
