Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <CGME20210701140328epcms1p85149318b6c18fa18b3c7c8e966c14db0@epcms1p7>
 <20210701141049epcms1p774955cc32210584be5aca8f1b3126e9c@epcms1p7>
In-Reply-To: <20210701141049epcms1p774955cc32210584be5aca8f1b3126e9c@epcms1p7>
From:   Rob Herring <robh+dt@kernel.org>
Date:   Thu, 1 Jul 2021 08:51:37 -0600
Message-ID: <CAL_JsqL6LP+ksJSffTF8UU=m=u_aHLucq76HYyUio9_qDH9EdQ@mail.gmail.com>
Subject: Re: [PATCH] of: of_reserved_mem: match memblock_free with memblock_reserve
To:     ohoono.kwon@samsung.com
Cc:     "frowand.list@gmail.com" <frowand.list@gmail.com>,
        "lee.jones@linaro.org" <lee.jones@linaro.org>,
        "ohkwon1043@gmail.com" <ohkwon1043@gmail.com>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Jul 1, 2021 at 8:10 AM =EA=B6=8C=EC=98=A4=ED=9B=88 <ohoono.kwon@sam=
sung.com> wrote:
>
> When __reserved_mem_init_node called from fdt_init_reserved_mem fails,
>
> we try to undo __reserved_mem_alloc_size to prevent memory leak.
>
> 'commit d0b8ed47e83a ("of: reserved_mem: fix reserve memory leak")'

Your patch is corrupted and not plain text.

In any case, I believe this issue has already been fixed. Check the
latest kernel tree(s).

>
> Meanwhile, __reserved_mem_alloc_size calls
>
> early_init_dt_alloc_reserved_memory_arch to allocate memory,
>
> which calls
>
> 1) memblock_remove when rmem is declared nomap,
>
> 2) memblock_reserve, otherwise.
>
>
>
> static int __init early_init_dt_alloc_reserved_memory_arch(
>
> ...
>
>         if (nomap)
>
>                 return memblock_remove(base, size);
>
>
>
>         return memblock_reserve(base, size);
>
> }
>
>
>
> Therefore the proper undo-logic should be as follows:
>
> 1) memblock_add when rmem is declared nomap,
>
> 2) memblock_free, otherwise.
>
>
>
> Match the undo functions for readability.
>
>
>
> Signed-off-by: Ohhoon Kwon <ohoono.kwon@samsung.com>
>
> ---
>
>  drivers/of/of_reserved_mem.c | 3 ++-
>
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
>
>
> diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
>
> index 15e2417974d6..2279e1b55d1d 100644
>
> --- a/drivers/of/of_reserved_mem.c
>
> +++ b/drivers/of/of_reserved_mem.c
>
> @@ -273,9 +273,10 @@ void __init fdt_init_reserved_mem(void)
>
>                          if (err !=3D 0 && err !=3D -ENOENT) {
>
>                                  pr_info("node %s compatible matching fai=
l\n",
>
>                                          rmem->name);
>
> -                                memblock_free(rmem->base, rmem->size);
>
>                                  if (nomap)
>
>                                          memblock_add(rmem->base, rmem->s=
ize);
>
> +                                else
>
> +                                        memblock_free(rmem->base, rmem->=
size);
>
>                          }
>
>                  }
>
>          }
>
> --
>
> 2.17.1
>
>
>
>
>
>