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

Commit 60ccd45c authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e/i40evf: Add stats to count Tunnel ATR hits 



Add a 3rd dynamic filter counter to track Tunneled ATR hits separately.
Ethtool port stat "fdir_atr_tunnel_match"

Change-ID: Idd978b6db2a462b5722397cd2ffd04ef055f8655
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 89232c3b

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

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ struct i40e_lump_tracking { 
enum i40e_fd_stat_idx {

	I40E_FD_STAT_ATR,

	I40E_FD_STAT_SB,

	I40E_FD_STAT_ATR_TUNNEL,

	I40E_FD_STAT_PF_COUNT

};

#define I40E_FD_STAT_PF_IDX(pf_id) ((pf_id) * I40E_FD_STAT_PF_COUNT)
@@ -189,6 +190,8 @@ enum i40e_fd_stat_idx { 
			(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR)

#define I40E_FD_SB_STAT_IDX(pf_id)  \

			(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_SB)

#define I40E_FD_ATR_TUNNEL_STAT_IDX(pf_id) \

			(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR_TUNNEL)



struct i40e_fdir_filter {

	struct hlist_node fdir_node;

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

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
	I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),

	I40E_PF_STAT("fdir_flush_cnt", fd_flush_cnt),

	I40E_PF_STAT("fdir_atr_match", stats.fd_atr_match),

	I40E_PF_STAT("fdir_atr_tunnel_match", stats.fd_atr_tunnel_match),

	I40E_PF_STAT("fdir_sb_match", stats.fd_sb_match),



	/* LPI stats */

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

+4 −0
Original line number Diff line number Diff line
@@ -1102,6 +1102,10 @@ static void i40e_update_pf_stats(struct i40e_pf *pf) 
	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_sb_cnt_idx),

			   pf->stat_offsets_loaded,

			   &osd->fd_sb_match, &nsd->fd_sb_match);

	i40e_stat_update32(hw,

		      I40E_GLQF_PCNT(I40E_FD_ATR_TUNNEL_STAT_IDX(pf->hw.pf_id)),

		      pf->stat_offsets_loaded,

		      &osd->fd_atr_tunnel_match, &nsd->fd_atr_tunnel_match);



	val = rd32(hw, I40E_PRTPM_EEE_STAT);

	nsd->tx_lpi_status =

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

+10 −3
Original line number Diff line number Diff line
@@ -2033,8 +2033,15 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
		     I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT;



	dtype_cmd |= I40E_TXD_FLTR_QW1_CNT_ENA_MASK;

	if (!(tx_flags & I40E_TX_FLAGS_VXLAN_TUNNEL))

		dtype_cmd |=

		((u32)pf->fd_atr_cnt_idx << I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			((u32)I40E_FD_ATR_STAT_IDX(pf->hw.pf_id) <<

			I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			I40E_TXD_FLTR_QW1_CNTINDEX_MASK;

	else

		dtype_cmd |=

			((u32)I40E_FD_ATR_TUNNEL_STAT_IDX(pf->hw.pf_id) <<

			I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			I40E_TXD_FLTR_QW1_CNTINDEX_MASK;



	fdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);

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

+1 −0
Original line number Diff line number Diff line
@@ -1133,6 +1133,7 @@ struct i40e_hw_port_stats { 
	/* flow director stats */

	u64 fd_atr_match;

	u64 fd_sb_match;

	u64 fd_atr_tunnel_match;

	/* EEE LPI */

	u32 tx_lpi_status;

	u32 rx_lpi_status;