hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mlxsw: spectrum_acl: assign vchunk->chunk by the newly created chunk 

Make the vchunk->chunk contain pointer of a new chunk we migrate to.
In case of a rollback, it contains the original chunk.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2019-02-28 06:59:21 +00:00 committed by David S. Miller
parent a86838e46b
commit e1d2f7a972
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c
View File

@ -1197,21 +1197,23 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_acl_tcam_region *region, struct mlxsw_sp_acl_tcam_region *region,
bool this_is_rollback) bool this_is_rollback)
{ {
struct mlxsw_sp_acl_tcam_chunk *new_chunk;
struct mlxsw_sp_acl_tcam_ventry *ventry; struct mlxsw_sp_acl_tcam_ventry *ventry;
struct mlxsw_sp_acl_tcam_chunk *chunk2;
int err; int err;
int err2; int err2;
chunk2 = mlxsw_sp_acl_tcam_chunk_create(mlxsw_sp, vchunk, region); new_chunk = mlxsw_sp_acl_tcam_chunk_create(mlxsw_sp, vchunk, region);
if (IS_ERR(chunk2)) { if (IS_ERR(new_chunk)) {
if (this_is_rollback) if (this_is_rollback)
vchunk->vregion->failed_rollback = true; vchunk->vregion->failed_rollback = true;
return PTR_ERR(chunk2); return PTR_ERR(new_chunk);
} }
vchunk->chunk2 = chunk2; vchunk->chunk2 = vchunk->chunk;
vchunk->chunk = new_chunk;
list_for_each_entry(ventry, &vchunk->ventry_list, list) { list_for_each_entry(ventry, &vchunk->ventry_list, list) {
err = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry, err = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry,
vchunk->chunk2); vchunk->chunk);
if (err) { if (err) {
if (this_is_rollback) { if (this_is_rollback) {
vchunk->vregion->failed_rollback = true; vchunk->vregion->failed_rollback = true;
@ -1220,8 +1222,7 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
goto rollback; goto rollback;
} }
} }
mlxsw_sp_acl_tcam_chunk_destroy(mlxsw_sp, vchunk->chunk); mlxsw_sp_acl_tcam_chunk_destroy(mlxsw_sp, vchunk->chunk2);
vchunk->chunk = chunk2;
vchunk->chunk2 = NULL; vchunk->chunk2 = NULL;
return 0; return 0;
@ -1230,6 +1231,7 @@ rollback:
* migration fails, there's no good way how to proceed. Set the * migration fails, there's no good way how to proceed. Set the
* vregion with "failed_rollback" flag. * vregion with "failed_rollback" flag.
*/ */
swap(vchunk->chunk, vchunk->chunk2);
list_for_each_entry_continue_reverse(ventry, &vchunk->ventry_list, list_for_each_entry_continue_reverse(ventry, &vchunk->ventry_list,
list) { list) {
err2 = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry, err2 = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry,