memblock: minor cleanups
cover memblock: minor cleanups
Hi,
These patches perform some minor cleanups in memblock. Generated vs mmotm-2019-02-04-17-47.
Mike Rapoport (2):
memblock: remove memblock_{set,clear}_region_flags
memblock: split checks whether a region should be skipped to a helper
function
include/linux/memblock.h | 12 ---------- mm/memblock.c | 62 ++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 43 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 memblock: remove memblock_{set,clear}_region_flags
The memblock API provides dedicated helpers to set or clear a flag on a memory region, e.g. memblock_{mark,clear}_hotplug().
The memblock_{set,clear}_region_flags() functions are used only by the memblock internal function that adjusts the region flags. Drop these functions and use open-coded implementation instead.
--- include/linux/memblock.h | 12 ------------ mm/memblock.c | 9 ++++++--- 2 files changed, 6 insertions(+), 15 deletions(-)
include/linux/memblock.h +0 -12
@@ -317,18 +317,6 @@ void __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,for_each_mem_range_rev (i, &memblock.memory, &memblock.reserved, \ nid, flags, p_start, p_end, p_nid) -static inline void memblock_set_region_flags (struct memblock_region *r, -enum memblock_flags flags) -{ - r->flags |= flags; -} - -static inline void memblock_clear_region_flags (struct memblock_region *r, -enum memblock_flags flags) -{ - r->flags &= ~flags; -} -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP int memblock_set_node (phys_addr_t base,phys_addr_t size,struct memblock_type *type,int nid);
mm/memblock.c +6 -3
@@ -851,11 +851,14 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base,if (ret)return ret; -for (i = start_rgn; i < end_rgn; i++) +for (i = start_rgn; i < end_rgn; i++) { +struct memblock_region *r = &type->regions[i]; +if (set) -memblock_set_region_flags (&type->regions[i], flag); + r->flags |= flag;else -memblock_clear_region_flags (&type->regions[i], flag); + r->flags &= ~flag; + }memblock_merge_regions (type);return 0 ;
Signature · 1 line
2.7.4
Re: [PATCH 1/2] memblock: remove memblock_{set,clear}_region_flags
Quoted 42 lines · Mike Rapoport
The memblock API provides dedicated helpers to set or clear a flag on a memory region, e.g. memblock_{mark,clear}_hotplug().
The memblock_{set,clear}_region_flags() functions are used only by the memblock internal function that adjusts the region flags. Drop these functions and use open-coded implementation instead.
Signed-off-by Mike Rapoport <[email protected]>--- include/linux/memblock.h | 12 ------------ mm/memblock.c | 9 ++++++--- 2 files changed, 6 insertions(+), 15 deletions(-)include/linux/memblock.h +0
-12@@ -317,18 +317,6 @@ void __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,for_each_mem_range_rev (i, &memblock.memory, &memblock.reserved, \ nid, flags, p_start, p_end, p_nid) -static inline void memblock_set_region_flags (struct memblock_region *r, -enum memblock_flags flags) -{ - r->flags |= flags; -} - -static inline void memblock_clear_region_flags (struct memblock_region *r, -enum memblock_flags flags) -{ - r->flags &= ~flags; -} -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP int memblock_set_node (phys_addr_t base,phys_addr_t size,struct memblock_type *type,int nid);mm/memblock.c +0
-0
mm/memblock.c static int __init_memblock memblock_setclr_flag(phys_addr_t base, · line 855
Quoted 6 lines
mm/memblock.c +2
-1@@ -851,11 +851,14 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base,if (ret)return ret; -for (i = start_rgn; i < end_rgn; i++) +for (i = start_rgn; i < end_rgn; i++) { +struct memblock_region *r = &type->regions[i];
Is it fine if we drop this memblock_region *r altogether ?
Quoted 14 lines
mm/memblock.c +4
-3+if (set) -memblock_set_region_flags (&type->regions[i], flag); + r->flags |= flag;else -memblock_clear_region_flags (&type->regions[i], flag); + r->flags &= ~flag; + }memblock_merge_regions (type);return 0 ; --2.7.4
Re: [PATCH 1/2] memblock: remove memblock_{set,clear}_region_flags
Quoted 46 lines · Souptick Joarder
Quoted 45 lines · Mike Rapoport
The memblock API provides dedicated helpers to set or clear a flag on a memory region, e.g. memblock_{mark,clear}_hotplug().
The memblock_{set,clear}_region_flags() functions are used only by the memblock internal function that adjusts the region flags. Drop these functions and use open-coded implementation instead.
Signed-off-by Mike Rapoport <[email protected]>--- include/linux/memblock.h | 12 ------------ mm/memblock.c | 9 ++++++--- 2 files changed, 6 insertions(+), 15 deletions(-)include/linux/memblock.h +0
-12@@ -317,18 +317,6 @@ void __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,for_each_mem_range_rev (i, &memblock.memory, &memblock.reserved, \ nid, flags, p_start, p_end, p_nid) -static inline void memblock_set_region_flags (struct memblock_region *r, -enum memblock_flags flags) -{ - r->flags |= flags; -} - -static inline void memblock_clear_region_flags (struct memblock_region *r, -enum memblock_flags flags) -{ - r->flags &= ~flags; -} -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP int memblock_set_node (phys_addr_t base,phys_addr_t size,struct memblock_type *type,int nid);mm/memblock.c +0
-0@@ -851,11 +851,14 @@ static int __init_memblock memblock_setclr_flag(phys_addr_t base,if (ret)return ret;
Quoted 5 lines
mm/memblock.c static int __init_memblock memblock_setclr_flag(phys_addr_t base, · line 855
Quoted 3 lines
mm/memblock.c +2
-1-for (i = start_rgn; i < end_rgn; i++) +for (i = start_rgn; i < end_rgn; i++) { +struct memblock_region *r = &type->regions[i];Is it fine if we drop this
memblock_region*r altogether ?
I prefer using a local variable to
type->regions[i].flags
Quoted 15 lines
Quoted 14 lines
mm/memblock.c +4
-3+if (set) -memblock_set_region_flags (&type->regions[i], flag); + r->flags |= flag;else -memblock_clear_region_flags (&type->regions[i], flag); + r->flags &= ~flag; + }memblock_merge_regions (type);return 0 ; --2.7.4
Signature · 2 lines
Sincerely yours, Mike.
PATCH 2/2 memblock: split checks whether a region should be skipped to a helper function
In reply to Mike RapoportThe __next_mem_range() and __next_mem_range_rev() duplucate the code that checks whether a region should be skipped because of node or flags incompatibility.
Split this code into a helper function.
--- mm/memblock.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-)
mm/memblock.c +25 -28
@@ -958,6 +958,29 @@ void __init_memblock __next_reserved_mem_region(u64 *idx, *idx =ULLONG_MAX ; } +static bool should_skip_region (struct memblock_region *m,int nid,int flags) +{ +int m_nid =memblock_get_region_node (m); + +/* only memory regions are associated with nodes, check it */ +if (nid !=NUMA_NO_NODE && nid != m_nid) +return true; + +/* skip hotpluggable memory regions if needed */ +if (movable_node_is_enabled () &&memblock_is_hotpluggable (m)) +return true; + +/* if we want mirror memory skip non-mirror memory regions */ +if ((flags &MEMBLOCK_MIRROR ) && !memblock_is_mirror (m)) +return true; + +/* skip nomap memory unless we were asked for it explicitly */ +if (!(flags &MEMBLOCK_NOMAP ) &&memblock_is_nomap (m)) +return true; + +return false; +} +/** * __next__mem_range - next function for for_each_free_mem_range() etc. * @idx: pointer to u64 loop variable
@@ -1005,20 +1028,7 @@ void __init_memblock __next_mem_range(u64 *idx, int nid,phys_addr_t m_end = m->base + m->size;int m_nid =memblock_get_region_node (m); -/* only memory regions are associated with nodes, check it */ -if (nid !=NUMA_NO_NODE && nid != m_nid) -continue ; - -/* skip hotpluggable memory regions if needed */ -if (movable_node_is_enabled () &&memblock_is_hotpluggable (m)) -continue ; - -/* if we want mirror memory skip non-mirror memory regions */ -if ((flags &MEMBLOCK_MIRROR ) && !memblock_is_mirror (m)) -continue ; - -/* skip nomap memory unless we were asked for it explicitly */ -if (!(flags &MEMBLOCK_NOMAP ) &&memblock_is_nomap (m)) +if (should_skip_region (m, nid, flags))continue ;if (!type_b) {
@@ -1122,20 +1132,7 @@ void __init_memblock __next_mem_range_rev(u64 *idx, int nid,phys_addr_t m_end = m->base + m->size;int m_nid =memblock_get_region_node (m); -/* only memory regions are associated with nodes, check it */ -if (nid !=NUMA_NO_NODE && nid != m_nid) -continue ; - -/* skip hotpluggable memory regions if needed */ -if (movable_node_is_enabled () &&memblock_is_hotpluggable (m)) -continue ; - -/* if we want mirror memory skip non-mirror memory regions */ -if ((flags &MEMBLOCK_MIRROR ) && !memblock_is_mirror (m)) -continue ; - -/* skip nomap memory unless we were asked for it explicitly */ -if (!(flags &MEMBLOCK_NOMAP ) &&memblock_is_nomap (m)) +if (should_skip_region (m, nid, flags))continue ;if (!type_b) {
Signature · 1 line
2.7.4