diff mbox series

[v5] sched: remove useless malloc in pie data init

Message ID tencent_400C07CFD7297584B78EF737D60880484406@qq.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v5] sched: remove useless malloc in pie data init |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/github-robot: build success github build: passed
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-abi-testing success Testing PASS

Commit Message

Weiguo Li March 1, 2022, 8:32 p.m. UTC 
  'rte_pie_rt_data_init(NULL)' is not expected, and it's ought to
fail when this happen. The malloc inside the function didn't work.
So remove the malloc otherwise will lead to a memory leak.

Fixes: 44c730b0e37971 ("sched: add PIE based congestion management")

Signed-off-by: Weiguo Li <liwg06@foxmail.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
v5:
* fix compile error
v4:
* replace all assignments to zero by a memset.
v3:
* fix typo
v2:
* revise according to Stephen's suggestion.
---
 lib/sched/rte_pie.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

Comments

Thomas Monjalon March 7, 2022, 6:35 p.m. UTC | #1 
01/03/2022 21:32, Weiguo Li:
> 'rte_pie_rt_data_init(NULL)' is not expected, and it's ought to
> fail when this happen. The malloc inside the function didn't work.
> So remove the malloc otherwise will lead to a memory leak.
> 
> Fixes: 44c730b0e37971 ("sched: add PIE based congestion management")
> 
> Signed-off-by: Weiguo Li <liwg06@foxmail.com>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
> ---
> v5:
> * fix compile error
> v4:
> * replace all assignments to zero by a memset.
> v3:
> * fix typo
> v2:
> * revise according to Stephen's suggestion.

Applied, thanks.
diff mbox series

Patch

diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index cdb7bab697..d37b79e6dd 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -3,6 +3,7 @@ 
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "rte_pie.h"
 #include <rte_malloc.h>
@@ -15,26 +16,11 @@  int
 rte_pie_rt_data_init(struct rte_pie *pie)
 {
 	if (pie == NULL) {
-		/* Allocate memory to use the PIE data structure */
-		pie = rte_malloc(NULL, sizeof(struct rte_pie), 0);
-
-		if (pie == NULL)
-			RTE_LOG(ERR, SCHED, "%s: Memory allocation fails\n", __func__);
-
-		return -1;
+		RTE_LOG(ERR, SCHED, "%s: Invalid addr for pie\n", __func__);
+		return -EINVAL;
 	}
 
-	pie->active = 0;
-	pie->in_measurement = 0;
-	pie->departed_bytes_count = 0;
-	pie->start_measurement = 0;
-	pie->last_measurement = 0;
-	pie->qlen = 0;
-	pie->avg_dq_time = 0;
-	pie->burst_allowance = 0;
-	pie->qdelay_old = 0;
-	pie->drop_prob = 0;
-	pie->accu_prob = 0;
+	memset(pie, 0, sizeof(*pie));
 
 	return 0;
 }