Skip to content

Commit 0b88631

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 c6f3fa7 commit 0b88631

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
@@ -768,6 +768,17 @@ static void mlxsw_sp_acl_tcam_vregion_rehash_work(struct work_struct *work)
768768
mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(vregion);
769769
}
770770

771+
static void
772+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(struct mlxsw_sp_acl_tcam_rehash_ctx *ctx)
773+
{
774+
/* The entry markers are relative to the current chunk and therefore
775+
* needs to be reset together with the chunk marker.
776+
*/
777+
ctx->current_vchunk = NULL;
778+
ctx->start_ventry = NULL;
779+
ctx->stop_ventry = NULL;
780+
}
781+
771782
static void
772783
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_changed(struct mlxsw_sp_acl_tcam_vchunk *vchunk)
773784
{
@@ -790,7 +801,7 @@ mlxsw_sp_acl_tcam_rehash_ctx_vregion_changed(struct mlxsw_sp_acl_tcam_vregion *v
790801
* the current chunk pointer to make sure all chunks
791802
* are properly migrated.
792803
*/
793-
vregion->rehash.ctx.current_vchunk = NULL;
804+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(&vregion->rehash.ctx);
794805
}
795806

796807
static struct mlxsw_sp_acl_tcam_vregion *
@@ -1291,7 +1302,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_end(struct mlxsw_sp *mlxsw_sp,
12911302
{
12921303
mlxsw_sp_acl_tcam_chunk_destroy(mlxsw_sp, vchunk->chunk2);
12931304
vchunk->chunk2 = NULL;
1294-
ctx->current_vchunk = NULL;
1305+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
12951306
}
12961307

12971308
static int
@@ -1323,6 +1334,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
13231334
ventry = list_first_entry(&vchunk->ventry_list,
13241335
typeof(*ventry), list);
13251336

1337+
WARN_ON(ventry->vchunk != vchunk);
1338+
13261339
list_for_each_entry_from(ventry, &vchunk->ventry_list, list) {
13271340
/* During rollback, once we reach the ventry that failed
13281341
* to migrate, we are done.
@@ -1414,7 +1427,7 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
14141427
* to vregion->region.
14151428
*/
14161429
swap(vregion->region, vregion->region2);
1417-
ctx->current_vchunk = NULL;
1430+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
14181431
ctx->this_is_rollback = true;
14191432
err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
14201433
ctx, credits);
@@ -1473,6 +1486,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp,
14731486

14741487
ctx->hints_priv = hints_priv;
14751488
ctx->this_is_rollback = false;
1489+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
14761490

14771491
return 0;
14781492

0 commit comments

Comments
 (0)