ice: avoid XDP checks in ice_clean_tx_irq()
authorMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Thu, 3 Feb 2022 12:16:51 +0000 (13:16 +0100)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 9 Mar 2022 18:05:27 +0000 (10:05 -0800)
Commit 9610bd988df9 ("ice: optimize XDP_TX workloads") introduced Tx IRQ
cleaning routine dedicated for XDP rings. Currently it is impossible to
call ice_clean_tx_irq() against XDP ring, so it is safe to drop
ice_ring_is_xdp() calls in there.

Reviewed-by: Alexander Lobakin <alexandr.lobakin@intel.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com> (A Contingent Worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_txrx.c

index 853f57a..f9bf008 100644 (file)
@@ -223,8 +223,7 @@ static bool ice_clean_tx_irq(struct ice_tx_ring *tx_ring, int napi_budget)
        struct ice_tx_buf *tx_buf;
 
        /* get the bql data ready */
-       if (!ice_ring_is_xdp(tx_ring))
-               netdev_txq_bql_complete_prefetchw(txring_txq(tx_ring));
+       netdev_txq_bql_complete_prefetchw(txring_txq(tx_ring));
 
        tx_buf = &tx_ring->tx_buf[i];
        tx_desc = ICE_TX_DESC(tx_ring, i);
@@ -313,10 +312,6 @@ static bool ice_clean_tx_irq(struct ice_tx_ring *tx_ring, int napi_budget)
        tx_ring->next_to_clean = i;
 
        ice_update_tx_ring_stats(tx_ring, total_pkts, total_bytes);
-
-       if (ice_ring_is_xdp(tx_ring))
-               return !!budget;
-
        netdev_tx_completed_queue(txring_txq(tx_ring), total_pkts, total_bytes);
 
 #define TX_WAKE_THRESHOLD ((s16)(DESC_NEEDED * 2))