* Re: [dpdk-stable] [PATCH] lib: fix to free trail queue entry after use
2018-11-13 11:45 [dpdk-stable] [PATCH] lib: fix to free trail queue entry after use Hari Kumar Vemula
@ 2018-11-13 16:43 ` Pattan, Reshma
2018-11-14 11:17 ` [dpdk-stable] [PATCH v2] lib/efd: fix to free tail " Hari Kumar Vemula
` (3 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Pattan, Reshma @ 2018-11-13 16:43 UTC (permalink / raw)
To: Vemula, Hari KumarX, dev; +Cc: Marohn, Byron, De Lara Guarch, Pablo, stable
> -----Original Message-----
> From: Vemula, Hari KumarX
> Sent: Tuesday, November 13, 2018 11:46 AM
> To: dev@dpdk.org
> Cc: Pattan, Reshma <reshma.pattan@intel.com>; Marohn, Byron
> <byron.marohn@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Vemula, Hari KumarX
> <hari.kumarx.vemula@intel.com>; stable@dpdk.org
> Subject: [PATCH] lib: fix to free trail queue entry after use
Nit: heading should have lib/efd:
Other than that
Acked-by : Reshma Pattan <reshma.pattan@intel.com>
^ permalink raw reply [flat|nested] 13+ messages in thread* [dpdk-stable] [PATCH v2] lib/efd: fix to free tail queue entry after use
2018-11-13 11:45 [dpdk-stable] [PATCH] lib: fix to free trail queue entry after use Hari Kumar Vemula
2018-11-13 16:43 ` Pattan, Reshma
@ 2018-11-14 11:17 ` Hari Kumar Vemula
2018-11-18 14:57 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
2018-11-23 13:30 ` Maxime Coquelin
2019-01-11 11:49 ` [dpdk-stable] [PATCH v3] " Hari Kumar Vemula
` (2 subsequent siblings)
4 siblings, 2 replies; 13+ messages in thread
From: Hari Kumar Vemula @ 2018-11-14 11:17 UTC (permalink / raw)
To: dev
Cc: byron.marohn, reshma.pattan, pablo.de.lara.guarch,
Hari Kumar Vemula, stable
In rte_efd_create() allocated memory for tail queue entry but
not freed.
Added freeing the tail queue entry.
Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
Cc: stable@dpdk.org
Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
---
v2: Updated commit message.
---
lib/librte_efd/rte_efd.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
index a780e2fe8..f8c6c447f 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -739,17 +739,38 @@ void
rte_efd_free(struct rte_efd_table *table)
{
uint8_t socket_id;
+ struct rte_efd_list *efd_list = NULL;
+ struct rte_tailq_entry *te;
if (table == NULL)
return;
+ efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
+
for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
rte_free(table->chunks[socket_id]);
+ rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+
+ /* find our tailq entry */
+ TAILQ_FOREACH(te, efd_list, next) {
+ if (te->data == (void *) table)
+ break;
+ }
+
+ if (te == NULL) {
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+ return;
+ }
+
+ TAILQ_REMOVE(efd_list, te, next);
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+
rte_ring_free(table->free_slots);
rte_free(table->offline_chunks);
rte_free(table->keys);
rte_free(table);
+ rte_free(te);
}
/**
--
2.13.6
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] lib/efd: fix to free tail queue entry after use
2018-11-14 11:17 ` [dpdk-stable] [PATCH v2] lib/efd: fix to free tail " Hari Kumar Vemula
@ 2018-11-18 14:57 ` Thomas Monjalon
2018-11-23 13:30 ` Maxime Coquelin
1 sibling, 0 replies; 13+ messages in thread
From: Thomas Monjalon @ 2018-11-18 14:57 UTC (permalink / raw)
To: byron.marohn
Cc: dev, Hari Kumar Vemula, reshma.pattan, pablo.de.lara.guarch, stable
This patch is not trivial, it may require an ack from a maintainer,
Pablo is unavailable this month.
Byron, any comment please?
14/11/2018 12:17, Hari Kumar Vemula:
> In rte_efd_create() allocated memory for tail queue entry but
> not freed.
> Added freeing the tail queue entry.
>
> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> Cc: stable@dpdk.org
>
> Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] lib/efd: fix to free tail queue entry after use
2018-11-14 11:17 ` [dpdk-stable] [PATCH v2] lib/efd: fix to free tail " Hari Kumar Vemula
2018-11-18 14:57 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
@ 2018-11-23 13:30 ` Maxime Coquelin
2018-11-23 14:39 ` Maxime Coquelin
1 sibling, 1 reply; 13+ messages in thread
From: Maxime Coquelin @ 2018-11-23 13:30 UTC (permalink / raw)
To: Hari Kumar Vemula, dev
Cc: byron.marohn, reshma.pattan, pablo.de.lara.guarch, stable
On 11/14/18 12:17 PM, Hari Kumar Vemula wrote:
> In rte_efd_create() allocated memory for tail queue entry but
> not freed.
> Added freeing the tail queue entry.
>
> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> Cc: stable@dpdk.org
>
> Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
>
> ---
> v2: Updated commit message.
> ---
>
> lib/librte_efd/rte_efd.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
> index a780e2fe8..f8c6c447f 100644
> --- a/lib/librte_efd/rte_efd.c
> +++ b/lib/librte_efd/rte_efd.c
> @@ -739,17 +739,38 @@ void
> rte_efd_free(struct rte_efd_table *table)
> {
> uint8_t socket_id;
> + struct rte_efd_list *efd_list = NULL;
NULL init seems useless here.
> + struct rte_tailq_entry *te;
>
> if (table == NULL)
> return;
>
> + efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
> +
> for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
> rte_free(table->chunks[socket_id]);
>
> + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
> +
> + /* find our tailq entry */
> + TAILQ_FOREACH(te, efd_list, next) {
> + if (te->data == (void *) table)
> + break;
> + }
> +
> + if (te == NULL) {
> + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
> + return;
> + }
> +
> + TAILQ_REMOVE(efd_list, te, next);
> + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
Wouldn't this be simpler by using TAILQ_FOREACH_SAFE() instead?
The element could removed from the list and freed within the loop.
> +
> rte_ring_free(table->free_slots);
> rte_free(table->offline_chunks);
> rte_free(table->keys);
> rte_free(table);
> + rte_free(te);
> }
>
> /**
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v2] lib/efd: fix to free tail queue entry after use
2018-11-23 13:30 ` Maxime Coquelin
@ 2018-11-23 14:39 ` Maxime Coquelin
0 siblings, 0 replies; 13+ messages in thread
From: Maxime Coquelin @ 2018-11-23 14:39 UTC (permalink / raw)
To: Hari Kumar Vemula, dev
Cc: byron.marohn, reshma.pattan, pablo.de.lara.guarch, stable
On 11/23/18 2:30 PM, Maxime Coquelin wrote:
>
>
> On 11/14/18 12:17 PM, Hari Kumar Vemula wrote:
>> In rte_efd_create() allocated memory for tail queue entry but
>> not freed.
>> Added freeing the tail queue entry.
>>
>> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
>> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
>>
>> ---
>> v2: Updated commit message.
>> ---
>>
>> lib/librte_efd/rte_efd.c | 21 +++++++++++++++++++++
>> 1 file changed, 21 insertions(+)
>>
>> diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
>> index a780e2fe8..f8c6c447f 100644
>> --- a/lib/librte_efd/rte_efd.c
>> +++ b/lib/librte_efd/rte_efd.c
>> @@ -739,17 +739,38 @@ void
>> rte_efd_free(struct rte_efd_table *table)
>> {
>> uint8_t socket_id;
>> + struct rte_efd_list *efd_list = NULL;
>
> NULL init seems useless here.
>
>> + struct rte_tailq_entry *te;
>> if (table == NULL)
>> return;
>> + efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
>> +
>> for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
>> rte_free(table->chunks[socket_id]);
>> + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
>> +
>> + /* find our tailq entry */
>> + TAILQ_FOREACH(te, efd_list, next) {
>> + if (te->data == (void *) table)
>> + break;
>> + }
>> +
>> + if (te == NULL) {
>> + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
>> + return;
And in this case, I think there is a leak, as all table stuffs don't get
freed.
>> + }
>> +
>> + TAILQ_REMOVE(efd_list, te, next);
>> + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
>
> Wouldn't this be simpler by using TAILQ_FOREACH_SAFE() instead?
> The element could removed from the list and freed within the loop.
>
>> +
>> rte_ring_free(table->free_slots);
>> rte_free(table->offline_chunks);
>> rte_free(table->keys);
>> rte_free(table);
>> + rte_free(te);
>> }
>> /**
>>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-stable] [PATCH v3] lib/efd: fix to free tail queue entry after use
2018-11-13 11:45 [dpdk-stable] [PATCH] lib: fix to free trail queue entry after use Hari Kumar Vemula
2018-11-13 16:43 ` Pattan, Reshma
2018-11-14 11:17 ` [dpdk-stable] [PATCH v2] lib/efd: fix to free tail " Hari Kumar Vemula
@ 2019-01-11 11:49 ` Hari Kumar Vemula
2019-01-14 22:30 ` Thomas Monjalon
2019-01-17 13:36 ` [dpdk-stable] [PATCH v4] " Hari Kumar Vemula
2019-01-18 7:40 ` [dpdk-stable] [PATCH v5] " Hari Kumar Vemula
4 siblings, 1 reply; 13+ messages in thread
From: Hari Kumar Vemula @ 2019-01-11 11:49 UTC (permalink / raw)
To: dev
Cc: byron.marohn, reshma.pattan, pablo.de.lara.guarch,
jananeex.m.parthasarathy, Hari Kumar Vemula, stable
In rte_efd_create() allocated memory for tail queue entry but
not freed.
Added freeing the tail queue entry.
Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
Cc: stable@dpdk.org
Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
---
v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
v2: Updated commit message.
---
lib/librte_efd/rte_efd.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
index e6e5cfda2..8b8330e0b 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -740,17 +740,32 @@ void
rte_efd_free(struct rte_efd_table *table)
{
uint8_t socket_id;
+ struct rte_efd_list *efd_list;
+ struct rte_tailq_entry *te, *temp;
if (table == NULL)
return;
+ efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
+
for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
rte_free(table->chunks[socket_id]);
+ rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+ TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
+ if (te->data == (void *) table) {
+ TAILQ_REMOVE(efd_list, te, next);
+ rte_free(te);
+ te = NULL;
+ }
+ }
+
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
rte_ring_free(table->free_slots);
rte_free(table->offline_chunks);
rte_free(table->keys);
rte_free(table);
+
}
/**
--
2.17.2
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [PATCH v3] lib/efd: fix to free tail queue entry after use
2019-01-11 11:49 ` [dpdk-stable] [PATCH v3] " Hari Kumar Vemula
@ 2019-01-14 22:30 ` Thomas Monjalon
2019-01-14 22:39 ` [dpdk-stable] [dpdk-dev] " Honnappa Nagarahalli
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Monjalon @ 2019-01-14 22:30 UTC (permalink / raw)
To: byron.marohn, pablo.de.lara.guarch
Cc: stable, Hari Kumar Vemula, dev, reshma.pattan,
jananeex.m.parthasarathy, maxime.coquelin
Any review please?
11/01/2019 12:49, Hari Kumar Vemula:
> In rte_efd_create() allocated memory for tail queue entry but
> not freed.
> Added freeing the tail queue entry.
>
> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> Cc: stable@dpdk.org
>
> Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
>
> ---
> v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
> v2: Updated commit message.
> ---
> lib/librte_efd/rte_efd.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
> index e6e5cfda2..8b8330e0b 100644
> --- a/lib/librte_efd/rte_efd.c
> +++ b/lib/librte_efd/rte_efd.c
> @@ -740,17 +740,32 @@ void
> rte_efd_free(struct rte_efd_table *table)
> {
> uint8_t socket_id;
> + struct rte_efd_list *efd_list;
> + struct rte_tailq_entry *te, *temp;
>
> if (table == NULL)
> return;
>
> + efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
> +
> for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
> rte_free(table->chunks[socket_id]);
> + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
>
> + TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
> + if (te->data == (void *) table) {
> + TAILQ_REMOVE(efd_list, te, next);
> + rte_free(te);
> + te = NULL;
> + }
> + }
> +
> + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
> rte_ring_free(table->free_slots);
> rte_free(table->offline_chunks);
> rte_free(table->keys);
> rte_free(table);
> +
> }
>
> /**
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v3] lib/efd: fix to free tail queue entry after use
2019-01-14 22:30 ` Thomas Monjalon
@ 2019-01-14 22:39 ` Honnappa Nagarahalli
0 siblings, 0 replies; 13+ messages in thread
From: Honnappa Nagarahalli @ 2019-01-14 22:39 UTC (permalink / raw)
To: thomas, byron.marohn, pablo.de.lara.guarch
Cc: stable, Hari Kumar Vemula, dev, reshma.pattan,
jananeex.m.parthasarathy, maxime.coquelin, nd, nd
>
> Any review please?
>
> 11/01/2019 12:49, Hari Kumar Vemula:
> > In rte_efd_create() allocated memory for tail queue entry but not
> > freed.
> > Added freeing the tail queue entry.
> >
> > Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
> > Acked-by: Reshma Pattan <reshma.pattan@intel.com>
> >
> > ---
> > v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
> > v2: Updated commit message.
> > ---
> > lib/librte_efd/rte_efd.c | 15 +++++++++++++++
> > 1 file changed, 15 insertions(+)
> >
> > diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c index
> > e6e5cfda2..8b8330e0b 100644
> > --- a/lib/librte_efd/rte_efd.c
> > +++ b/lib/librte_efd/rte_efd.c
> > @@ -740,17 +740,32 @@ void
> > rte_efd_free(struct rte_efd_table *table) {
> > uint8_t socket_id;
> > + struct rte_efd_list *efd_list;
> > + struct rte_tailq_entry *te, *temp;
> >
> > if (table == NULL)
> > return;
> >
> > + efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
> > +
Minor comment. May be better to move this after the 'for' loop below.
> > for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
> > rte_free(table->chunks[socket_id]);
> > + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
> >
> > + TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
> > + if (te->data == (void *) table) {
> > + TAILQ_REMOVE(efd_list, te, next);
> > + rte_free(te);
> > + te = NULL;
> > + }
> > + }
> > +
> > + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
> > rte_ring_free(table->free_slots);
> > rte_free(table->offline_chunks);
> > rte_free(table->keys);
> > rte_free(table);
> > +
Minor comment, extra space
> > }
> >
> > /**
> >
Some minor comments. Looks good otherwise.
Reviewed-by: Honnappa Nagarahalli <Honnappa.nagarahalli@arm.com>
>
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-stable] [PATCH v4] lib/efd: fix to free tail queue entry after use
2018-11-13 11:45 [dpdk-stable] [PATCH] lib: fix to free trail queue entry after use Hari Kumar Vemula
` (2 preceding siblings ...)
2019-01-11 11:49 ` [dpdk-stable] [PATCH v3] " Hari Kumar Vemula
@ 2019-01-17 13:36 ` Hari Kumar Vemula
2019-01-17 16:41 ` De Lara Guarch, Pablo
2019-01-18 7:40 ` [dpdk-stable] [PATCH v5] " Hari Kumar Vemula
4 siblings, 1 reply; 13+ messages in thread
From: Hari Kumar Vemula @ 2019-01-17 13:36 UTC (permalink / raw)
To: dev
Cc: byron.marohn, reshma.pattan, pablo.de.lara.guarch,
jananeex.m.parthasarathy, Hari Kumar Vemula, stable
In rte_efd_create() allocated memory for tail queue entry but
not freed.
Added freeing the tail queue entry.
Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
Cc: stable@dpdk.org
Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
Reviewed-by: Honnappa Nagarahalli <Honnappa.nagarahalli@arm.com>
---
v4: RTE_TAILQ_CAST moved after for loop
v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
v2: Updated commit message.
---
lib/librte_efd/rte_efd.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
index e6e5cfda2..b19e707d8 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -740,6 +740,8 @@ void
rte_efd_free(struct rte_efd_table *table)
{
uint8_t socket_id;
+ struct rte_efd_list *efd_list;
+ struct rte_tailq_entry *te, *temp;
if (table == NULL)
return;
@@ -747,6 +749,18 @@ rte_efd_free(struct rte_efd_table *table)
for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
rte_free(table->chunks[socket_id]);
+ efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
+ rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+
+ TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
+ if (te->data == (void *) table) {
+ TAILQ_REMOVE(efd_list, te, next);
+ rte_free(te);
+ te = NULL;
+ }
+ }
+
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
rte_ring_free(table->free_slots);
rte_free(table->offline_chunks);
rte_free(table->keys);
--
2.17.2
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [PATCH v4] lib/efd: fix to free tail queue entry after use
2019-01-17 13:36 ` [dpdk-stable] [PATCH v4] " Hari Kumar Vemula
@ 2019-01-17 16:41 ` De Lara Guarch, Pablo
0 siblings, 0 replies; 13+ messages in thread
From: De Lara Guarch, Pablo @ 2019-01-17 16:41 UTC (permalink / raw)
To: Vemula, Hari KumarX, dev
Cc: Marohn, Byron, Pattan, Reshma, Parthasarathy, JananeeX M, stable
Hi,
> -----Original Message-----
> From: Vemula, Hari KumarX
> Sent: Thursday, January 17, 2019 1:37 PM
> To: dev@dpdk.org
> Cc: Marohn, Byron <byron.marohn@intel.com>; Pattan, Reshma
> <reshma.pattan@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Parthasarathy, JananeeX M
> <jananeex.m.parthasarathy@intel.com>; Vemula, Hari KumarX
> <hari.kumarx.vemula@intel.com>; stable@dpdk.org
> Subject: [PATCH v4] lib/efd: fix to free tail queue entry after use
>
> In rte_efd_create() allocated memory for tail queue entry but not freed.
> Added freeing the tail queue entry.
>
> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> Cc: stable@dpdk.org
>
> Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
> Reviewed-by: Honnappa Nagarahalli <Honnappa.nagarahalli@arm.com>
> ---
> v4: RTE_TAILQ_CAST moved after for loop
> v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
> v2: Updated commit message.
> ---
> lib/librte_efd/rte_efd.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c index
> e6e5cfda2..b19e707d8 100644
> --- a/lib/librte_efd/rte_efd.c
> +++ b/lib/librte_efd/rte_efd.c
> @@ -740,6 +740,8 @@ void
> rte_efd_free(struct rte_efd_table *table) {
> uint8_t socket_id;
> + struct rte_efd_list *efd_list;
> + struct rte_tailq_entry *te, *temp;
>
> if (table == NULL)
> return;
> @@ -747,6 +749,18 @@ rte_efd_free(struct rte_efd_table *table)
> for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
> rte_free(table->chunks[socket_id]);
>
> + efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
> + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
> +
> + TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
> + if (te->data == (void *) table) {
> + TAILQ_REMOVE(efd_list, te, next);
> + rte_free(te);
> + te = NULL;
No need to set te = NULL, as it is a local variable.
Also, you can break here, as no duplicates are allowed.
Apart from this two changes:
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [dpdk-stable] [PATCH v5] lib/efd: fix to free tail queue entry after use
2018-11-13 11:45 [dpdk-stable] [PATCH] lib: fix to free trail queue entry after use Hari Kumar Vemula
` (3 preceding siblings ...)
2019-01-17 13:36 ` [dpdk-stable] [PATCH v4] " Hari Kumar Vemula
@ 2019-01-18 7:40 ` Hari Kumar Vemula
2019-01-18 18:21 ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
4 siblings, 1 reply; 13+ messages in thread
From: Hari Kumar Vemula @ 2019-01-18 7:40 UTC (permalink / raw)
To: dev
Cc: byron.marohn, reshma.pattan, pablo.de.lara.guarch,
jananeex.m.parthasarathy, Hari Kumar Vemula, stable
In rte_efd_create() allocated memory for tail queue entry but
not freed.
Added freeing the tail queue entry.
Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
Cc: stable@dpdk.org
Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
Reviewed-by: Honnappa Nagarahalli <Honnappa.nagarahalli@arm.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
v5: Removed NULL initialization
v4: RTE_TAILQ_CAST moved after for loop
v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
v2: Updated commit message.
---
lib/librte_efd/rte_efd.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
index e6e5cfda2..1a97ece05 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -740,6 +740,8 @@ void
rte_efd_free(struct rte_efd_table *table)
{
uint8_t socket_id;
+ struct rte_efd_list *efd_list;
+ struct rte_tailq_entry *te, *temp;
if (table == NULL)
return;
@@ -747,6 +749,18 @@ rte_efd_free(struct rte_efd_table *table)
for (socket_id = 0; socket_id < RTE_MAX_NUMA_NODES; socket_id++)
rte_free(table->chunks[socket_id]);
+ efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
+ rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK);
+
+ TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
+ if (te->data == (void *) table) {
+ TAILQ_REMOVE(efd_list, te, next);
+ rte_free(te);
+ break;
+ }
+ }
+
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
rte_ring_free(table->free_slots);
rte_free(table->offline_chunks);
rte_free(table->keys);
--
2.17.2
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH v5] lib/efd: fix to free tail queue entry after use
2019-01-18 7:40 ` [dpdk-stable] [PATCH v5] " Hari Kumar Vemula
@ 2019-01-18 18:21 ` Thomas Monjalon
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Monjalon @ 2019-01-18 18:21 UTC (permalink / raw)
To: Hari Kumar Vemula
Cc: dev, byron.marohn, reshma.pattan, pablo.de.lara.guarch,
jananeex.m.parthasarathy, stable
18/01/2019 08:40, Hari Kumar Vemula:
> In rte_efd_create() allocated memory for tail queue entry but
> not freed.
> Added freeing the tail queue entry.
>
> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> Cc: stable@dpdk.org
>
> Signed-off-by: Hari Kumar Vemula <hari.kumarx.vemula@intel.com>
> Reviewed-by: Honnappa Nagarahalli <Honnappa.nagarahalli@arm.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> ---
> v5: Removed NULL initialization
> v4: RTE_TAILQ_CAST moved after for loop
> v3: Replaced TAILQ_FOREACH_SAFE with TAILQ_FOREACH
> v2: Updated commit message.
> ---
Applied, thanks
^ permalink raw reply [flat|nested] 13+ messages in thread