Re: [PATCH] dma-contiguous: reserve NUMA CMA areas after default reservation failure

From: Avi

Date: Mon Nov 16 2026 - 06:49:38 EST


I think both quite clear, but I don't mind either way ;-)

On Mon, Nov 16, 2026 at 4:24 AM Feng Tang <feng.tang@xxxxxxxxxxxxxxxxx> wrote:
>
> On Sun, Nov 15, 2026 at 02:05:35PM +0200, Avi Weiss wrote:
> > dma_contiguous_reserve() returns when reserving the default CMA area
> > fails, skipping independently configured NUMA CMA areas that might
> > still be reservable.
> >
> > Register the default area only when its reservation succeeds, then
> > continue with NUMA CMA reservation even if the default area fails.
> >
> > Fixes: 7e6ace2535d0 ("dma-contiguous: add kconfig option to setup numa cma area if not configured explicitly")
> > Signed-off-by: Avi Weiss <thnkslprpt@xxxxxxxxx>
> > ---
> > kernel/dma/contiguous.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
> > index 90937dc7c627..0b6500bb6cd9 100644
> > --- a/kernel/dma/contiguous.c
> > +++ b/kernel/dma/contiguous.c
> > @@ -287,8 +287,6 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
> > selected_limit,
> > &dma_contiguous_default_area,
> > fixed);
> > - if (ret)
> > - return;
> >
> > /*
> > * We need to insert the new area in our list to avoid
> > @@ -305,9 +303,11 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
> > * but we also need to insert it in our list to avoid
> > * having a default area but an empty list.
> > */
> > - ret = dma_contiguous_insert_area(dma_contiguous_default_area);
> > - if (ret)
> > - pr_warn("Couldn't queue default CMA region for heap creation.");
> > + if (!ret) {
> > + ret = dma_contiguous_insert_area(dma_contiguous_default_area);
> > + if (ret)
> > + pr_warn("Couldn't queue default CMA region for heap creation.");
> > + }
>
> Thanks for the fix!
>
> Reviewed-by: Feng Tang <feng.tang@xxxxxxxxxxxxxxxxx>
>
> one nitpick is, is the below code more readable? (I'm OK with
> your patch as is):
>
> diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
> index 90937dc7c627..3daa9ae3ab7d 100644
> --- a/kernel/dma/contiguous.c
> +++ b/kernel/dma/contiguous.c
> @@ -288,7 +288,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
> &dma_contiguous_default_area,
> fixed);
> if (ret)
> - return;
> + goto numa_resv;
>
> /*
> * We need to insert the new area in our list to avoid
> @@ -310,6 +310,7 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
> pr_warn("Couldn't queue default CMA region for heap creation.");
> }
>
> +numa_resv:
> dma_numa_cma_reserve();
> }
>