[v3] lib/efd: fix to free tail queue entry after use

Message ID 1547207341-22001-1-git-send-email-hari.kumarx.vemula@intel.com
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • [v3] lib/efd: fix to free tail queue entry after use
Related show

Checks

Context Check Description
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Hari Kumar Vemula Jan. 11, 2019, 11:49 a.m.
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(+)

Comments

Thomas Monjalon Jan. 14, 2019, 10:30 p.m. | #1
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);
> +
>  }
>  
>  /**
>
Honnappa Nagarahalli Jan. 14, 2019, 10:39 p.m. | #2
> 
> 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>
> 
> 
> 
>

Patch

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);
+
 }
 
 /**