浏览代码

ixgbe: Simplify transmit cleanup path

This patch helps to simplify the work being done by the transmit path by
removing the unnecessary compares between count and the work limit.  Instead
we can simplify this by just adding a budget value that will act as a count
down from the work limit value.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Alexander Duyck 14 年之前
父节点
当前提交
30065e63d8
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+ 5 - 5
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

@@ -804,13 +804,13 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
 	struct ixgbe_tx_buffer *tx_buffer;
 	struct ixgbe_tx_buffer *tx_buffer;
 	union ixgbe_adv_tx_desc *tx_desc;
 	union ixgbe_adv_tx_desc *tx_desc;
 	unsigned int total_bytes = 0, total_packets = 0;
 	unsigned int total_bytes = 0, total_packets = 0;
+	u16 budget = q_vector->tx.work_limit;
 	u16 i = tx_ring->next_to_clean;
 	u16 i = tx_ring->next_to_clean;
-	u16 count;
 
 
 	tx_buffer = &tx_ring->tx_buffer_info[i];
 	tx_buffer = &tx_ring->tx_buffer_info[i];
 	tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
 	tx_desc = IXGBE_TX_DESC_ADV(tx_ring, i);
 
 
-	for (count = 0; count < q_vector->tx.work_limit; count++) {
+	for (; budget; budget--) {
 		union ixgbe_adv_tx_desc *eop_desc = tx_buffer->next_to_watch;
 		union ixgbe_adv_tx_desc *eop_desc = tx_buffer->next_to_watch;
 
 
 		/* if next_to_watch is not set then there is no work pending */
 		/* if next_to_watch is not set then there is no work pending */
@@ -891,11 +891,11 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
 		ixgbe_tx_timeout_reset(adapter);
 		ixgbe_tx_timeout_reset(adapter);
 
 
 		/* the adapter is about to reset, no point in enabling stuff */
 		/* the adapter is about to reset, no point in enabling stuff */
-		return true;
+		return budget;
 	}
 	}
 
 
 #define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
 #define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
-	if (unlikely(count && netif_carrier_ok(tx_ring->netdev) &&
+	if (unlikely(total_packets && netif_carrier_ok(tx_ring->netdev) &&
 		     (ixgbe_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) {
 		     (ixgbe_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD))) {
 		/* Make sure that anybody stopping the queue after this
 		/* Make sure that anybody stopping the queue after this
 		 * sees the new next_to_clean.
 		 * sees the new next_to_clean.
@@ -908,7 +908,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
 		}
 		}
 	}
 	}
 
 
-	return count < q_vector->tx.work_limit;
+	return budget;
 }
 }
 
 
 #ifdef CONFIG_IXGBE_DCA
 #ifdef CONFIG_IXGBE_DCA