Skip to content

Commit 751d352

Browse files
idoschgregkh
authored andcommitted
mlxsw: spectrum_acl_tcam: Fix warning during rehash
[ Upstream commit 743edc8 ] As previously explained, the rehash delayed work migrates filters from one region to another. This is done by iterating over all chunks (all the filters with the same priority) in the region and in each chunk iterating over all the filters. When the work runs out of credits it stores the current chunk and entry as markers in the per-work context so that it would know where to resume the migration from the next time the work is scheduled. Upon error, the chunk marker is reset to NULL, but without resetting the entry markers despite being relative to it. This can result in migration being resumed from an entry that does not belong to the chunk being migrated. In turn, this will eventually lead to a chunk being iterated over as if it is an entry. Because of how the two structures happen to be defined, this does not lead to KASAN splats, but to warnings such as [1]. Fix by creating a helper that resets all the markers and call it from all the places the currently only reset the chunk marker. For good measures also call it when starting a completely new rehash. Add a warning to avoid future cases. [1] WARNING: CPU: 7 PID: 1076 at drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c:407 mlxsw_afk_encode+0x242/0x2f0 Modules linked in: CPU: 7 PID: 1076 Comm: kworker/7:24 Tainted: G W 6.9.0-rc3-custom-00880-g29e61d91b77b #29 Hardware name: Mellanox Technologies Ltd. MSN3700/VMOD0005, BIOS 5.11 01/06/2019 Workqueue: mlxsw_core mlxsw_sp_acl_tcam_vregion_rehash_work RIP: 0010:mlxsw_afk_encode+0x242/0x2f0 [...] Call Trace: <TASK> mlxsw_sp_acl_atcam_entry_add+0xd9/0x3c0 mlxsw_sp_acl_tcam_entry_create+0x5e/0xa0 mlxsw_sp_acl_tcam_vchunk_migrate_all+0x109/0x290 mlxsw_sp_acl_tcam_vregion_rehash_work+0x6c/0x470 process_one_work+0x151/0x370 worker_thread+0x2cb/0x3e0 kthread+0xd0/0x100 ret_from_fork+0x34/0x50 </TASK> Fixes: 6f9579d ("mlxsw: spectrum_acl: Remember where to continue rehash migration") Signed-off-by: Ido Schimmel <[email protected]> Tested-by: Alexander Zubkov <[email protected]> Reviewed-by: Petr Machata <[email protected]> Signed-off-by: Petr Machata <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/cc17eed86b41dd829d39b07906fec074a9ce580e.1713797103.git.petrm@nvidia.com Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b822644 commit 751d352

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,17 @@ static void mlxsw_sp_acl_tcam_vregion_rehash_work(struct work_struct *work)
792792
mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(vregion);
793793
}
794794

795+
static void
796+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(struct mlxsw_sp_acl_tcam_rehash_ctx *ctx)
797+
{
798+
/* The entry markers are relative to the current chunk and therefore
799+
* needs to be reset together with the chunk marker.
800+
*/
801+
ctx->current_vchunk = NULL;
802+
ctx->start_ventry = NULL;
803+
ctx->stop_ventry = NULL;
804+
}
805+
795806
static void
796807
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_changed(struct mlxsw_sp_acl_tcam_vchunk *vchunk)
797808
{
@@ -814,7 +825,7 @@ mlxsw_sp_acl_tcam_rehash_ctx_vregion_changed(struct mlxsw_sp_acl_tcam_vregion *v
814825
* the current chunk pointer to make sure all chunks
815826
* are properly migrated.
816827
*/
817-
vregion->rehash.ctx.current_vchunk = NULL;
828+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(&vregion->rehash.ctx);
818829
}
819830

820831
static struct mlxsw_sp_acl_tcam_vregion *
@@ -1317,7 +1328,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_end(struct mlxsw_sp *mlxsw_sp,
13171328
{
13181329
mlxsw_sp_acl_tcam_chunk_destroy(mlxsw_sp, vchunk->chunk2);
13191330
vchunk->chunk2 = NULL;
1320-
ctx->current_vchunk = NULL;
1331+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
13211332
}
13221333

13231334
static int
@@ -1349,6 +1360,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
13491360
ventry = list_first_entry(&vchunk->ventry_list,
13501361
typeof(*ventry), list);
13511362

1363+
WARN_ON(ventry->vchunk != vchunk);
1364+
13521365
list_for_each_entry_from(ventry, &vchunk->ventry_list, list) {
13531366
/* During rollback, once we reach the ventry that failed
13541367
* to migrate, we are done.
@@ -1440,7 +1453,7 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
14401453
* to vregion->region.
14411454
*/
14421455
swap(vregion->region, vregion->region2);
1443-
ctx->current_vchunk = NULL;
1456+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
14441457
ctx->this_is_rollback = true;
14451458
err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
14461459
ctx, credits);
@@ -1499,6 +1512,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp,
14991512

15001513
ctx->hints_priv = hints_priv;
15011514
ctx->this_is_rollback = false;
1515+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
15021516

15031517
return 0;
15041518

0 commit comments

Comments
 (0)