diff options
| author | David Arinzon <darinzon@amazon.com> | 2024-01-01 19:08:51 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-01-03 18:00:57 -0800 |
| commit | b626fd9627d40fd291289dba9b53cd5cdbb17362 (patch) | |
| tree | 79cf45aebb0ec254b6b684b8418cc8233dba2ad1 /drivers/net/ethernet/amazon/ena/ena_netdev.c | |
| parent | 436c793585951464e2b679c440083daa19f6fb02 (diff) | |
net: ena: Refactor napi functions
This patch focuses on changes to the XDP part of the napi
polling routine.
1. Update the `napi_comp` stat only when napi is actually
complete.
2. Simplify the code by using a function pointer to the right
napi routine (XDP vs non-XDP path)
3. Remove unnecessary local variables.
4. Adjust a debug print to show the processed XDP frame index
rather than the pointer.
Signed-off-by: David Arinzon <darinzon@amazon.com>
Link: https://lore.kernel.org/r/20240101190855.18739-8-darinzon@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/amazon/ena/ena_netdev.c')
| -rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_netdev.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index 6ababac9aeeb..d65ee647f43b 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -1754,18 +1754,28 @@ static void ena_del_napi_in_range(struct ena_adapter *adapter, static void ena_init_napi_in_range(struct ena_adapter *adapter, int first_index, int count) { + int (*napi_handler)(struct napi_struct *napi, int budget); int i; for (i = first_index; i < first_index + count; i++) { struct ena_napi *napi = &adapter->ena_napi[i]; + struct ena_ring *rx_ring, *tx_ring; - netif_napi_add(adapter->netdev, &napi->napi, - ENA_IS_XDP_INDEX(adapter, i) ? ena_xdp_io_poll : ena_io_poll); + memset(napi, 0, sizeof(*napi)); + + rx_ring = &adapter->rx_ring[i]; + tx_ring = &adapter->tx_ring[i]; + + napi_handler = ena_io_poll; + if (ENA_IS_XDP_INDEX(adapter, i)) + napi_handler = ena_xdp_io_poll; + + netif_napi_add(adapter->netdev, &napi->napi, napi_handler); if (!ENA_IS_XDP_INDEX(adapter, i)) - napi->rx_ring = &adapter->rx_ring[i]; + napi->rx_ring = rx_ring; - napi->tx_ring = &adapter->tx_ring[i]; + napi->tx_ring = tx_ring; napi->qid = i; } } |