Skip to content

Commit 039992b

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 starfive-tech#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 <idosch@nvidia.com> Tested-by: Alexander Zubkov <green@qrator.net> Reviewed-by: Petr Machata <petrm@nvidia.com> Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://lore.kernel.org/r/cc17eed86b41dd829d39b07906fec074a9ce580e.1713797103.git.petrm@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 413a018 commit 039992b

1 file changed

Lines changed: 17 additions & 3 deletions

File tree

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,17 @@ static void mlxsw_sp_acl_tcam_vregion_rehash_work(struct work_struct *work)
725725
mlxsw_sp_acl_tcam_vregion_rehash_work_schedule(vregion);
726726
}
727727

728+
static void
729+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(struct mlxsw_sp_acl_tcam_rehash_ctx *ctx)
730+
{
731+
/* The entry markers are relative to the current chunk and therefore
732+
* needs to be reset together with the chunk marker.
733+
*/
734+
ctx->current_vchunk = NULL;
735+
ctx->start_ventry = NULL;
736+
ctx->stop_ventry = NULL;
737+
}
738+
728739
static void
729740
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_changed(struct mlxsw_sp_acl_tcam_vchunk *vchunk)
730741
{
@@ -747,7 +758,7 @@ mlxsw_sp_acl_tcam_rehash_ctx_vregion_changed(struct mlxsw_sp_acl_tcam_vregion *v
747758
* the current chunk pointer to make sure all chunks
748759
* are properly migrated.
749760
*/
750-
vregion->rehash.ctx.current_vchunk = NULL;
761+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(&vregion->rehash.ctx);
751762
}
752763

753764
static struct mlxsw_sp_acl_tcam_vregion *
@@ -1250,7 +1261,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_end(struct mlxsw_sp *mlxsw_sp,
12501261
{
12511262
mlxsw_sp_acl_tcam_chunk_destroy(mlxsw_sp, vchunk->chunk2);
12521263
vchunk->chunk2 = NULL;
1253-
ctx->current_vchunk = NULL;
1264+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
12541265
}
12551266

12561267
static int
@@ -1282,6 +1293,8 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
12821293
ventry = list_first_entry(&vchunk->ventry_list,
12831294
typeof(*ventry), list);
12841295

1296+
WARN_ON(ventry->vchunk != vchunk);
1297+
12851298
list_for_each_entry_from(ventry, &vchunk->ventry_list, list) {
12861299
/* During rollback, once we reach the ventry that failed
12871300
* to migrate, we are done.
@@ -1373,7 +1386,7 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
13731386
* to vregion->region.
13741387
*/
13751388
swap(vregion->region, vregion->region2);
1376-
ctx->current_vchunk = NULL;
1389+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
13771390
ctx->this_is_rollback = true;
13781391
err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
13791392
ctx, credits);
@@ -1432,6 +1445,7 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp,
14321445

14331446
ctx->hints_priv = hints_priv;
14341447
ctx->this_is_rollback = false;
1448+
mlxsw_sp_acl_tcam_rehash_ctx_vchunk_reset(ctx);
14351449

14361450
return 0;
14371451

0 commit comments

Comments
 (0)