sched: remove useless malloc in PIE data init
authorWeiguo Li <liwg06@foxmail.com>
Tue, 1 Mar 2022 20:32:57 +0000 (04:32 +0800)
committerThomas Monjalon <thomas@monjalon.net>
Mon, 7 Mar 2022 18:34:24 +0000 (19:34 +0100)
'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")
Cc: stable@dpdk.org
Signed-off-by: Weiguo Li <liwg06@foxmail.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
lib/sched/rte_pie.c

index cdb7bab..d37b79e 100644 (file)
@@ -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;
 }