[v3] sched: remove useless malloc in pie data init
Checks
Commit Message
'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>
---
v3:
* fix typo
v2:
* revise according to Stephen's suggestion.
---
lib/sched/rte_pie.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
Comments
On Tue, 1 Mar 2022 14:07:56 +0800
Weiguo Li <liwg06@foxmail.com> wrote:
> '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>
> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Tuesday, March 1, 2022 5:08 PM
> To: Weiguo Li <liwg06@foxmail.com>
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Singh, Jasvinder
> <jasvinder.singh@intel.com>; wojciechx.liguzinski@intel.com; dev@dpdk.org
> Subject: Re: [PATCH v3] sched: remove useless malloc in pie data init
>
> On Tue, 1 Mar 2022 14:07:56 +0800
> Weiguo Li <liwg06@foxmail.com> wrote:
>
> > '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>
Hi Li,
I suggest you also replace all the assignments to zero in this function with a memset(0) of the entire structure. I see we set all fields to zero by direct assignment, with the exception of qlen_bytes, which looks like another small issue to me that we could fix here. The memset(0) should work even if later on we might need to set some fields to a non-zero value, as this can be done immediately after the memset(0). Ok with you?
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
@@ -15,13 +15,8 @@ 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;