Commit 312eb3fd authored by Amir Tzin's avatar Amir Tzin Committed by Saeed Mahameed
Browse files

net/mlx5e: Some cleanup in mlx5e_tc_stats_matchall() 



Function mlx5e_tc_stats_matchall() is only called from one file:
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
Move it there and make it static as exposing it is unnecessary. Also
variable cur_stats is redundant. Remove it and avoid superfluous copy.

This patch does not change functionality.

Reviewed-by: default avatarPatrisious Haddad <phaddad@nvidia.com>
Signed-off-by: default avatarAmir Tzin <amirtz@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent cecf44ea

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+14 −0
Original line number Diff line number Diff line
@@ -147,6 +147,20 @@ mlx5e_rep_setup_tc_cls_flower(struct mlx5e_priv *priv, 
	}

}



static void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv,

				    struct tc_cls_matchall_offload *ma)

{

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	u64 dbytes;

	u64 dpkts;



	dpkts = priv->stats.rep_stats.vport_rx_packets - rpriv->prev_vf_vport_stats.rx_packets;

	dbytes = priv->stats.rep_stats.vport_rx_bytes - rpriv->prev_vf_vport_stats.rx_bytes;

	mlx5e_stats_copy_rep_stats(&rpriv->prev_vf_vport_stats, &priv->stats.rep_stats);

	flow_stats_update(&ma->stats, dbytes, dpkts, 0, jiffies,

			  FLOW_ACTION_HW_STATS_DELAYED);

}



static

int mlx5e_rep_setup_tc_cls_matchall(struct mlx5e_priv *priv,

				    struct tc_cls_matchall_offload *ma)

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

+0 −16
Original line number Diff line number Diff line
@@ -5007,22 +5007,6 @@ int mlx5e_tc_delete_matchall(struct mlx5e_priv *priv, 
	return apply_police_params(priv, 0, extack);

}



void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv,

			     struct tc_cls_matchall_offload *ma)

{

	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct rtnl_link_stats64 cur_stats;

	u64 dbytes;

	u64 dpkts;



	mlx5e_stats_copy_rep_stats(&cur_stats, &priv->stats.rep_stats);

	dpkts = cur_stats.rx_packets - rpriv->prev_vf_vport_stats.rx_packets;

	dbytes = cur_stats.rx_bytes - rpriv->prev_vf_vport_stats.rx_bytes;

	rpriv->prev_vf_vport_stats = cur_stats;

	flow_stats_update(&ma->stats, dbytes, dpkts, 0, jiffies,

			  FLOW_ACTION_HW_STATS_DELAYED);

}



static void mlx5e_tc_hairpin_update_dead_peer(struct mlx5e_priv *priv,

					      struct mlx5e_priv *peer_priv)

{

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

+0 −2
Original line number Diff line number Diff line
@@ -203,8 +203,6 @@ int mlx5e_tc_configure_matchall(struct mlx5e_priv *priv, 
				struct tc_cls_matchall_offload *f);

int mlx5e_tc_delete_matchall(struct mlx5e_priv *priv,

			     struct tc_cls_matchall_offload *f);

void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv,

			     struct tc_cls_matchall_offload *ma);



struct mlx5e_encap_entry;

void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv,