diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2021-05-11 13:19:56 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2021-05-21 21:07:02 +0000 |
| commit | 73b71225b1f6bdd65923ac8ac786ed226d57228e (patch) | |
| tree | a0570587574000feb7cfc00d76c82e478ed893f9 /src/plugins/af_xdp/input.c | |
| parent | efd4d702105bf86cd74ae777668d2c17e3a85bbc (diff) | |
af_xdp: refill rx rings when interface goes up
If interrupt mode is configured through startup.conf exec script, the
input function will not be polled and the rx ring will never be filled.
Always refill the ring when interface goes up so it is ready to receive
packets.
Type: fix
Change-Id: I4cf22c8ae00638679f2e8650303a6fe916c1319b
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'src/plugins/af_xdp/input.c')
| -rw-r--r-- | src/plugins/af_xdp/input.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/plugins/af_xdp/input.c b/src/plugins/af_xdp/input.c index dcbf5a4b587..98d841b77a0 100644 --- a/src/plugins/af_xdp/input.c +++ b/src/plugins/af_xdp/input.c @@ -83,8 +83,9 @@ af_xdp_device_input_refill_db (vlib_main_t * vm, !xsk_ring_prod__needs_wakeup (&rxq->fq)) return; - vlib_error_count (vm, node->node_index, AF_XDP_INPUT_ERROR_SYSCALL_REQUIRED, - 1); + if (node) + vlib_error_count (vm, node->node_index, + AF_XDP_INPUT_ERROR_SYSCALL_REQUIRED, 1); if (clib_spinlock_trylock_if_init (&rxq->syscall_lock)) { @@ -94,18 +95,19 @@ af_xdp_device_input_refill_db (vlib_main_t * vm, if (PREDICT_FALSE (ret < 0)) { /* something bad is happening */ - vlib_error_count (vm, node->node_index, - AF_XDP_INPUT_ERROR_SYSCALL_FAILURES, 1); + if (node) + vlib_error_count (vm, node->node_index, + AF_XDP_INPUT_ERROR_SYSCALL_FAILURES, 1); af_xdp_device_error (ad, "rx poll() failed"); } } } static_always_inline void -af_xdp_device_input_refill (vlib_main_t * vm, - const vlib_node_runtime_t * node, - af_xdp_device_t * ad, af_xdp_rxq_t * rxq, - const int copy) +af_xdp_device_input_refill_inline (vlib_main_t *vm, + const vlib_node_runtime_t *node, + af_xdp_device_t *ad, af_xdp_rxq_t *rxq, + const int copy) { __u64 *fill; const u32 size = rxq->fq.size; @@ -313,7 +315,7 @@ af_xdp_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, ad->hw_if_index, n_rx_packets, n_rx_bytes); refill: - af_xdp_device_input_refill (vm, node, ad, rxq, copy); + af_xdp_device_input_refill_inline (vm, node, ad, rxq, copy); return n_rx_packets; } @@ -343,6 +345,18 @@ VLIB_NODE_FN (af_xdp_input_node) (vlib_main_t * vm, return n_rx; } +#ifndef CLIB_MARCH_VARIANT +void +af_xdp_device_input_refill (af_xdp_device_t *ad) +{ + vlib_main_t *vm = vlib_get_main (); + af_xdp_rxq_t *rxq; + vec_foreach (rxq, ad->rxqs) + af_xdp_device_input_refill_inline ( + vm, 0, ad, rxq, 0 == (ad->flags & AF_XDP_DEVICE_F_ZEROCOPY)); +} +#endif /* CLIB_MARCH_VARIANT */ + /* *INDENT-OFF* */ VLIB_REGISTER_NODE (af_xdp_input_node) = { .name = "af_xdp-input", |