From 426a306cc10559275b809d68f3045deb80f928cb Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Wed, 25 Nov 2020 10:41:26 +0100 Subject: af_xdp: update interrupt mode to new infra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Type: improvement Change-Id: Icb23af5f5e458a555f416cb0a829e84646b25dd9 Signed-off-by: Benoît Ganne --- src/plugins/af_xdp/input.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'src/plugins/af_xdp/input.c') diff --git a/src/plugins/af_xdp/input.c b/src/plugins/af_xdp/input.c index 2cf121fb69d..65eee75cb92 100644 --- a/src/plugins/af_xdp/input.c +++ b/src/plugins/af_xdp/input.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "af_xdp.h" #define foreach_af_xdp_input_error \ @@ -326,22 +327,22 @@ VLIB_NODE_FN (af_xdp_input_node) (vlib_main_t * vm, { u32 n_rx = 0; af_xdp_main_t *am = &af_xdp_main; - vnet_device_input_runtime_t *rt = (void *) node->runtime_data; - vnet_device_and_queue_t *dq; - - foreach_device_and_queue (dq, rt->devices_and_queues) - { - af_xdp_device_t *ad; - ad = vec_elt_at_index (am->devices, dq->dev_instance); - if ((ad->flags & AF_XDP_DEVICE_F_ADMIN_UP) == 0) - continue; - if (PREDICT_TRUE (ad->flags & AF_XDP_DEVICE_F_ZEROCOPY)) - n_rx += af_xdp_device_input_inline (vm, node, frame, ad, dq->queue_id, - /* copy */ 0); - else - n_rx += af_xdp_device_input_inline (vm, node, frame, ad, dq->queue_id, - /* copy */ 1); - } + vnet_hw_if_rxq_poll_vector_t *p, + *pv = vnet_hw_if_get_rxq_poll_vector (vm, node); + + vec_foreach (p, pv) + { + af_xdp_device_t *ad = vec_elt_at_index (am->devices, p->dev_instance); + if ((ad->flags & AF_XDP_DEVICE_F_ADMIN_UP) == 0) + continue; + if (PREDICT_TRUE (ad->flags & AF_XDP_DEVICE_F_ZEROCOPY)) + n_rx += af_xdp_device_input_inline (vm, node, frame, ad, p->queue_id, + /* copy */ 0); + else + n_rx += af_xdp_device_input_inline (vm, node, frame, ad, p->queue_id, + /* copy */ 1); + } + return n_rx; } -- cgit 1.2.3-korg