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

Commit 433c47de authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e/i40evf: Add Flow director stats to PF stats 



Add members to stat struct to keep track of Flow director ATR and
SideBand filter packet matches.

Change-ID: Ibbb31a53c7adcc2bb96991dd80565442a2f2513c
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2c50ef80

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

+13 −0
Original line number Diff line number Diff line
@@ -154,6 +154,17 @@ struct i40e_lump_tracking { 
#define I40E_FDIR_BUFFER_FULL_MARGIN	10

#define I40E_FDIR_BUFFER_HEAD_ROOM	200



enum i40e_fd_stat_idx {

	I40E_FD_STAT_ATR,

	I40E_FD_STAT_SB,

	I40E_FD_STAT_PF_COUNT

};

#define I40E_FD_STAT_PF_IDX(pf_id) ((pf_id) * I40E_FD_STAT_PF_COUNT)

#define I40E_FD_ATR_STAT_IDX(pf_id) \

			(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)



struct i40e_fdir_filter {

	struct hlist_node fdir_node;

	/* filter ipnut set */
@@ -223,6 +234,8 @@ struct i40e_pf { 


	struct hlist_head fdir_filter_list;

	u16 fdir_pf_active_filters;

	u16 fd_sb_cnt_idx;

	u16 fd_atr_cnt_idx;



#ifdef CONFIG_I40E_VXLAN

	__be16  vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];

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

+4 −1
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
	I40E_PF_STAT("rx_jabber", stats.rx_jabber),

	I40E_PF_STAT("VF_admin_queue_requests", vf_aq_requests),

	I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),

	I40E_PF_STAT("fdir_atr_match", stats.fd_atr_match),

	I40E_PF_STAT("fdir_sb_match", stats.fd_sb_match),



	/* LPI stats */

	I40E_PF_STAT("tx_lpi_status", stats.tx_lpi_status),

	I40E_PF_STAT("rx_lpi_status", stats.rx_lpi_status),
@@ -1581,7 +1584,7 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 
	input->pctype = 0;

	input->dest_vsi = vsi->id;

	input->fd_status = I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID;

	input->cnt_index = 0;

	input->cnt_index  = pf->fd_sb_cnt_idx;

	input->flow_type = fsp->flow_type;

	input->ip4_proto = fsp->h_u.usr_ip4_spec.proto;

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

+12 −0
Original line number Diff line number Diff line
@@ -1013,6 +1013,14 @@ static void i40e_update_pf_stats(struct i40e_pf *pf) 
			   pf->stat_offsets_loaded,

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



	/* FDIR stats */

	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_atr_cnt_idx),

			   pf->stat_offsets_loaded,

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

	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_sb_cnt_idx),

			   pf->stat_offsets_loaded,

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



	val = rd32(hw, I40E_PRTPM_EEE_STAT);

	nsd->tx_lpi_status =

		       (val & I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK) >>
@@ -6604,8 +6612,12 @@ static int i40e_sw_init(struct i40e_pf *pf) 
	    (pf->hw.func_caps.fd_filters_best_effort > 0)) {

		pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

		pf->atr_sample_rate = I40E_DEFAULT_ATR_SAMPLE_RATE;

		/* Setup a counter for fd_atr per pf */

		pf->fd_atr_cnt_idx = I40E_FD_ATR_STAT_IDX(pf->hw.pf_id);

		if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) {

			pf->flags |= I40E_FLAG_FD_SB_ENABLED;

			/* Setup a counter for fd_sb per pf */

			pf->fd_sb_cnt_idx = I40E_FD_SB_STAT_IDX(pf->hw.pf_id);

		} else {

			dev_info(&pf->pdev->dev,

				 "Flow Director Sideband mode Disabled in MFP mode\n");

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

+6 −1
Original line number Diff line number Diff line
@@ -1695,6 +1695,11 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	dtype_cmd |= I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID <<

		     I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT;



	dtype_cmd |= I40E_TXD_FLTR_QW1_CNT_ENA_MASK;

	dtype_cmd |=

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

		I40E_TXD_FLTR_QW1_CNTINDEX_MASK;



	fdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);

	fdir_desc->dtype_cmd_cntindex = cpu_to_le32(dtype_cmd);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,9 @@ struct i40e_hw_port_stats { 
	u64 tx_size_big;		/* ptc9522 */

	u64 mac_short_packet_dropped;	/* mspdc */

	u64 checksum_error;		/* xec */

	/* flow director stats */

	u64 fd_atr_match;

	u64 fd_sb_match;

	/* EEE LPI */

	u32 tx_lpi_status;

	u32 rx_lpi_status;