Commit 6e2345c1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sched-expose-HW-stats-types-per-action-used-by-drivers' 



Jiri Pirko says:

====================
net: sched: expose HW stats types per action used by drivers

The first patch is just adding a helper used by the second patch too.
The second patch is exposing HW stats types that are used by drivers.

Example:

$ tc filter add dev enp3s0np1 ingress proto ip handle 1 pref 1 flower dst_ip 192.168.1.1 action drop
$ tc -s filter show dev enp3s0np1 ingress
filter protocol ip pref 1 flower chain 0
filter protocol ip pref 1 flower chain 0 handle 0x1
  eth_type ipv4
  dst_ip 192.168.1.1
  in_hw in_hw_count 2
        action order 1: gact action drop
         random type none pass val 0
         index 1 ref 1 bind 1 installed 10 sec used 10 sec
        Action statistics:
        Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
        backlog 0b 0p requeues 0
        used_hw_stats immediate     <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents acc086bf 93a129eb

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

+1 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ static int bnxt_tc_get_flow_stats(struct bnxt *bp, 
	spin_unlock(&flow->stats_lock);



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

			  lastused);

			  lastused, FLOW_ACTION_HW_STATS_DELAYED);

	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -903,7 +903,8 @@ int cxgb4_tc_flower_stats(struct net_device *dev, 
			ofld_stats->last_used = jiffies;

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

				  packets - ofld_stats->packet_count,

				  ofld_stats->last_used);

				  ofld_stats->last_used,

				  FLOW_ACTION_HW_STATS_IMMEDIATE);



		ofld_stats->packet_count = packets;

		ofld_stats->byte_count = bytes;

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

+2 −1
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ int cxgb4_tc_matchall_stats(struct net_device *dev, 
		flow_stats_update(&cls_matchall->stats,

				  bytes - tc_port_matchall->ingress.bytes,

				  packets - tc_port_matchall->ingress.packets,

				  tc_port_matchall->ingress.last_used);

				  tc_port_matchall->ingress.last_used,

				  FLOW_ACTION_HW_STATS_IMMEDIATE);



		tc_port_matchall->ingress.packets = packets;

		tc_port_matchall->ingress.bytes = bytes;

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

+2 −1
Original line number Diff line number Diff line
@@ -666,7 +666,8 @@ mlx5_tc_ct_block_flow_offload_stats(struct mlx5_ct_ft *ft, 
		return -ENOENT;



	mlx5_fc_query_cached(entry->counter, &bytes, &packets, &lastuse);

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

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

			  FLOW_ACTION_HW_STATS_DELAYED);



	return 0;

}

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

+4 −2
Original line number Diff line number Diff line
@@ -4468,7 +4468,8 @@ int mlx5e_stats_flower(struct net_device *dev, struct mlx5e_priv *priv, 
no_peer_counter:

	mlx5_devcom_release_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);

out:

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

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

			  FLOW_ACTION_HW_STATS_DELAYED);

	trace_mlx5e_stats_flower(f);

errout:

	mlx5e_flow_put(priv, flow);
@@ -4585,7 +4586,8 @@ void mlx5e_tc_stats_matchall(struct mlx5e_priv *priv, 
	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, dpkts, dbytes, jiffies);

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

			  FLOW_ACTION_HW_STATS_DELAYED);

}



static void mlx5e_tc_hairpin_update_dead_peer(struct mlx5e_priv *priv,

CRA Git | Maintained and supported by SUSTech CRA and CCSE