net/mlx5: fix aging counter deallocation
PATCH 1/1 net/mlx5: fix aging counter deallocation
When a counter is destroyed and used for aging action, the driver should remove the counter object from the age-out list if it is there.
The counter memory of the list entry and of the counter shared information is shared because, currently, shared counter cannot be used for aging.
When the support for counter action in action handle API was added, the counter shared information was reused and moved to be used also for non-shared case. Wrongly, it is used for aging case too.
Remove the usage of shared information in case of aging.
--- drivers/net/mlx5/mlx5_flow_dv.c | 47 ++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 21 deletions(-)
drivers/net/mlx5/mlx5_flow_dv.c +26 -21
@@ -6110,28 +6110,33 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)return ; cnt =flow_dv_counter_get_by_idx (dev, counter, &pool);MLX5_ASSERT (pool); -/* -* If the counter action is shared by ID, the l3t_clear_entry function -* reduces its references counter. If after the reduction the action is -* still referenced, the function returns here and does not release it. -*/ -if (IS_LEGACY_SHARED_CNT (counter) && -mlx5_l3t_clear_entry (priv->sh->cnt_id_tbl, cnt->shared_info.id)) -return ; -/* -* If the counter action is shared by indirect action API, the atomic -* function reduces its references counter. If after the reduction the -* action is still referenced, the function returns here and does not -* release it. -* When the counter action is not shared neither by ID nor by indirect -* action API, shared info is 1 before the reduction, so this condition -* is failed and function doesn't return here. -*/ -if (!IS_LEGACY_SHARED_CNT (counter) && -__atomic_sub_fetch (&cnt->shared_info.refcnt,1 , __ATOMIC_RELAXED)) -return ; -if (pool->is_aged) +if (pool->is_aged) {flow_dv_counter_remove_from_age (dev, counter, cnt); + }else { +/* +* If the counter action is shared by ID, the l3t_clear_entry +* function reduces its references counter. If after the +* reduction the action is still referenced, the function +* returns here and does not release it. +*/ +if (IS_LEGACY_SHARED_CNT (counter) && +mlx5_l3t_clear_entry (priv->sh->cnt_id_tbl, + cnt->shared_info.id)) +return ; +/* +* If the counter action is shared by indirect action API, +* the atomic function reduces its references counter. +* If after the reduction the action is still referenced, the +* function returns here and does not release it. +* When the counter action is not shared neither by ID nor by +* indirect action API, shared info is 1 before the reduction, +* so this condition is failed and function doesn't return here. +*/ +if (!IS_LEGACY_SHARED_CNT (counter) && +__atomic_sub_fetch (&cnt->shared_info.refcnt,1 , + __ATOMIC_RELAXED)) +return ; + } cnt->pool = pool;/* * Put the counter back to list to be updated in none fallback mode.
Signature · 1 line
2.25.1
Hi,
Quoted 19 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Matan Azrad
Sent: Wednesday, June 9, 2021 3:33 PM
To: [email protected]
Cc: Slava Ovsiienko <[email protected]>; [email protected]; Bing Zhao <[email protected]>
Subject: [dpdk-dev] [PATCH] net/mlx5: fix aging counter deallocationWhen a counter is destroyed and used for aging action, the driver should remove the counter object from the age-out list if it is there.
The counter memory of the list entry and of the counter shared information is shared because, currently, shared counter cannot be used for aging.
When the support for counter action in action handle API was added, the counter shared information was reused and moved to be used also for non-shared case. Wrongly, it is used for aging case too.
Quoted 8 lines
Remove the usage of shared information in case of aging.
Fixes f3191849f2c2 ("net/mlx5: support flow count action handle")Signed-off-by Matan Azrad <[email protected]>Acked-by Bing Zhao <[email protected]>---
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh