|
 |
2eb987 |
From 43d21134224146eb018c6a3f12b1baf59c74471d Mon Sep 17 00:00:00 2001
|
|
|
2eb987 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
2eb987 |
Date: Thu, 27 Aug 2020 19:22:40 +0200
|
|
|
2eb987 |
Subject: [PATCH 8/9] Revert "[netdrv] ice: Support XDP UMEM wake up mechanism"
|
|
|
2eb987 |
|
|
|
2eb987 |
This reverts commit 92ce8519e57bd849898ebe505aa7b616c69ae4cd.
|
|
|
2eb987 |
---
|
|
|
2eb987 |
drivers/net/ethernet/intel/ice/ice_xsk.c | 18 ------------------
|
|
|
2eb987 |
1 file changed, 18 deletions(-)
|
|
|
2eb987 |
|
|
|
2eb987 |
diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
|
|
|
2eb987 |
index ceb2238f5934..12180ea89339 100644
|
|
|
2eb987 |
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
|
|
|
2eb987 |
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
|
|
|
2eb987 |
@@ -937,15 +937,6 @@ int ice_clean_rx_irq_zc(struct ice_ring *rx_ring, int budget)
|
|
|
2eb987 |
ice_finalize_xdp_rx(rx_ring, xdp_xmit);
|
|
|
2eb987 |
ice_update_rx_ring_stats(rx_ring, total_rx_packets, total_rx_bytes);
|
|
|
2eb987 |
|
|
|
2eb987 |
- if (xsk_umem_uses_need_wakeup(rx_ring->xsk_umem)) {
|
|
|
2eb987 |
- if (failure || rx_ring->next_to_clean == rx_ring->next_to_use)
|
|
|
2eb987 |
- xsk_set_rx_need_wakeup(rx_ring->xsk_umem);
|
|
|
2eb987 |
- else
|
|
|
2eb987 |
- xsk_clear_rx_need_wakeup(rx_ring->xsk_umem);
|
|
|
2eb987 |
-
|
|
|
2eb987 |
- return (int)total_rx_packets;
|
|
|
2eb987 |
- }
|
|
|
2eb987 |
-
|
|
|
2eb987 |
return failure ? budget : (int)total_rx_packets;
|
|
|
2eb987 |
}
|
|
|
2eb987 |
|
|
|
2eb987 |
@@ -997,8 +988,6 @@ static bool ice_xmit_zc(struct ice_ring *xdp_ring, int budget)
|
|
|
2eb987 |
if (tx_desc) {
|
|
|
2eb987 |
ice_xdp_ring_update_tail(xdp_ring);
|
|
|
2eb987 |
xsk_umem_consume_tx_done(xdp_ring->xsk_umem);
|
|
|
2eb987 |
- if (xsk_umem_uses_need_wakeup(xdp_ring->xsk_umem))
|
|
|
2eb987 |
- xsk_clear_tx_need_wakeup(xdp_ring->xsk_umem);
|
|
|
2eb987 |
}
|
|
|
2eb987 |
|
|
|
2eb987 |
return budget > 0 && work_done;
|
|
|
2eb987 |
@@ -1074,13 +1063,6 @@ bool ice_clean_tx_irq_zc(struct ice_ring *xdp_ring, int budget)
|
|
|
2eb987 |
if (xsk_frames)
|
|
|
2eb987 |
xsk_umem_complete_tx(xdp_ring->xsk_umem, xsk_frames);
|
|
|
2eb987 |
|
|
|
2eb987 |
- if (xsk_umem_uses_need_wakeup(xdp_ring->xsk_umem)) {
|
|
|
2eb987 |
- if (xdp_ring->next_to_clean == xdp_ring->next_to_use)
|
|
|
2eb987 |
- xsk_set_tx_need_wakeup(xdp_ring->xsk_umem);
|
|
|
2eb987 |
- else
|
|
|
2eb987 |
- xsk_clear_tx_need_wakeup(xdp_ring->xsk_umem);
|
|
|
2eb987 |
- }
|
|
|
2eb987 |
-
|
|
|
2eb987 |
ice_update_tx_ring_stats(xdp_ring, total_packets, total_bytes);
|
|
|
2eb987 |
xmit_done = ice_xmit_zc(xdp_ring, ICE_DFLT_IRQ_WORK);
|
|
|
2eb987 |
|
|
|
2eb987 |
--
|
|
|
2eb987 |
2.13.6
|
|
|
2eb987 |
|