DPDK patches and discussions
 help / color / mirror / Atom feed
From: Weiguo Li <liwg06@foxmail.com>
To: cristian.dumitrescu@intel.com
Cc: jasvinder.singh@intel.com, dev@dpdk.org,
	Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v5] sched: remove useless malloc in pie data init
Date: Wed,  2 Mar 2022 04:32:57 +0800	[thread overview]
Message-ID: <tencent_400C07CFD7297584B78EF737D60880484406@qq.com> (raw)
In-Reply-To: <DM8PR11MB567001E1EA7A38A4EB00F9F2EB029@DM8PR11MB5670.namprd11.prod.outlook.com>

'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(-)

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;
 }
-- 
2.25.1


  parent reply	other threads:[~2022-03-01 20:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-26 14:55 [PATCH] sched: add parentheses to if clause Weiguo Li
2022-02-26 17:31 ` Stephen Hemminger
2022-02-27  5:23   ` Weiguo Li
2022-02-27  5:25 ` [PATCH v2] sched: remove useless malloc in pie data init Weiguo Li
2022-03-01  6:07   ` [PATCH v3] " Weiguo Li
2022-03-01 17:08     ` Stephen Hemminger
2022-03-01 18:00       ` Dumitrescu, Cristian
2022-03-01 18:58         ` [PATCH v4] " Weiguo Li
2022-03-01 20:32         ` Weiguo Li [this message]
2022-03-07 18:35           ` [PATCH v5] " Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tencent_400C07CFD7297584B78EF737D60880484406@qq.com \
    --to=liwg06@foxmail.com \
    --cc=cristian.dumitrescu@intel.com \
    --cc=dev@dpdk.org \
    --cc=jasvinder.singh@intel.com \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).