diff mbox series

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

Message ID 1542194265-16156-1-git-send-email-hari.kumarx.vemula@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Thomas Monjalon
Headers
Series [v2] lib/efd: fix to free tail queue entry after use |

Checks

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

Commit Message

Hari Kumar Vemula Nov. 14, 2018, 11:17 a.m. UTC 
  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(+)

Comments

Thomas Monjalon Nov. 18, 2018, 2:57 p.m. UTC | #1 
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>
Maxime Coquelin Nov. 23, 2018, 1:30 p.m. UTC | #2 
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);
>   }
>   
>   /**
>
Maxime Coquelin Nov. 23, 2018, 2:39 p.m. UTC | #3 
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);
>>   }
>>   /**
>>
diff mbox series

Patch

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