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

Commit 3b1903ef authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

flow_offload: add statistics retrieval infrastructure and use it 



This patch provides the flow_stats structure that acts as container for
tc_cls_flower_offload, then we can use to restore the statistics on the
existing TC actions. Hence, tcf_exts_stats_update() is not used from
drivers anymore.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3a7b6861

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+2 −2
Original line number Diff line number Diff line
@@ -1396,7 +1396,7 @@ static int bnxt_tc_get_flow_stats(struct bnxt *bp, 
	lastused = flow->lastused;

	spin_unlock(&flow->stats_lock);



	tcf_exts_stats_update(tc_flow_cmd->exts, stats.bytes, stats.packets,

	flow_stats_update(&tc_flow_cmd->stats, stats.bytes, stats.packets,

			  lastused);

	return 0;

}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+3 −3
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int cxgb4_tc_flower_stats(struct net_device *dev, 
	if (ofld_stats->packet_count != packets) {

		if (ofld_stats->prev_packet_count != packets)

			ofld_stats->last_used = jiffies;

		tcf_exts_stats_update(cls->exts, bytes - ofld_stats->byte_count,

		flow_stats_update(&cls->stats, bytes - ofld_stats->byte_count,

				  packets - ofld_stats->packet_count,

				  ofld_stats->last_used);

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

+1 −1
Original line number Diff line number Diff line
@@ -3071,7 +3071,7 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv, 
	mlx5_devcom_release_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);



out:

	tcf_exts_stats_update(f->exts, bytes, packets, lastuse);

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



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ int mlxsw_sp_flower_stats(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		goto err_rule_get_stats;



	tcf_exts_stats_update(f->exts, bytes, packets, lastuse);

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



	mlxsw_sp_acl_ruleset_put(mlxsw_sp, ruleset);

	return 0;

drivers/net/ethernet/netronome/nfp/flower/offload.c

+2 −3
Original line number Diff line number Diff line
@@ -554,9 +554,8 @@ nfp_flower_get_stats(struct nfp_app *app, struct net_device *netdev, 
	ctx_id = be32_to_cpu(nfp_flow->meta.host_ctx_id);



	spin_lock_bh(&priv->stats_lock);

	tcf_exts_stats_update(flow->exts, priv->stats[ctx_id].bytes,

			      priv->stats[ctx_id].pkts,

			      priv->stats[ctx_id].used);

	flow_stats_update(&flow->stats, priv->stats[ctx_id].bytes,

			  priv->stats[ctx_id].pkts, priv->stats[ctx_id].used);



	priv->stats[ctx_id].pkts = 0;

	priv->stats[ctx_id].bytes = 0;