[v1] common/cnxk: fix aged flows bitmap alloc
Checks
Commit Message
The allocation of bitmap for aged flows should be done in
npc_aging_ctrl_thread_create() instead of roc_npc_init(), as the bitmap
free is being done in npc_aging_ctrl_thread_destroy().
Fixes: 357f5ebc8a24 ("common/cnxk: support flow aging")
Cc: stable@dpdk.org
Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
drivers/common/cnxk/roc_npc.c | 5 ++---
drivers/common/cnxk/roc_npc_aging.c | 6 +++++-
2 files changed, 7 insertions(+), 4 deletions(-)
Comments
On Fri, Nov 3, 2023 at 4:55 AM Ankur Dwivedi <adwivedi@marvell.com> wrote:
>
> The allocation of bitmap for aged flows should be done in
> npc_aging_ctrl_thread_create() instead of roc_npc_init(), as the bitmap
> free is being done in npc_aging_ctrl_thread_destroy().
>
> Fixes: 357f5ebc8a24 ("common/cnxk: support flow aging")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Applied to dpdk-next-net-mrvl/for-next-net. Thanks
@@ -331,9 +331,8 @@ roc_npc_init(struct roc_npc *roc_npc)
*/
plt_bitmap_set(npc->rss_grp_entries, 0);
- rc = npc_aged_flows_bitmap_alloc(roc_npc);
- if (rc != 0)
- goto done;
+ roc_npc->flow_age.age_flow_refcnt = 0;
+
return rc;
done:
@@ -33,7 +33,6 @@ npc_aged_flows_bitmap_alloc(struct roc_npc *roc_npc)
goto done;
}
- flow_age->age_flow_refcnt = 0;
done:
return rc;
}
@@ -276,11 +275,16 @@ npc_aging_ctrl_thread_create(struct roc_npc *roc_npc,
flow->has_age_action = true;
if (flow_age->age_flow_refcnt == 0) {
+ errcode = npc_aged_flows_bitmap_alloc(roc_npc);
+ if (errcode != 0)
+ goto done;
+
flow_age->aged_flows_get_thread_exit = false;
if (plt_thread_create_control(&flow_age->aged_flows_poll_thread,
"Aged Flows Get Ctrl Thread",
npc_aged_flows_get, roc_npc) != 0) {
plt_err("Failed to create thread for age flows");
+ npc_aged_flows_bitmap_free(roc_npc);
errcode = NPC_ERR_ACTION_NOTSUP;
goto done;
}