Explorar el Código

i40e/i40evf: Add a stat to track how many times we have to do a force WB

When in NAPI with interrupts disabled, the HW needs to be forced to do a
write back on TX if the number of descriptors pending are less than a
cache line.

This stat helps keep track of how many times we get into this situation.

Change-ID: I76c1bcc7ebccd6bffcc5aa33bfe05f2fa1c9a984
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Anjali Singhai Jain hace 9 años
padre
commit
164c9f5463

+ 1 - 0
drivers/net/ethernet/intel/i40e/i40e.h

@@ -487,6 +487,7 @@ struct i40e_vsi {
 	u32 tx_restart;
 	u32 tx_restart;
 	u32 tx_busy;
 	u32 tx_busy;
 	u64 tx_linearize;
 	u64 tx_linearize;
+	u64 tx_force_wb;
 	u32 rx_buf_failed;
 	u32 rx_buf_failed;
 	u32 rx_page_failed;
 	u32 rx_page_failed;
 
 

+ 1 - 0
drivers/net/ethernet/intel/i40e/i40e_ethtool.c

@@ -88,6 +88,7 @@ static const struct i40e_stats i40e_gstrings_misc_stats[] = {
 	I40E_VSI_STAT("tx_broadcast", eth_stats.tx_broadcast),
 	I40E_VSI_STAT("tx_broadcast", eth_stats.tx_broadcast),
 	I40E_VSI_STAT("rx_unknown_protocol", eth_stats.rx_unknown_protocol),
 	I40E_VSI_STAT("rx_unknown_protocol", eth_stats.rx_unknown_protocol),
 	I40E_VSI_STAT("tx_linearize", tx_linearize),
 	I40E_VSI_STAT("tx_linearize", tx_linearize),
+	I40E_VSI_STAT("tx_force_wb", tx_force_wb),
 };
 };
 
 
 /* These PF_STATs might look like duplicates of some NETDEV_STATs,
 /* These PF_STATs might look like duplicates of some NETDEV_STATs,

+ 4 - 1
drivers/net/ethernet/intel/i40e/i40e_main.c

@@ -881,6 +881,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)
 	u64 bytes, packets;
 	u64 bytes, packets;
 	unsigned int start;
 	unsigned int start;
 	u64 tx_linearize;
 	u64 tx_linearize;
+	u64 tx_force_wb;
 	u64 rx_p, rx_b;
 	u64 rx_p, rx_b;
 	u64 tx_p, tx_b;
 	u64 tx_p, tx_b;
 	u16 q;
 	u16 q;
@@ -899,7 +900,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)
 	 */
 	 */
 	rx_b = rx_p = 0;
 	rx_b = rx_p = 0;
 	tx_b = tx_p = 0;
 	tx_b = tx_p = 0;
-	tx_restart = tx_busy = tx_linearize = 0;
+	tx_restart = tx_busy = tx_linearize = tx_force_wb = 0;
 	rx_page = 0;
 	rx_page = 0;
 	rx_buf = 0;
 	rx_buf = 0;
 	rcu_read_lock();
 	rcu_read_lock();
@@ -917,6 +918,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)
 		tx_restart += p->tx_stats.restart_queue;
 		tx_restart += p->tx_stats.restart_queue;
 		tx_busy += p->tx_stats.tx_busy;
 		tx_busy += p->tx_stats.tx_busy;
 		tx_linearize += p->tx_stats.tx_linearize;
 		tx_linearize += p->tx_stats.tx_linearize;
+		tx_force_wb += p->tx_stats.tx_force_wb;
 
 
 		/* Rx queue is part of the same block as Tx queue */
 		/* Rx queue is part of the same block as Tx queue */
 		p = &p[1];
 		p = &p[1];
@@ -934,6 +936,7 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)
 	vsi->tx_restart = tx_restart;
 	vsi->tx_restart = tx_restart;
 	vsi->tx_busy = tx_busy;
 	vsi->tx_busy = tx_busy;
 	vsi->tx_linearize = tx_linearize;
 	vsi->tx_linearize = tx_linearize;
+	vsi->tx_force_wb = tx_force_wb;
 	vsi->rx_page_failed = rx_page;
 	vsi->rx_page_failed = rx_page;
 	vsi->rx_buf_failed = rx_buf;
 	vsi->rx_buf_failed = rx_buf;
 
 

+ 3 - 1
drivers/net/ethernet/intel/i40e/i40e_txrx.c

@@ -1925,8 +1925,10 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)
 	/* If work not completed, return budget and polling will return */
 	/* If work not completed, return budget and polling will return */
 	if (!clean_complete) {
 	if (!clean_complete) {
 tx_only:
 tx_only:
-		if (arm_wb)
+		if (arm_wb) {
+			q_vector->tx.ring[0].tx_stats.tx_force_wb++;
 			i40e_force_wb(vsi, q_vector);
 			i40e_force_wb(vsi, q_vector);
+		}
 		return budget;
 		return budget;
 	}
 	}
 
 

+ 1 - 0
drivers/net/ethernet/intel/i40e/i40e_txrx.h

@@ -202,6 +202,7 @@ struct i40e_tx_queue_stats {
 	u64 tx_busy;
 	u64 tx_busy;
 	u64 tx_done_old;
 	u64 tx_done_old;
 	u64 tx_linearize;
 	u64 tx_linearize;
+	u64 tx_force_wb;
 };
 };
 
 
 struct i40e_rx_queue_stats {
 struct i40e_rx_queue_stats {

+ 3 - 1
drivers/net/ethernet/intel/i40evf/i40e_txrx.c

@@ -1363,8 +1363,10 @@ int i40evf_napi_poll(struct napi_struct *napi, int budget)
 	/* If work not completed, return budget and polling will return */
 	/* If work not completed, return budget and polling will return */
 	if (!clean_complete) {
 	if (!clean_complete) {
 tx_only:
 tx_only:
-		if (arm_wb)
+		if (arm_wb) {
+			q_vector->tx.ring[0].tx_stats.tx_force_wb++;
 			i40evf_force_wb(vsi, q_vector);
 			i40evf_force_wb(vsi, q_vector);
+		}
 		return budget;
 		return budget;
 	}
 	}
 
 

+ 1 - 0
drivers/net/ethernet/intel/i40evf/i40e_txrx.h

@@ -201,6 +201,7 @@ struct i40e_tx_queue_stats {
 	u64 tx_busy;
 	u64 tx_busy;
 	u64 tx_done_old;
 	u64 tx_done_old;
 	u64 tx_linearize;
 	u64 tx_linearize;
+	u64 tx_force_wb;
 };
 };
 
 
 struct i40e_rx_queue_stats {
 struct i40e_rx_queue_stats {