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

Commit fe860afb authored by Neerav Parikh's avatar Neerav Parikh Committed by Jeff Kirsher
Browse files

i40e/i40evf: Add capability to gather VEB per TC stats 



This patch adds capability to update per VEB per TC statistics and dump
it via ethtool. It also adds a structure to hold VEB per TC statistics.
The fields can be filled by reading the GLVEBTC_* counters.

Change-ID: I28b4759b9ab6ad5a61f046a1bc9ef6b16fe31538
Signed-off-by: default avatarNeerav Parikh <neerav.parikh@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 510efb26

drivers/net/ethernet/intel/i40e/i40e.h

+2 −0
Original line number Diff line number Diff line
@@ -442,6 +442,8 @@ struct i40e_veb { 
	bool stat_offsets_loaded;

	struct i40e_eth_stats stats;

	struct i40e_eth_stats stats_offsets;

	struct i40e_veb_tc_stats tc_stats;

	struct i40e_veb_tc_stats tc_stats_offsets;

};



/* struct that defines a VSI, associated with a dev */

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+22 −1
Original line number Diff line number Diff line
@@ -197,7 +197,14 @@ static const struct i40e_stats i40e_gstrings_fcoe_stats[] = { 
		 FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_tx) + \

		 FIELD_SIZEOF(struct i40e_pf, stats.priority_xon_2_xoff)) \

		 / sizeof(u64))

#define I40E_VEB_TC_STATS_LEN ( \

		(FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_rx_packets) + \

		 FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_rx_bytes) + \

		 FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_tx_packets) + \

		 FIELD_SIZEOF(struct i40e_veb, tc_stats.tc_tx_bytes)) \

		 / sizeof(u64))

#define I40E_VEB_STATS_LEN	ARRAY_SIZE(i40e_gstrings_veb_stats)

#define I40E_VEB_STATS_TOTAL	(I40E_VEB_STATS_LEN + I40E_VEB_TC_STATS_LEN)

#define I40E_PF_STATS_LEN(n)	(I40E_GLOBAL_STATS_LEN + \

				 I40E_PFC_STATS_LEN + \

				 I40E_VSI_STATS_LEN((n)))
@@ -1257,7 +1264,7 @@ static int i40e_get_sset_count(struct net_device *netdev, int sset) 
			int len = I40E_PF_STATS_LEN(netdev);



			if (pf->lan_veb != I40E_NO_VEB)

				len += I40E_VEB_STATS_LEN;

				len += I40E_VEB_STATS_TOTAL;

			return len;

		} else {

			return I40E_VSI_STATS_LEN(netdev);
@@ -1408,6 +1415,20 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset, 
					i40e_gstrings_veb_stats[i].stat_string);

				p += ETH_GSTRING_LEN;

			}

			for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

				snprintf(p, ETH_GSTRING_LEN,

					 "veb.tc_%u_tx_packets", i);

				p += ETH_GSTRING_LEN;

				snprintf(p, ETH_GSTRING_LEN,

					 "veb.tc_%u_tx_bytes", i);

				p += ETH_GSTRING_LEN;

				snprintf(p, ETH_GSTRING_LEN,

					 "veb.tc_%u_rx_packets", i);

				p += ETH_GSTRING_LEN;

				snprintf(p, ETH_GSTRING_LEN,

					 "veb.tc_%u_rx_bytes", i);

				p += ETH_GSTRING_LEN;

			}

		}

		for (i = 0; i < I40E_GLOBAL_STATS_LEN; i++) {

			snprintf(p, ETH_GSTRING_LEN, "port.%s",

drivers/net/ethernet/intel/i40e/i40e_main.c

+27 −1
Original line number Diff line number Diff line
@@ -624,11 +624,15 @@ static void i40e_update_veb_stats(struct i40e_veb *veb) 
	struct i40e_hw *hw = &pf->hw;

	struct i40e_eth_stats *oes;

	struct i40e_eth_stats *es;     /* device's eth stats */

	int idx = 0;

	struct i40e_veb_tc_stats *veb_oes;

	struct i40e_veb_tc_stats *veb_es;

	int i, idx = 0;



	idx = veb->stats_idx;

	es = &veb->stats;

	oes = &veb->stats_offsets;

	veb_es = &veb->tc_stats;

	veb_oes = &veb->tc_stats_offsets;



	/* Gather up the stats that the hw collects */

	i40e_stat_update32(hw, I40E_GLSW_TDPC(idx),
@@ -664,6 +668,28 @@ static void i40e_update_veb_stats(struct i40e_veb *veb) 
	i40e_stat_update48(hw, I40E_GLSW_BPTCH(idx), I40E_GLSW_BPTCL(idx),

			   veb->stat_offsets_loaded,

			   &oes->tx_broadcast, &es->tx_broadcast);

	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

		i40e_stat_update48(hw, I40E_GLVEBTC_RPCH(i, idx),

				   I40E_GLVEBTC_RPCL(i, idx),

				   veb->stat_offsets_loaded,

				   &veb_oes->tc_rx_packets[i],

				   &veb_es->tc_rx_packets[i]);

		i40e_stat_update48(hw, I40E_GLVEBTC_RBCH(i, idx),

				   I40E_GLVEBTC_RBCL(i, idx),

				   veb->stat_offsets_loaded,

				   &veb_oes->tc_rx_bytes[i],

				   &veb_es->tc_rx_bytes[i]);

		i40e_stat_update48(hw, I40E_GLVEBTC_TPCH(i, idx),

				   I40E_GLVEBTC_TPCL(i, idx),

				   veb->stat_offsets_loaded,

				   &veb_oes->tc_tx_packets[i],

				   &veb_es->tc_tx_packets[i]);

		i40e_stat_update48(hw, I40E_GLVEBTC_TBCH(i, idx),

				   I40E_GLVEBTC_TBCL(i, idx),

				   veb->stat_offsets_loaded,

				   &veb_oes->tc_tx_bytes[i],

				   &veb_es->tc_tx_bytes[i]);

	}

	veb->stat_offsets_loaded = true;

}

drivers/net/ethernet/intel/i40e/i40e_type.h

+8 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,14 @@ struct i40e_eth_stats { 
	u64 tx_errors;			/* tepc */

};



/* Statistics collected per VEB per TC */

struct i40e_veb_tc_stats {

	u64 tc_rx_packets[I40E_MAX_TRAFFIC_CLASS];

	u64 tc_rx_bytes[I40E_MAX_TRAFFIC_CLASS];

	u64 tc_tx_packets[I40E_MAX_TRAFFIC_CLASS];

	u64 tc_tx_bytes[I40E_MAX_TRAFFIC_CLASS];

};



#ifdef I40E_FCOE

/* Statistics collected per function for FCoE */

struct i40e_fcoe_stats {

drivers/net/ethernet/intel/i40evf/i40e_type.h

+8 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,14 @@ struct i40e_eth_stats { 
	u64 tx_errors;			/* tepc */

};



/* Statistics collected per VEB per TC */

struct i40e_veb_tc_stats {

	u64 tc_rx_packets[I40E_MAX_TRAFFIC_CLASS];

	u64 tc_rx_bytes[I40E_MAX_TRAFFIC_CLASS];

	u64 tc_tx_packets[I40E_MAX_TRAFFIC_CLASS];

	u64 tc_tx_bytes[I40E_MAX_TRAFFIC_CLASS];

};



/* Statistics collected by the MAC */

struct i40e_hw_port_stats {

	/* eth stats collected by the port */