Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c33c72b authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

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: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3d4ef1a

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

+10 −10
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ struct mlxsw_sp_acl_tcam_vregion { 
		struct mlxsw_sp_acl_tcam_rehash_ctx ctx;

	} rehash;

	struct mlxsw_sp *mlxsw_sp;

	bool failed_rollback; /* Indicates failed rollback during migration */

	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,

						       vchunk->chunk, credits);

		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;

			}

			/* Swap the chunk and chunk2 pointers so the follow-up

			 * rollback call will see the original chunk pointer

			 * 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,

							    ctx, credits);

		if (err2) {

			vregion->failed_rollback = true;

			trace_mlxsw_sp_acl_tcam_vregion_rehash_dis(mlxsw_sp,

								   vregion);

			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);
@@ -1424,8 +1428,6 @@ mlxsw_sp_acl_tcam_vregion_rehash_start(struct mlxsw_sp *mlxsw_sp, 
	int err;



	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);

	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;

	const struct mlxsw_sp_acl_tcam_ops *ops = mlxsw_sp->acl_tcam_ops;



	if (!vregion->failed_rollback) {

	vregion->region2 = NULL;

	mlxsw_sp_acl_tcam_group_region_detach(mlxsw_sp, unused_region);

	mlxsw_sp_acl_tcam_region_destroy(mlxsw_sp, unused_region);

	}

	ops->region_rehash_hints_put(ctx->hints_priv);

	ctx->hints_priv = NULL;

}