d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix aging counter deallocation

Browse Source 
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.

Fixes: f3191849f2c2 ("net/mlx5: support flow count action handle")
Cc: stable@dpdk.org

Signed-off-by: Matan Azrad <matan@nvidia.com>
Acked-by: Bing Zhao <bingz@nvidia.com>
This commit is contained in:
Matan Azrad 2021-06-09 15:32:51 +03:00 committed by Raslan Darawsheh
parent 035f4c2328
commit 3776e1ce2d
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/mlx5/mlx5_flow_dv.c
View File

@ -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.