librte_metrics: fix memory leak
PATCH 1/1 librte_metrics: fix memory leak
Fix memory leak for sequential allocations.
--- lib/librte_metrics/rte_metrics_telemetry.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
lib/librte_metrics/rte_metrics_telemetry.c +7 -1
@@ -167,9 +167,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; }
Signature · 1 line
2.17.1
<snip>
Hi Gaurav,
One comment inline.
Quoted 20 lines
Fix memory leak for sequential allocations.
Signed-off-by Gaurav Singh <[email protected]>--- lib/librte_metrics/rte_metrics_telemetry.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)lib/librte_metrics/rte_metrics_telemetry.c +2
-0@@ -167,9 +167,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" );
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_format_port(uint32_t pid, json_t · line 181
Quoted 10 lines
lib/librte_metrics/rte_metrics_telemetry.c +5
-1+return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; }
There is a similar error in function 'rte_metrics_tel_reg_port_ethdev_to_metrics', can you fix that as well?
Quoted 3 lines
--
2.17.1
PATCH 1/1 librte_metrics: fix memory leak
In reply to Gaurav SinghFix memory leak for sequential allocations.
--- lib/librte_metrics/rte_metrics_telemetry.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
lib/librte_metrics/rte_metrics_telemetry.c +15 -2
@@ -41,11 +41,18 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) } xstats_names =malloc (sizeof (*xstats_names) * num_xstats); +if (xstats_names ==NULL ) { +METRICS_LOG_ERR ("Failed to malloc memory for xstats_names" ); + ret = -ENOMEM ; + goto free_xstats; + } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { +if (eth_xstats_names ==NULL ) {METRICS_LOG_ERR ("Failed to malloc memory for xstats_names" ); ret = -ENOMEM ; +free (xstats_names); goto free_xstats; }
@@ -167,9 +174,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; }
Signature · 1 line
2.17.1
PATCH 1/1 librte_metrics: fix memory leak
In reply to Gaurav SinghFix memory leak issue
--- lib/librte_metrics/rte_metrics_telemetry.c | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
lib/librte_metrics/rte_metrics_telemetry.c +17 -7
@@ -41,12 +41,19 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) } xstats_names =malloc (sizeof (*xstats_names) * num_xstats); +if (xstats_names ==NULL ) { +METRICS_LOG_ERR ("Failed to malloc memory for xstats_names" ); + ret = -ENOMEM ; +return ret; + } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { +if (eth_xstats_names ==NULL ) {METRICS_LOG_ERR ("Failed to malloc memory for xstats_names" ); ret = -ENOMEM ; - goto free_xstats; +free (xstats_names); +return ret; } if (rte_eth_xstats_get_names(port_id,
@@ -54,7 +61,7 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)METRICS_LOG_ERR ("rte_eth_xstats_get_names(%u) len %d failed" , port_id, num_xstats); ret = -EPERM ; - goto free_xstats; +return ret; }for (i =0 ; i < num_xstats; i++)
@@ -63,9 +70,6 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)if (ret <0 )METRICS_LOG_ERR ("rte_metrics_reg_names failed - metrics may already be registered" ); -free_xstats: -free (eth_xstats_names); -free (xstats_names);return ret; }
@@ -167,9 +171,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; }
Signature · 1 line
2.17.1
Hi Gaurav,
Thanks for the fix. Few comments inline. Also, please follow contributing guidelines [1]. There is a cheat sheet [2] which is very helpful.
[1] https://doc.dpdk.org/guides/contributing/index.html
[2] https://doc.dpdk.org/guides/contributing/cheatsheet.html
Quoted 6 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Gaurav Singh
Sent: Saturday, August 1, 2020 1:09 AM
To: [email protected]
Cc: Gaurav Singh <[email protected]>
Subject: [dpdk-dev] [PATCH]librte_metrics: fix memory leak
^^^^^^^^^^^^ should be 'lib/metrics'
Quoted 4 lines
Fix memory leak issue
Needs "Fixes" tag and Cc to [email protected] (check the contribution guidelines)
Quoted 11 lines
Signed-off-by Gaurav Singh <[email protected]>--- lib/librte_metrics/rte_metrics_telemetry.c | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)lib/librte_metrics/rte_metrics_telemetry.c +0
-0
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t · line 49
Quoted 9 lines
lib/librte_metrics/rte_metrics_telemetry.c +4
-0@@ -41,12 +41,19 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) } xstats_names =malloc (sizeof (*xstats_names) * num_xstats); +if (xstats_names ==NULL ) { +METRICS_LOG_ERR ("Failed to malloc memory for xstats_names"); + ret = -ENOMEM ; +return ret;
You can return -ENOMEM directly without assigning it to 'ret'
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)
Quoted 8 lines
lib/librte_metrics/rte_metrics_telemetry.c +3
-1+ } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { +if (eth_xstats_names ==NULL ) {METRICS_LOG_ERR ("Failed to malloc memory for xstats_names");
^^^^^^^^^^^^ I think it is worth changing to eth_xstats_names
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) · line 56
Quoted 4 lines
lib/librte_metrics/rte_metrics_telemetry.c +2
-1ret = -ENOMEM ; - goto free_xstats; +free (xstats_names); +return ret;
Same here, return -ENOMEM directly
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t · line 66
Quoted 11 lines
lib/librte_metrics/rte_metrics_telemetry.c +1
-1} if (rte_eth_xstats_get_names(port_id,@@ -54,7 +61,7 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) METRICS_LOG_ERR("rte_eth_xstats_get_names(%u) len %d failed",port_id ,num_xstats ); ret = -EPERM ; - goto free_xstats; +return ret;
Any reason for this change? This change leaks memory.
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t · line 70
Quoted 12 lines
lib/librte_metrics/rte_metrics_telemetry.c +0
-0}lib/librte_metrics/rte_metrics_telemetry.c +0
-3for (i =0 ; i < num_xstats; i++)@@ -63,9 +70,6 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)if (ret <0 ) METRICS_LOG_ERR("rte_metrics_reg_names failed - metrics may already be registered"); -free_xstats: - free(eth_xstats_names); -free (xstats_names);
Any reason for this change? This is leaking memory in the successful case.
Quoted 23 lines
lib/librte_metrics/rte_metrics_telemetry.c +0
-0return ret;}
lib/librte_metrics/rte_metrics_telemetry.c +7
-2@@ -167,9 +171,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; } --2.17.1
PATCH 1/1 lib/metrics: fix memory leak
In reply to Gaurav Singhfix memory leak
--- lib/librte_metrics/rte_metrics_telemetry.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
lib/librte_metrics/rte_metrics_telemetry.c +16 -5
@@ -41,12 +41,17 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) } xstats_names =malloc (sizeof (*xstats_names) * num_xstats); +if (xstats_names ==NULL ) { +METRICS_LOG_ERR ("Failed to malloc memory for xstats_names" ); +return -ENOMEM ; + } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { -METRICS_LOG_ERR ("Failed to malloc memory for xstats_names" ); - ret = -ENOMEM ; - goto free_xstats; +if (eth_xstats_names ==NULL ) { +METRICS_LOG_ERR ("Failed to malloc memory for eth_xstats_names" ); +free (xstats_names); +return -ENOMEM ; } if (rte_eth_xstats_get_names(port_id,
@@ -167,9 +172,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; }
Signature · 1 line
2.17.1
Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
<snip>
Quoted 60 lines
fix memory leak
Fixes c5b7197f66 ("telemetry: move some functions to metrics library")Signed-off-by Gaurav Singh <[email protected]>--- lib/librte_metrics/rte_metrics_telemetry.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)lib/librte_metrics/rte_metrics_telemetry.c +7
-4@@ -41,12 +41,17 @@ rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) } xstats_names =malloc (sizeof (*xstats_names) * num_xstats); +if (xstats_names ==NULL ) { +METRICS_LOG_ERR ("Failed to malloc memory for xstats_names"); +return -ENOMEM ; + } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { -METRICS_LOG_ERR ("Failed to malloc memory for xstats_names"); - ret = -ENOMEM ; - goto free_xstats; + if (eth_xstats_names == NULL) { + METRICS_LOG_ERR("Failed to malloc memory for
eth_xstats_names");lib/librte_metrics/rte_metrics_telemetry.c +9
-2+free (xstats_names); +return -ENOMEM ; } if (rte_eth_xstats_get_names(port_id,@@ -167,9 +172,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; } --
Quoted 1 line
2.17.1
Looks good.
Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
Hi Gaurav,
Quoted 8 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Honnappa Nagarahalli
Sent: Tuesday 11 August 2020 22:01
To: Gaurav Singh <[email protected]>; [email protected]
Cc: nd <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>
Subject: Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
Quoted 12 lines
<snip>
Quoted 10 lines
fix memory leak
Fixes c5b7197f66 ("telemetry: move some functions to metricslibrary")
Signed-off-by Gaurav Singh <[email protected]>--- lib/librte_metrics/rte_metrics_telemetry.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
I think this commit message should be more descriptive, and is missing Cc: [email protected]
Quoted 22 lines
Quoted 22 lines
lib/librte_metrics/rte_metrics_telemetry.c +0
-0@@ -41,12 +41,17 @@
rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)lib/librte_metrics/rte_metrics_telemetry.c +2
-0} xstats_names =malloc (sizeof (*xstats_names) * num_xstats); +if (xstats_names ==NULL ) { + METRICS_LOG_ERR("Failed to malloc memory for
xstats_names");lib/librte_metrics/rte_metrics_telemetry.c +3
-2+return -ENOMEM ; + } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { - METRICS_LOG_ERR("Failed to malloc memory for
xstats_names");
Quoted 8 lines
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) · line 55
Quoted 8 lines
lib/librte_metrics/rte_metrics_telemetry.c +2
-2- ret = -ENOMEM ; - goto free_xstats; +if (eth_xstats_names ==NULL ) { + METRICS_LOG_ERR("Failed to malloc memory for
eth_xstats_names");lib/librte_metrics/rte_metrics_telemetry.c +2
-0+free (xstats_names); +return -ENOMEM ; }
Is there a reason for the above changes? I think they are unrelated to the memory leak this patch is fixing.
Quoted 5 lines
Quoted 5 lines
lib/librte_metrics/rte_metrics_telemetry.c +0
-0if (rte_eth_xstats_get_names(port_id,@@ -167,9 +172,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, }
Quoted 13 lines
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_format_port(uint32_t pid, json_t *ports, · line 185
Quoted 13 lines
lib/librte_metrics/rte_metrics_telemetry.c +7
-1metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" ); +free (metrics);return -ENOMEM ; }
This does fix the resource leak, but I do think it can be done in a simpler way, as shown in the patch I sent to fix the logged coverity issue for this: https://patchwork.dpdk.org/patch/78052/
I will remove my patch seeing as this patch is fixing the same thing.
Thanks,
Ciara
Quoted 5 lines
Quoted 2 lines
--
2.17.1Looks good.
Reviewed-by Honnappa Nagarahalli <[email protected]>
Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
Hello Gaurav,
Quoted 74 lines · Ciara
Quoted 8 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Honnappa Nagarahalli
Sent: Tuesday 11 August 2020 22:01
To: Gaurav Singh <[email protected]>; [email protected]
Cc: nd <[email protected]>; Honnappa Nagarahalli <[email protected]>; nd <[email protected]>
Subject: Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leakQuoted 12 lines
<snip>
Quoted 10 lines
fix memory leak
Fixes c5b7197f66 ("telemetry: move some functions to metricslibrary")
Signed-off-by Gaurav Singh <[email protected]>--- lib/librte_metrics/rte_metrics_telemetry.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)I think this commit message should be more descriptive, and is missing Cc: [email protected]
Quoted 22 lines
Quoted 22 lines
lib/librte_metrics/rte_metrics_telemetry.c +0
-0@@ -41,12 +41,17 @@
rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id)} xstats_names = malloc(sizeof(*xstats_names) * num_xstats);lib/librte_metrics/rte_metrics_telemetry.c +2
-0+if (xstats_names ==NULL ) { + METRICS_LOG_ERR("Failed to malloc memory for
xstats_names");lib/librte_metrics/rte_metrics_telemetry.c +3
-2+return -ENOMEM ; + } + eth_xstats_names =malloc (sizeof (struct rte_eth_xstat_name ) * num_xstats); -if (eth_xstats_names ==NULL || xstats_names ==NULL ) { - METRICS_LOG_ERR("Failed to malloc memory for
xstats_names");Quoted 8 lines
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) · line 55
Quoted 8 lines
lib/librte_metrics/rte_metrics_telemetry.c +2
-2- ret = -ENOMEM ; - goto free_xstats; +if (eth_xstats_names ==NULL ) { + METRICS_LOG_ERR("Failed to malloc memory for
eth_xstats_names");lib/librte_metrics/rte_metrics_telemetry.c +2
-0+free (xstats_names); +return -ENOMEM ; }Is there a reason for the above changes? I think they are unrelated to the memory leak this patch is fixing.
Quoted 15 lines
Quoted 15 lines
if (rte_eth_xstats_get_names(port_id,
lib/librte_metrics/rte_metrics_telemetry.c +6
-1@@ -167,9 +172,15 @@ rte_metrics_tel_format_port(uint32_t pid, json_t *ports, } metrics =malloc (sizeof (struct rte_metric_value ) * num_metrics); +if (metrics ==NULL ) { +METRICS_LOG_ERR ("Cannot allocate memory" ); +return -ENOMEM ; + } + names =malloc (sizeof (struct rte_metric_name ) * num_metrics); -if (metrics ==NULL || names ==NULL ) { +if (names ==NULL ) {METRICS_LOG_ERR ("Cannot allocate memory" );
Quoted 8 lines
Quoted 3 lines
lib/librte_metrics/rte_metrics_telemetry.c rte_metrics_tel_format_port(uint32_t pid, json_t *ports, · line 185
Quoted 3 lines
lib/librte_metrics/rte_metrics_telemetry.c +1
-0+free (metrics);return -ENOMEM ; }This does fix the resource leak, but I do think it can be done in a simpler way, as shown in the patch I sent to fix the logged coverity issue for this: https://patchwork.dpdk.org/patch/78052/
I will remove my patch seeing as this patch is fixing the same thing.
I agree with Ciara.
Could you respin?
Thanks.
Signature · 1 line
David Marchand
Re: [dpdk-dev] [PATCH] lib/metrics: fix memory leak
Quoted 7 lines · David Marchand
Quoted 4 lines
This does fix the resource leak, but I do think it can be done in a simpler way, as shown in the patch I sent to fix the logged coverity issue for this: https://patchwork.dpdk.org/patch/78052/
I will remove my patch seeing as this patch is fixing the same thing.I agree with Ciara.
Could you respin?
I went with Ciara patch as it is minimal and ready to be merged. Thanks.
Signature · 1 line
David Marchand