mirror of https://gitee.com/openkylin/linux.git
mlxsw: spectrum_acl: Remove failed_rollback dead end
Currently if a rollback ends with error, the vregion is in a zombie state until end of the existence. Instead of that, rather try to continue where rollback ended later on (after rehash interval). 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:
parent
f3d4ef1a53
commit
7c33c72bef
|
@ -216,7 +216,6 @@ struct mlxsw_sp_acl_tcam_vregion {
|
||||||
struct mlxsw_sp_acl_tcam_rehash_ctx ctx;
|
struct mlxsw_sp_acl_tcam_rehash_ctx ctx;
|
||||||
} rehash;
|
} rehash;
|
||||||
struct mlxsw_sp *mlxsw_sp;
|
struct mlxsw_sp *mlxsw_sp;
|
||||||
bool failed_rollback; /* Indicates failed rollback during migration */
|
|
||||||
unsigned int ref_count;
|
unsigned int ref_count;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1315,8 +1314,13 @@ mlxsw_sp_acl_tcam_vchunk_migrate_one(struct mlxsw_sp *mlxsw_sp,
|
||||||
err = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry,
|
err = mlxsw_sp_acl_tcam_ventry_migrate(mlxsw_sp, ventry,
|
||||||
vchunk->chunk, credits);
|
vchunk->chunk, credits);
|
||||||
if (err) {
|
if (err) {
|
||||||
if (ctx->this_is_rollback)
|
if (ctx->this_is_rollback) {
|
||||||
|
/* Save the ventry which we ended with and try
|
||||||
|
* to continue later on.
|
||||||
|
*/
|
||||||
|
ctx->start_ventry = ventry;
|
||||||
return err;
|
return err;
|
||||||
|
}
|
||||||
/* Swap the chunk and chunk2 pointers so the follow-up
|
/* Swap the chunk and chunk2 pointers so the follow-up
|
||||||
* rollback call will see the original chunk pointer
|
* rollback call will see the original chunk pointer
|
||||||
* in vchunk->chunk.
|
* in vchunk->chunk.
|
||||||
|
@ -1395,10 +1399,10 @@ mlxsw_sp_acl_tcam_vregion_migrate(struct mlxsw_sp *mlxsw_sp,
|
||||||
err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
|
err2 = mlxsw_sp_acl_tcam_vchunk_migrate_all(mlxsw_sp, vregion,
|
||||||
ctx, credits);
|
ctx, credits);
|
||||||
if (err2) {
|
if (err2) {
|
||||||
vregion->failed_rollback = true;
|
|
||||||
trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,
|
trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,
|
||||||
vregion);
|
vregion);
|
||||||
dev_err(mlxsw_sp->bus_info->dev, "Failed to rollback during vregion migration fail\n");
|
dev_err(mlxsw_sp->bus_info->dev, "Failed to rollback during vregion migration fail\n");
|
||||||
|
/* Let the rollback to be continued later on. */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mutex_unlock(&vregion->lock);
|
mutex_unlock(&vregion->lock);
|
||||||
|
@ -1424,8 +1428,6 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp,
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
trace_mlxsw_sp_acl_tcam_vregion_rehash(mlxsw_sp, vregion);
|
trace_mlxsw_sp_acl_tcam_vregion_rehash(mlxsw_sp, vregion);
|
||||||
if (vregion->failed_rollback)
|
|
||||||
return -EBUSY;
|
|
||||||
|
|
||||||
hints_priv = ops->region_rehash_hints_get(vregion->region->priv);
|
hints_priv = ops->region_rehash_hints_get(vregion->region->priv);
|
||||||
if (IS_ERR(hints_priv))
|
if (IS_ERR(hints_priv))
|
||||||
|
@ -1472,11 +1474,9 @@ mlxsw_sp_acl_tcam_vregion_rehash_end(struct mlxsw_sp *mlxsw_sp,
|
||||||
struct mlxsw_sp_acl_tcam_region *unused_region = vregion->region2;
|
struct mlxsw_sp_acl_tcam_region *unused_region = vregion->region2;
|
||||||
const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops;
|
const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops;
|
||||||
|
|
||||||
if (!vregion->failed_rollback) {
|
vregion->region2 = NULL;
|
||||||
vregion->region2 = NULL;
|
mlxsw_sp_acl_tcam_group_region_detach(mlxsw_sp, unused_region);
|
||||||
mlxsw_sp_acl_tcam_group_region_detach(mlxsw_sp, unused_region);
|
mlxsw_sp_acl_tcam_region_destroy(mlxsw_sp, unused_region);
|
||||||
mlxsw_sp_acl_tcam_region_destroy(mlxsw_sp, unused_region);
|
|
||||||
}
|
|
||||||
ops->region_rehash_hints_put(ctx->hints_priv);
|
ops->region_rehash_hints_put(ctx->hints_priv);
|
||||||
ctx->hints_priv = NULL;
|
ctx->hints_priv = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue