cma: factor out HIGMEM logic from __cma_declare_contiguous_nid
Subsystems (2)
Mike Rapoport
reviewercover cma: factor out HIGMEM logic from __cma_declare_contiguous_nid
From: "Mike Rapoport (Microsoft)" <[email protected]>
Hi,
We've discussed earlier that HIGHMEM related logic is spread all over __cma_declare_contiguous_nid().
These patches decouple it into helper functions.
[1] https://lore.kernel.org/all/[email protected]
Mike Rapoport (Microsoft) (3):
cma: move __cma_declare_contiguous_nid() before its usage
cma: split resrvation of fixed area into a helper function
cma: move allocation from HIGHMEM to a helper function
mm/cma.c | 315 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 165 insertions(+), 150 deletions(-)
base-commit: 86731a2a651e58953fc949573895f2fa6d456841
Signature · 1 line
2.47.2
Mike Rapoport
reviewerPATCH 1/3 cma: move __cma_declare_contiguous_nid() before its usage
From: "Mike Rapoport (Microsoft)" <[email protected]>
and kill static declaration
--- mm/cma.c | 294 +++++++++++++++++++++++++++---------------------------- 1 file changed, 144 insertions(+), 150 deletions(-)
mm/cma.c +144 -150
@@ -35,12 +35,6 @@struct cma cma_areas[MAX_CMA_AREAS ];unsigned int cma_area_count; -static int __init __cma_declare_contiguous_nid (phys_addr_t *basep, -phys_addr_t size,phys_addr_t limit, -phys_addr_t alignment,unsigned int order_per_bit, -bool fixed,const char *name,struct cma **res_cma, -int nid); -phys_addr_t cma_get_base (const struct cma *cma) {WARN_ON_ONCE (cma->nranges !=1 );
@@ -358,6 +352,150 @@ static void __init list_insert_sorted( } } +static int __init __cma_declare_contiguous_nid (phys_addr_t *basep, +phys_addr_t size,phys_addr_t limit, +phys_addr_t alignment,unsigned int order_per_bit, +bool fixed,const char *name,struct cma **res_cma, +int nid) +{ +phys_addr_t memblock_end =memblock_end_of_DRAM (); +phys_addr_t highmem_start, base = *basep; +int ret; + +/* +* We can't use __pa(high_memory) directly, since high_memory +* isn't a valid direct map VA, and DEBUG_VIRTUAL will (validly) +* complain. Find the boundary by adding one to the last valid +* address. +*/ +if (IS_ENABLED (CONFIG_HIGHMEM )) + highmem_start =__pa (high_memory -1 ) +1 ; +else + highmem_start =memblock_end_of_DRAM (); +pr_debug ("%s(size %pa, base %pa, limit %pa alignment %pa)\n" , + __func__, &size, &base, &limit, &alignment); + +if (cma_area_count ==ARRAY_SIZE (cma_areas)) { +pr_err ("Not enough slots for CMA reserved regions!\n" ); +return -ENOSPC ; + } + +if (!size) +return -EINVAL ; + +if (alignment && !is_power_of_2 (alignment)) +return -EINVAL ; + +if (!IS_ENABLED (CONFIG_NUMA )) + nid =NUMA_NO_NODE ; + +/* Sanitise input arguments. */ + alignment =max_t (phys_addr_t, alignment,CMA_MIN_ALIGNMENT_BYTES ); +if (fixed && base & (alignment -1 )) { +pr_err ("Region at %pa must be aligned to %pa bytes\n" , + &base, &alignment); +return -EINVAL ; + } + base =ALIGN (base, alignment); + size =ALIGN (size, alignment); + limit &= ~(alignment -1 ); + +if (!base) + fixed = false; + +/* size should be aligned with order_per_bit */ +if (!IS_ALIGNED (size >>PAGE_SHIFT ,1 << order_per_bit)) +return -EINVAL ; + +/* +* If allocating at a fixed base the request region must not cross the +* low/high memory boundary. +*/ +if (fixed && base < highmem_start && base + size > highmem_start) { +pr_err ("Region at %pa defined on low/high memory boundary (%pa)\n" , + &base, &highmem_start); +return -EINVAL ; + } + +/* +* If the limit is unspecified or above the memblock end, its effective +* value will be the memblock end. Set it explicitly to simplify further +* checks. +*/ +if (limit ==0 || limit > memblock_end) + limit = memblock_end; + +if (base + size > limit) { +pr_err ("Size (%pa) of region at %pa exceeds limit (%pa)\n" , + &size, &base, &limit); +return -EINVAL ; + } + +/* Reserve memory */ +if (fixed) { +if (memblock_is_region_reserved (base, size) || +memblock_reserve (base, size) <0 ) { +return -EBUSY ; + } + }else { +phys_addr_t addr =0 ; + +/* +* If there is enough memory, try a bottom-up allocation first. +* It will place the new cma area close to the start of the node +* and guarantee that the compaction is moving pages out of the +* cma area and not into it. +* Avoid using first 4GB to not interfere with constrained zones +* like DMA/DMA32. +*/ +#ifdef CONFIG_PHYS_ADDR_T_64BIT +if (!memblock_bottom_up () && memblock_end >=SZ_4G + size) { +memblock_set_bottom_up (true); + addr =memblock_alloc_range_nid (size, alignment,SZ_4G , + limit, nid, true); +memblock_set_bottom_up (false); + } +#endif + +/* +* All pages in the reserved area must come from the same zone. +* If the requested region crosses the low/high memory boundary, +* try allocating from high memory first and fall back to low +* memory in case of failure. +*/ +if (!addr && base < highmem_start && limit > highmem_start) { + addr =memblock_alloc_range_nid (size, alignment, + highmem_start, limit, nid, true); + limit = highmem_start; + } + +if (!addr) { + addr =memblock_alloc_range_nid (size, alignment, base, + limit, nid, true); +if (!addr) +return -ENOMEM ; + } + +/* +* kmemleak scans/reads tracked objects for pointers to other +* objects but this address isn't mapped and accessible +*/ +kmemleak_ignore_phys (addr); + base = addr; + } + + ret =cma_init_reserved_mem (base, size, order_per_bit, name, res_cma); +if (ret) { +memblock_phys_free (base, size); +return ret; + } + + (*res_cma)->nid = nid; + *basep = base; + +return 0 ; +} +/* * Create CMA areas with a total size of @total_size. A normal allocation * for one area is tried first. If that fails, the biggest memblock
@@ -593,150 +731,6 @@ int __init cma_declare_contiguous_nid(phys_addr_t base,return ret; } -static int __init __cma_declare_contiguous_nid (phys_addr_t *basep, -phys_addr_t size,phys_addr_t limit, -phys_addr_t alignment,unsigned int order_per_bit, -bool fixed,const char *name,struct cma **res_cma, -int nid) -{ -phys_addr_t memblock_end =memblock_end_of_DRAM (); -phys_addr_t highmem_start, base = *basep; -int ret; - -/* -* We can't use __pa(high_memory) directly, since high_memory -* isn't a valid direct map VA, and DEBUG_VIRTUAL will (validly) -* complain. Find the boundary by adding one to the last valid -* address. -*/ -if (IS_ENABLED (CONFIG_HIGHMEM )) - highmem_start =__pa (high_memory -1 ) +1 ; -else - highmem_start =memblock_end_of_DRAM (); -pr_debug ("%s(size %pa, base %pa, limit %pa alignment %pa)\n" , - __func__, &size, &base, &limit, &alignment); - -if (cma_area_count ==ARRAY_SIZE (cma_areas)) { -pr_err ("Not enough slots for CMA reserved regions!\n" ); -return -ENOSPC ; - } - -if (!size) -return -EINVAL ; - -if (alignment && !is_power_of_2 (alignment)) -return -EINVAL ; - -if (!IS_ENABLED (CONFIG_NUMA )) - nid =NUMA_NO_NODE ; - -/* Sanitise input arguments. */ - alignment =max_t (phys_addr_t, alignment,CMA_MIN_ALIGNMENT_BYTES ); -if (fixed && base & (alignment -1 )) { -pr_err ("Region at %pa must be aligned to %pa bytes\n" , - &base, &alignment); -return -EINVAL ; - } - base =ALIGN (base, alignment); - size =ALIGN (size, alignment); - limit &= ~(alignment -1 ); - -if (!base) - fixed = false; - -/* size should be aligned with order_per_bit */ -if (!IS_ALIGNED (size >>PAGE_SHIFT ,1 << order_per_bit)) -return -EINVAL ; - -/* -* If allocating at a fixed base the request region must not cross the -* low/high memory boundary. -*/ -if (fixed && base < highmem_start && base + size > highmem_start) { -pr_err ("Region at %pa defined on low/high memory boundary (%pa)\n" , - &base, &highmem_start); -return -EINVAL ; - } - -/* -* If the limit is unspecified or above the memblock end, its effective -* value will be the memblock end. Set it explicitly to simplify further -* checks. -*/ -if (limit ==0 || limit > memblock_end) - limit = memblock_end; - -if (base + size > limit) { -pr_err ("Size (%pa) of region at %pa exceeds limit (%pa)\n" , - &size, &base, &limit); -return -EINVAL ; - } - -/* Reserve memory */ -if (fixed) { -if (memblock_is_region_reserved (base, size) || -memblock_reserve (base, size) <0 ) { -return -EBUSY ; - } - }else { -phys_addr_t addr =0 ; - -/* -* If there is enough memory, try a bottom-up allocation first. -* It will place the new cma area close to the start of the node -* and guarantee that the compaction is moving pages out of the -* cma area and not into it. -* Avoid using first 4GB to not interfere with constrained zones -* like DMA/DMA32. -*/ -#ifdef CONFIG_PHYS_ADDR_T_64BIT -if (!memblock_bottom_up () && memblock_end >=SZ_4G + size) { -memblock_set_bottom_up (true); - addr =memblock_alloc_range_nid (size, alignment,SZ_4G , - limit, nid, true); -memblock_set_bottom_up (false); - } -#endif - -/* -* All pages in the reserved area must come from the same zone. -* If the requested region crosses the low/high memory boundary, -* try allocating from high memory first and fall back to low -* memory in case of failure. -*/ -if (!addr && base < highmem_start && limit > highmem_start) { - addr =memblock_alloc_range_nid (size, alignment, - highmem_start, limit, nid, true); - limit = highmem_start; - } - -if (!addr) { - addr =memblock_alloc_range_nid (size, alignment, base, - limit, nid, true); -if (!addr) -return -ENOMEM ; - } - -/* -* kmemleak scans/reads tracked objects for pointers to other -* objects but this address isn't mapped and accessible -*/ -kmemleak_ignore_phys (addr); - base = addr; - } - - ret =cma_init_reserved_mem (base, size, order_per_bit, name, res_cma); -if (ret) { -memblock_phys_free (base, size); -return ret; - } - - (*res_cma)->nid = nid; - *basep = base; - -return 0 ; -} -static void cma_debug_show_areas (struct cma *cma) {unsigned long next_zero_bit, next_set_bit, nr_zero;
Signature · 1 line
2.47.2
Re: [PATCH 1/3] cma: move __cma_declare_contiguous_nid() before its usage
Quoted 5 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
and kill static declaration
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>
Thanks Mike ;-)!
Signature · 2 lines
Oscar Salvador SUSE Labs
Re: [PATCH 1/3] cma: move __cma_declare_contiguous_nid() before its usage
In reply to Mike RapoportQuoted 6 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
and kill static declaration
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb
Mike Rapoport
reviewerPATCH 2/3 cma: split resrvation of fixed area into a helper function
In reply to Mike RapoportFrom: "Mike Rapoport (Microsoft)" <[email protected]>
Move the check that verifies that reservation of fixed area does not cross HIGHMEM boundary and the actual memblock_resrve() call into a helper function.
This makes code more readable and decouples logic related to CONFIG_HIGHMEM from the core functionality of __cma_declare_contiguous_nid().
--- mm/cma.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-)
mm/cma.c +28 -13
@@ -352,6 +352,30 @@ static void __init list_insert_sorted( } } +static int __init cma_fixed_reserve (phys_addr_t base,phys_addr_t size) +{ +if (IS_ENABLED (CONFIG_HIGHMEM )) { +phys_addr_t highmem_start =__pa (high_memory -1 ) +1 ; + +/* +* If allocating at a fixed base the request region must not +* cross the low/high memory boundary. +*/ +if (base < highmem_start && base + size > highmem_start) { +pr_err ("Region at %pa defined on low/high memory boundary (%pa)\n" , + &base, &highmem_start); +return -EINVAL ; + } + } + +if (memblock_is_region_reserved (base, size) || +memblock_reserve (base, size) <0 ) { +return -EBUSY ; + } + +return 0 ; +} + static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, phys_addr_t size, phys_addr_t limit, phys_addr_t alignment, unsigned int order_per_bit,
@@ -407,15 +431,6 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep,if (!IS_ALIGNED (size >>PAGE_SHIFT ,1 << order_per_bit))return -EINVAL ; -/* -* If allocating at a fixed base the request region must not cross the -* low/high memory boundary. -*/ -if (fixed && base < highmem_start && base + size > highmem_start) { -pr_err ("Region at %pa defined on low/high memory boundary (%pa)\n" , - &base, &highmem_start); -return -EINVAL ; - }/* * If the limit is unspecified or above the memblock end, its effective
@@ -433,10 +448,10 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep,/* Reserve memory */ if (fixed) { -if (memblock_is_region_reserved (base, size) || -memblock_reserve (base, size) <0 ) { -return -EBUSY ; - } +int err =cma_fixed_reserve (base, size); + +if (err) +return err; }else {phys_addr_t addr =0 ;
Signature · 1 line
2.47.2
Re: [PATCH 2/3] cma: split resrvation of fixed area into a helper function
Quoted 11 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
Move the check that verifies that reservation of fixed area does not cross HIGHMEM boundary and the actual
memblock_resrve()call into a helper function.This makes code more readable and decouples logic related to
CONFIG_HIGHMEMfrom the core functionality of__cma_declare_contiguous_nid().Signed-off-by Mike Rapoport (Microsoft) <[email protected]>
Looks good to me, nit below:
mm/cma.c static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, · line 451
Quoted 9 lines
mm/cma.c +1
-4@@ -433,10 +448,10 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep,/* Reserve memory */ if (fixed) { -if (memblock_is_region_reserved (base, size) || -memblock_reserve (base, size) <0 ) { -return -EBUSY ; - } +int err =cma_fixed_reserve (base, size);
There's no need for 'err', you can use the already declared 'ret'.
Signature · 2 lines
Oscar Salvador SUSE Labs
Re: [PATCH 2/3] cma: split resrvation of fixed area into a helper function
In reply to Mike RapoportQuoted 6 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
Move the check that verifies that reservation of fixed area does not cross HIGHMEM boundary and the actual
memblock_resrve()call into a helper function.
Quoted 6 lines
This makes code more readable and decouples logic related to
CONFIG_HIGHMEMfrom the core functionality of__cma_declare_contiguous_nid().Signed-off-by Mike Rapoport (Microsoft) <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb
Mike Rapoport
reviewerPATCH 3/3 cma: move allocation from HIGHMEM to a helper function
In reply to Mike RapoportFrom: "Mike Rapoport (Microsoft)" <[email protected]>
When CONFIG_HIGMEM is enabled, __cma_declare_contiguous_nid() first tries to allocate the area from HIGHMEM and if that fails it falls back to allocation from low memory.
Split allocation from HIGMEM into a helper function to further decouple logic related to CONFIG_HIGHMEM.
--- mm/cma.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-)
mm/cma.c +29 -23
@@ -376,6 +376,30 @@ static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size)return 0 ; } +static phys_addr_t __init cma_alloc_highmem (phys_addr_t base,phys_addr_t size, +phys_addr_t align,phys_addr_t *limit,int nid) +{ +phys_addr_t addr =0 ; + +if (IS_ENABLED (CONFIG_HIGHMEM )) { +phys_addr_t highmem =__pa (high_memory -1 ) +1 ; + +/* +* All pages in the reserved area must come from the same zone. +* If the requested region crosses the low/high memory boundary, +* try allocating from high memory first and fall back to low +* memory in case of failure. +*/ +if (base < highmem && *limit > highmem) { + addr =memblock_alloc_range_nid (size, align, highmem, + *limit, nid, true); + *limit = highmem; + } + } + +return addr; +} + static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, phys_addr_t size, phys_addr_t limit, phys_addr_t alignment, unsigned int order_per_bit,
@@ -383,19 +407,9 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, int nid) {phys_addr_t memblock_end =memblock_end_of_DRAM (); -phys_addr_t highmem_start, base = *basep; +phys_addr_t base = *basep;int ret; -/* -* We can't use __pa(high_memory) directly, since high_memory -* isn't a valid direct map VA, and DEBUG_VIRTUAL will (validly) -* complain. Find the boundary by adding one to the last valid -* address. -*/ -if (IS_ENABLED (CONFIG_HIGHMEM )) - highmem_start =__pa (high_memory -1 ) +1 ; -else - highmem_start =memblock_end_of_DRAM ();pr_debug ("%s(size %pa, base %pa, limit %pa alignment %pa)\n" , __func__, &size, &base, &limit, &alignment);
@@ -472,18 +486,10 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep, }#endif -/* -* All pages in the reserved area must come from the same zone. -* If the requested region crosses the low/high memory boundary, -* try allocating from high memory first and fall back to low -* memory in case of failure. -*/ -if (!addr && base < highmem_start && limit > highmem_start) { - addr =memblock_alloc_range_nid (size, alignment, - highmem_start, limit, nid, true); - limit = highmem_start; - } - +/* On systems with HIGHMEM try allocating from there first */ +if (!addr) + addr =cma_alloc_highmem (base, size, alignment, &limit, + nid);if (!addr) { addr =memblock_alloc_range_nid (size, alignment, base, limit, nid, true);
Signature · 1 line
2.47.2
Re: [PATCH 3/3] cma: move allocation from HIGHMEM to a helper function
Quoted 32 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
When
CONFIG_HIGMEMis enabled,__cma_declare_contiguous_nid()first tries to allocate the area from HIGHMEM and if that fails it falls back to allocation from low memory.Split allocation from HIGMEM into a helper function to further decouple logic related to
CONFIG_HIGHMEM.Signed-off-by Mike Rapoport (Microsoft) <[email protected]>--- mm/cma.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-)mm/cma.c +10
-0@@ -376,6 +376,30 @@ static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size)return 0 ; } +static phys_addr_t __init cma_alloc_highmem (phys_addr_t base,phys_addr_t size, +phys_addr_t align,phys_addr_t *limit,int nid) +{ +phys_addr_t addr =0 ; + +if (IS_ENABLED (CONFIG_HIGHMEM )) { +phys_addr_t highmem =__pa (high_memory -1 ) +1 ; + +/* +* All pages in the reserved area must come from the same zone.
mm/cma.c static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size) · line 398
Quoted 10 lines
mm/cma.c +10
-0+* If the requested region crosses the low/high memory boundary, +* try allocating from high memory first and fall back to low +* memory in case of failure. +*/ +if (base < highmem && *limit > highmem) { + addr =memblock_alloc_range_nid (size, align, highmem, + *limit, nid, true); + *limit = highmem; + } + }
Not a big deal, but maybe better to do it in one function? Maybe even move the CONFIG_PHYS_ADDR_T_64BIT block in there as well? So memblock_alloc_range_nid() calls would be contained in one place and the X86_64/HIGHMEM comments as well.
Just a thought.
diff --git a/mm/cma.c b/mm/cma.c
index dd7643fc01db..532b56e6971a 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -377,11 +377,12 @@ static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size)
return 0;
}
-static phys_addr_t __init cma_alloc_highmem(phys_addr_t base, phys_addr_t size,
- phys_addr_t align, phys_addr_t *limit, int nid)
+static phys_addr_t __init cma_alloc_mem(phys_addr_t base, phys_addr_t size,
+ phys_addr_t align, phys_addr_t limit, int nid)
{
phys_addr_t addr = 0;
+ /* On systems with HIGHMEM try allocating from there first */
if (IS_ENABLED(CONFIG_HIGHMEM)) {
phys_addr_t highmem = __pa(high_memory - 1) + 1;
@@ -393,11 +394,15 @@ static phys_addr_t __init cma_alloc_highmem(phys_addr_t base, phys_addr_t size,
*/
if (base < highmem && *limit > highmem) {
addr = memblock_alloc_range_nid(size, align, highmem,
- *limit, nid, true);
+ limit, nid, true);
*limit = highmem;
}
}
+ if (!addr)
+ addr = memblock_alloc_range_nid(size, alignment, base,
+ limit, nid, true);
+
return addr;
}
@@ -487,16 +492,8 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t *basep,
}
#endif
- /* On systems with HIGHMEM try allocating from there first */
if (!addr)
- addr = cma_alloc_highmem(base, size, alignment, &limit,
- nid);
- if (!addr) {
- addr = memblock_alloc_range_nid(size, alignment, base,
- limit, nid, true);
- if (!addr)
- return -ENOMEM;
- }
+ addr = cma_alloc_mem(base, size, alignment, limit, nid);
/*
* kmemleak scans/reads tracked objects for pointers to other
Signature · 2 lines
Oscar Salvador SUSE Labs
Re: [PATCH 3/3] cma: move allocation from HIGHMEM to a helper function
Quoted 37 lines · Oscar Salvador
Quoted 36 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
When
CONFIG_HIGMEMis enabled,__cma_declare_contiguous_nid()first tries to allocate the area from HIGHMEM and if that fails it falls back to allocation from low memory.Split allocation from HIGMEM into a helper function to further decouple logic related to
CONFIG_HIGHMEM.Signed-off-by Mike Rapoport (Microsoft) <[email protected]>--- mm/cma.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-)mm/cma.c +14
-0@@ -376,6 +376,30 @@ static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size)return 0 ; } +static phys_addr_t __init cma_alloc_highmem (phys_addr_t base,phys_addr_t size, +phys_addr_t align,phys_addr_t *limit,int nid) +{ +phys_addr_t addr =0 ; + +if (IS_ENABLED (CONFIG_HIGHMEM )) { +phys_addr_t highmem =__pa (high_memory -1 ) +1 ; + +/* +* All pages in the reserved area must come from the same zone. +* If the requested region crosses the low/high memory boundary, +* try allocating from high memory first and fall back to low +* memory in case of failure. +*/
Quoted 8 lines
mm/cma.c static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size) · line 398
Quoted 6 lines
mm/cma.c +6
-0+if (base < highmem && *limit > highmem) { + addr =memblock_alloc_range_nid (size, align, highmem, + *limit, nid, true); + *limit = highmem; + } + }Not a big deal, but maybe better to do it in one function?
Yes, same thought here.
Signature · 3 lines
Cheers, David / dhildenb
Mike Rapoport
reviewerRe: [PATCH 3/3] cma: move allocation from HIGHMEM to a helper function
In reply to Oscar SalvadorQuoted 41 lines · Oscar Salvador
Quoted 40 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
When
CONFIG_HIGMEMis enabled,__cma_declare_contiguous_nid()first tries to allocate the area from HIGHMEM and if that fails it falls back to allocation from low memory.Split allocation from HIGMEM into a helper function to further decouple logic related to
CONFIG_HIGHMEM.Signed-off-by Mike Rapoport (Microsoft) <[email protected]>--- mm/cma.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-)mm/cma.c +18
-0@@ -376,6 +376,30 @@ static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size)return 0 ; } +static phys_addr_t __init cma_alloc_highmem (phys_addr_t base,phys_addr_t size, +phys_addr_t align,phys_addr_t *limit,int nid) +{ +phys_addr_t addr =0 ; + +if (IS_ENABLED (CONFIG_HIGHMEM )) { +phys_addr_t highmem =__pa (high_memory -1 ) +1 ; + +/* +* All pages in the reserved area must come from the same zone. +* If the requested region crosses the low/high memory boundary, +* try allocating from high memory first and fall back to low +* memory in case of failure. +*/ +if (base < highmem && *limit > highmem) { + addr =memblock_alloc_range_nid (size, align, highmem, + *limit, nid, true); + *limit = highmem;
Quoted 8 lines
mm/cma.c static int __init cma_fixed_reserve(phys_addr_t base, phys_addr_t size) · line 398
Quoted 2 lines
mm/cma.c +2
-0+ } + }Not a big deal, but maybe better to do it in one function? Maybe even move the
CONFIG_PHYS_ADDR_T_64BITblock in there as well? Somemblock_alloc_range_nid()calls would be contained in one place and the X86_64/HIGHMEM comments as well.
Just a thought.
Yeah, this will be neater, thanks!
Will send v2 shortly.
Quoted 3 lines
Signature · 2 lines
Oscar Salvador SUSE Labs
Signature · 2 lines
Sincerely yours, Mike.