diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-05 01:43:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-05 01:43:01 +0300 |
| commit | a9a7d12954893f817dcb0652c488c7e823e7b8c6 (patch) | |
| tree | 586195c55f9cfb98d735603a97c443c137932056 /drivers/net | |
| parent | bb986a50421a11bf31a81afb15b9b8f45a4a3a11 (diff) | |
| parent | 3921a81c31df6057183aeb7f7d204003bf699d6f (diff) | |
| download | linux-a9a7d12954893f817dcb0652c488c7e823e7b8c6.tar.xz | |
Merge branch 'ena-xdp-fixes'
Sameeh Jubran says:
====================
Fix xdp in ena driver
This patchset includes 2 XDP related bug fixes
Difference from v1:
* Fixed "Fixes" tag
====================
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index a0af74c93971..dda4b8fc9525 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -355,7 +355,7 @@ error_unmap_dma: ena_unmap_tx_buff(xdp_ring, tx_info); tx_info->xdpf = NULL; error_drop_packet: - + __free_page(tx_info->xdp_rx_page); return NETDEV_TX_OK; } @@ -1646,11 +1646,9 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, &next_to_clean); if (unlikely(!skb)) { - if (xdp_verdict == XDP_TX) { + if (xdp_verdict == XDP_TX) ena_free_rx_page(rx_ring, &rx_ring->rx_buffer_info[rx_ring->ena_bufs[0].req_id]); - res_budget--; - } for (i = 0; i < ena_rx_ctx.descs; i++) { rx_ring->free_ids[next_to_clean] = rx_ring->ena_bufs[i].req_id; @@ -1658,8 +1656,10 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, ENA_RX_RING_IDX_NEXT(next_to_clean, rx_ring->ring_size); } - if (xdp_verdict == XDP_TX || xdp_verdict == XDP_DROP) + if (xdp_verdict != XDP_PASS) { + res_budget--; continue; + } break; } |