* Re: [PATCH] remoteproc: k3: Call of_node_put(rmem_np) only once in three functions
2024-09-24 12:43 [PATCH] remoteproc: k3: Call of_node_put(rmem_np) only once in three functions Markus Elfring
@ 2024-09-24 14:32 ` Martyn Welch
2024-09-24 15:29 ` Andrew Davis
2024-09-30 16:45 ` Mathieu Poirier
2 siblings, 0 replies; 4+ messages in thread
From: Martyn Welch @ 2024-09-24 14:32 UTC (permalink / raw)
To: Markus Elfring, linux-remoteproc, Andrew Davis, Bjorn Andersson,
Hari Nagalla, Mathieu Poirier, Suman Anna, Wadim Egorov
Cc: LKML, kernel-janitors, Krzysztof Kozlowski
On Tue, 2024-09-24 at 14:43 +0200, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 24 Sep 2024 14:28:35 +0200
>
> An of_node_put(rmem_np) call was immediately used after a pointer
> check
> for a of_reserved_mem_lookup() call in three function
> implementations.
> Thus call such a function only once instead directly before the
> checks.
>
> This issue was transformed by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
reviewed-by: Martyn Welch <martyn.welch@collabora.com>
> ---
> drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++----
> drivers/remoteproc/ti_k3_m4_remoteproc.c | 6 ++----
> drivers/remoteproc/ti_k3_r5_remoteproc.c | 3 +--
> 3 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> index 8be3f631c192..d08a3a98ada1 100644
> --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> @@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct
> k3_dsp_rproc *kproc)
> return -EINVAL;
>
> rmem = of_reserved_mem_lookup(rmem_np);
> - if (!rmem) {
> - of_node_put(rmem_np);
> - return -EINVAL;
> - }
> of_node_put(rmem_np);
> + if (!rmem)
> + return -EINVAL;
>
> kproc->rmem[i].bus_addr = rmem->base;
> /* 64-bit address regions currently not supported */
> diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c
> b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> index 09f0484a90e1..a16fb165fced 100644
> --- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> @@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct
> k3_m4_rproc *kproc)
> return -EINVAL;
>
> rmem = of_reserved_mem_lookup(rmem_np);
> - if (!rmem) {
> - of_node_put(rmem_np);
> - return -EINVAL;
> - }
> of_node_put(rmem_np);
> + if (!rmem)
> + return -EINVAL;
>
> kproc->rmem[i].bus_addr = rmem->base;
> /* 64-bit address regions currently not supported */
> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> index 747ee467da88..d0ebdd5cfa70 100644
> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> @@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct
> k3_r5_rproc *kproc)
> }
>
> rmem = of_reserved_mem_lookup(rmem_np);
> + of_node_put(rmem_np);
> if (!rmem) {
> - of_node_put(rmem_np);
> ret = -EINVAL;
> goto unmap_rmem;
> }
> - of_node_put(rmem_np);
>
> kproc->rmem[i].bus_addr = rmem->base;
> /*
> --
> 2.46.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] remoteproc: k3: Call of_node_put(rmem_np) only once in three functions
2024-09-24 12:43 [PATCH] remoteproc: k3: Call of_node_put(rmem_np) only once in three functions Markus Elfring
2024-09-24 14:32 ` Martyn Welch
@ 2024-09-24 15:29 ` Andrew Davis
2024-09-30 16:45 ` Mathieu Poirier
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Davis @ 2024-09-24 15:29 UTC (permalink / raw)
To: Markus Elfring, linux-remoteproc, Bjorn Andersson, Hari Nagalla,
Martyn Welch, Mathieu Poirier, Suman Anna, Wadim Egorov
Cc: LKML, kernel-janitors, Krzysztof Kozlowski
On 9/24/24 7:43 AM, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 24 Sep 2024 14:28:35 +0200
>
> An of_node_put(rmem_np) call was immediately used after a pointer check
> for a of_reserved_mem_lookup() call in three function implementations.
> Thus call such a function only once instead directly before the checks.
>
> This issue was transformed by using the Coccinelle software.
>
Quick check of all the users of of_reserved_mem_lookup(), they almost
all do the same thing, get the phandle, mem_lookup, then node_put.
Maybe a helper function like this:
struct reserved_mem *of_reserved_mem_region_lookup(const struct device_node *node, int index)
{
struct device_node *np;
struct reserved_mem *rmem;
np = of_parse_phandle(node, "memory-region", index);
if (!np)
return ERR_PTR(-ENODEV);
rmem = of_reserved_mem_lookup(np);
of_node_put(np);
if (!rmem)
return ERR_PTR(-EINVAL);
return rmem;
}
Added to of_reserved_mem.c would allow us to clean up these cases in
this patch, and then several more spots (and also help force standard
property name usage).
Andrew
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++----
> drivers/remoteproc/ti_k3_m4_remoteproc.c | 6 ++----
> drivers/remoteproc/ti_k3_r5_remoteproc.c | 3 +--
> 3 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> index 8be3f631c192..d08a3a98ada1 100644
> --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> @@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
> return -EINVAL;
>
> rmem = of_reserved_mem_lookup(rmem_np);
> - if (!rmem) {
> - of_node_put(rmem_np);
> - return -EINVAL;
> - }
> of_node_put(rmem_np);
> + if (!rmem)
> + return -EINVAL;
>
> kproc->rmem[i].bus_addr = rmem->base;
> /* 64-bit address regions currently not supported */
> diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> index 09f0484a90e1..a16fb165fced 100644
> --- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> @@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct k3_m4_rproc *kproc)
> return -EINVAL;
>
> rmem = of_reserved_mem_lookup(rmem_np);
> - if (!rmem) {
> - of_node_put(rmem_np);
> - return -EINVAL;
> - }
> of_node_put(rmem_np);
> + if (!rmem)
> + return -EINVAL;
>
> kproc->rmem[i].bus_addr = rmem->base;
> /* 64-bit address regions currently not supported */
> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> index 747ee467da88..d0ebdd5cfa70 100644
> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> @@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
> }
>
> rmem = of_reserved_mem_lookup(rmem_np);
> + of_node_put(rmem_np);
> if (!rmem) {
> - of_node_put(rmem_np);
> ret = -EINVAL;
> goto unmap_rmem;
> }
> - of_node_put(rmem_np);
>
> kproc->rmem[i].bus_addr = rmem->base;
> /*
> --
> 2.46.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] remoteproc: k3: Call of_node_put(rmem_np) only once in three functions
2024-09-24 12:43 [PATCH] remoteproc: k3: Call of_node_put(rmem_np) only once in three functions Markus Elfring
2024-09-24 14:32 ` Martyn Welch
2024-09-24 15:29 ` Andrew Davis
@ 2024-09-30 16:45 ` Mathieu Poirier
2 siblings, 0 replies; 4+ messages in thread
From: Mathieu Poirier @ 2024-09-30 16:45 UTC (permalink / raw)
To: Markus Elfring
Cc: linux-remoteproc, Andrew Davis, Bjorn Andersson, Hari Nagalla,
Martyn Welch, Suman Anna, Wadim Egorov, LKML, kernel-janitors,
Krzysztof Kozlowski
On Tue, Sep 24, 2024 at 02:43:40PM +0200, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 24 Sep 2024 14:28:35 +0200
>
> An of_node_put(rmem_np) call was immediately used after a pointer check
> for a of_reserved_mem_lookup() call in three function implementations.
> Thus call such a function only once instead directly before the checks.
>
> This issue was transformed by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/remoteproc/ti_k3_dsp_remoteproc.c | 6 ++----
> drivers/remoteproc/ti_k3_m4_remoteproc.c | 6 ++----
> drivers/remoteproc/ti_k3_r5_remoteproc.c | 3 +--
> 3 files changed, 5 insertions(+), 10 deletions(-)
>
Applied.
Thanks,
Mathieu
> diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> index 8be3f631c192..d08a3a98ada1 100644
> --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> @@ -576,11 +576,9 @@ static int k3_dsp_reserved_mem_init(struct k3_dsp_rproc *kproc)
> return -EINVAL;
>
> rmem = of_reserved_mem_lookup(rmem_np);
> - if (!rmem) {
> - of_node_put(rmem_np);
> - return -EINVAL;
> - }
> of_node_put(rmem_np);
> + if (!rmem)
> + return -EINVAL;
>
> kproc->rmem[i].bus_addr = rmem->base;
> /* 64-bit address regions currently not supported */
> diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> index 09f0484a90e1..a16fb165fced 100644
> --- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> @@ -433,11 +433,9 @@ static int k3_m4_reserved_mem_init(struct k3_m4_rproc *kproc)
> return -EINVAL;
>
> rmem = of_reserved_mem_lookup(rmem_np);
> - if (!rmem) {
> - of_node_put(rmem_np);
> - return -EINVAL;
> - }
> of_node_put(rmem_np);
> + if (!rmem)
> + return -EINVAL;
>
> kproc->rmem[i].bus_addr = rmem->base;
> /* 64-bit address regions currently not supported */
> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> index 747ee467da88..d0ebdd5cfa70 100644
> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> @@ -1001,12 +1001,11 @@ static int k3_r5_reserved_mem_init(struct k3_r5_rproc *kproc)
> }
>
> rmem = of_reserved_mem_lookup(rmem_np);
> + of_node_put(rmem_np);
> if (!rmem) {
> - of_node_put(rmem_np);
> ret = -EINVAL;
> goto unmap_rmem;
> }
> - of_node_put(rmem_np);
>
> kproc->rmem[i].bus_addr = rmem->base;
> /*
> --
> 2.46.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread