Commit 316d5f72 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Always query offloaded tc peer rule counter 



Under multipath when encap rules are duplicated to HW in the driver,
it's possible for one flow to be currently un-offloaded (e.g. lack of
next-hop route or neigh entry) while the other flow is offloaded. As
such, we move to query the counters of both flows at all times.

Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b4a23329

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+15 −11
Original line number Diff line number Diff line
@@ -3078,23 +3078,25 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv, 
	struct mlx5_eswitch *peer_esw;

	struct mlx5e_tc_flow *flow;

	struct mlx5_fc *counter;

	u64 bytes;

	u64 packets;

	u64 lastuse;

	u64 lastuse = 0;

	u64 packets = 0;

	u64 bytes = 0;



	flow = rhashtable_lookup_fast(tc_ht, &f->cookie, tc_ht_params);

	if (!flow || !same_flow_direction(flow, flags))

		return -EINVAL;



	if (!(flow->flags & MLX5E_TC_FLOW_OFFLOADED))

		return 0;



	if (flow->flags & MLX5E_TC_FLOW_OFFLOADED) {

		counter = mlx5e_tc_get_counter(flow);

		if (!counter)

			return 0;



		mlx5_fc_query_cached(counter, &bytes, &packets, &lastuse);

	}



	/* Under multipath it's possible for one rule to be currently

	 * un-offloaded while the other rule is offloaded.

	 */

	peer_esw = mlx5_devcom_get_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);

	if (!peer_esw)

		goto out;
@@ -3106,6 +3108,8 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv, 
		u64 lastuse2;



		counter = mlx5e_tc_get_counter(flow->peer_flow);

		if (!counter)

			goto no_peer_counter;

		mlx5_fc_query_cached(counter, &bytes2, &packets2, &lastuse2);



		bytes += bytes2;
@@ -3113,8 +3117,8 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv, 
		lastuse = max_t(u64, lastuse, lastuse2);

	}



no_peer_counter:

	mlx5_devcom_release_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);



out:

	flow_stats_update(&f->stats, bytes, packets, lastuse);

CRA Git | Maintained and supported by SUSTech CRA and CCSE