mm/cma: report base address of single range correctly
Subsystems (2)
PATCH v2 1/1 mm/cma: report base address of single range correctly
The cma_declare_contiguous_nid code was refactored by commit c009da4258f9 ("mm, cma: support multiple contiguous ranges, if requested"), so that it could use an internal function to attempt a single range area first, and then try a multi-range one.
However, that meant that the actual base address used for the !fixed case (base == 0) wasn't available one level up to be printed in the informational message, and it would always end up printing a base address of 0 in the boot message.
Make the internal function take a phys_addr_t pointer to the base address, so that the value is available to the caller.
--- mm/cma.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
mm/cma.c +11 -8
@@ -35,7 +35,7 @@struct cma cma_areas[MAX_CMA_AREAS ];unsigned int cma_area_count; -static int __init __cma_declare_contiguous_nid(phys_addr_t base, +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,
@@ -370,7 +370,7 @@ int __init cma_declare_contiguous_multi(phys_addr_t total_size, phys_addr_t align, unsigned int order_per_bit, const char *name, struct cma **res_cma, int nid) { - phys_addr_t start, end; + phys_addr_t start = 0, end;phys_addr_t size, sizesum, sizeleft;struct cma_init_memrange *mrp, *mlp, *failed;struct cma_memrange *cmrp;
@@ -384,7 +384,7 @@ int __init cma_declare_contiguous_multi(phys_addr_t total_size,/* * First, try it the normal way, producing just one range. */ - ret =__cma_declare_contiguous_nid (0 , total_size,0 , align, + ret =__cma_declare_contiguous_nid (&start, total_size,0 , align, order_per_bit, false, name, res_cma, nid);if (ret != -ENOMEM ) goto out;
@@ -580,7 +580,7 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, {int ret; - ret =__cma_declare_contiguous_nid (base, size, limit, alignment, + ret =__cma_declare_contiguous_nid (&base, size, limit, alignment, order_per_bit, fixed, name, res_cma, nid);if (ret !=0 ) pr_err("Failed to reserve %ld MiB\n",
@@ -592,14 +592,14 @@ int __init cma_declare_contiguous_nid(phys_addr_t base,return ret; } -static int __init __cma_declare_contiguous_nid (phys_addr_t base, +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; +phys_addr_t highmem_start, base = *basep;int ret;/*
@@ -722,12 +722,15 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t base, } ret =cma_init_reserved_mem (base, size, order_per_bit, name, res_cma); -if (ret) +if (ret) {memblock_phys_free (base, size); +return ret; + } (*res_cma)->nid = nid; + *basep = base; -return ret; +return 0 ; }static void cma_debug_show_areas (struct cma *cma)
Signature · 1 line
2.49.0.504.g3bcea36a83-goog
Andrew Morton
maintainerQuoted 12 lines · On Tue, 8 Apr 2025 16:40:00 +0000 Frank van der Linden <[email protected]> wrote:
The
cma_declare_contiguous_nidcode was refactored by commitc009da4258f9("mm, cma: support multiple contiguous ranges, if requested"), so that it could use an internal function to attempt a single range area first, and then try a multi-range one.However, that meant that the actual base address used for the !fixed case (base == 0) wasn't available one level up to be printed in the informational message, and it would always end up printing a base address of 0 in the boot message.
Quoted 3 lines
Make the internal function take a
phys_addr_tpointer to the base address, so that the value is available to the caller.
Changes from v1 are:
mm/cma.c renamed from mm/cma.c~mm-cma-report-base-address-of-single-range-correctly-v2 +6 -5
@@ -722,14 +722,15 @@ static int __init __cma_declare_contiguo } ret =cma_init_reserved_mem (base, size, order_per_bit, name, res_cma); -if (ret) +if (ret) {memblock_phys_free (base, size); -else { - (*res_cma)->nid = nid; - *basep = base; +return ret; } -return ret; + (*res_cma)->nid = nid; + *basep = base; + +return 0 ; }static void cma_debug_show_areas (struct cma *cma)
_
Which appears to be just a little cleanup?
Quoted 46 lines · Andrew Morton
Quoted 12 lines · On Tue, 8 Apr 2025 16:40:00 +0000 Frank van der Linden <[email protected]> wrote:
The
cma_declare_contiguous_nidcode was refactored by commitc009da4258f9("mm, cma: support multiple contiguous ranges, if requested"), so that it could use an internal function to attempt a single range area first, and then try a multi-range one.However, that meant that the actual base address used for the !fixed case (base == 0) wasn't available one level up to be printed in the informational message, and it would always end up printing a base address of 0 in the boot message.
Quoted 3 lines
Make the internal function take a
phys_addr_tpointer to the base address, so that the value is available to the caller.Changes from v1 are:
mm/cma.c renamed from mm/cma.c~mm-cma-report-base-address-of-single-range-correctly-v2 +6
-5@@ -722,14 +722,15 @@ static int __init __cma_declare_contiguo } ret =cma_init_reserved_mem (base, size, order_per_bit, name, res_cma); -if (ret) +if (ret) {memblock_phys_free (base, size); -else { - (*res_cma)->nid = nid; - *basep = base; +return ret; } -return ret; + (*res_cma)->nid = nid; + *basep = base; + +return 0 ; }static void cma_debug_show_areas (struct cma *cma)_
Quoted 1 line
Which appears to be just a little cleanup?
Correct, it just fixes a style nit that Geert pointed out.
- Frank
Hi Frank,
Quoted 12 lines · Frank van der Linden
The
cma_declare_contiguous_nidcode was refactored by commitc009da4258f9("mm, cma: support multiple contiguous ranges, if requested"), so that it could use an internal function to attempt a single range area first, and then try a multi-range one.However, that meant that the actual base address used for the !fixed case (base == 0) wasn't available one level up to be printed in the informational message, and it would always end up printing a base address of 0 in the boot message.
Quoted 7 lines
Make the internal function take a
phys_addr_tpointer to the base address, so that the value is available to the caller.Fixes c009da4258f9 ("mm, cma: support multiple contiguous ranges, if requested")Reported-by Geert Uytterhoeven <[email protected]>
Thanks for your patch, which is now commit 60580e0bd587b1df ("mm/cma:
report base address of single range correctly") upstream.
Quoted 1 line
Tested-by Geert Uytterhoeven <[email protected]>
FTR, the email addres in this tag does not match the tag given in
https://lore.kernel.org/all/CAMuHMdUeGjbOx-aJTvwOVBWdUFmY7wU-p3mKaCbEzQ4PbJDqNg@mail.gmail.com
Quoted 1 line
Signed-off-by Frank van der Linden <[email protected]>
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds