summaryrefslogtreecommitdiffstats
path: root/src/vnet/interface
diff options
context:
space:
mode:
authorMohammed Hawari <mohammed@hawari.fr>2021-01-29 10:12:53 +0100
committerDamjan Marion <dmarion@me.com>2021-02-08 17:54:29 +0000
commit4c71d6c8f84d48754a8ead116f223088b85f587c (patch)
tree88afe9787810677a22ad856098e1345b4e6fb9df /src/vnet/interface
parent8f010843c57a258aa41880f3d49f3952bc2223f9 (diff)
interface: automask interrupts to polling rxqs
Sometimes, vnet_hw_if_rx_queue_set_int_pending is called on rxqs which are not in interrupt mode. Currently, it segfaults due to a too small clib_interrupt_t structure. This change prevents that and makes the framework slightly more robust to driver bugs (that might be subtle to track in some cases involving concurrency...) Change-Id: I9643b9b1aa37e6852754b93f10cd2f96ed9e6118 Signed-off-by: Mohammed Hawari <mohammed@hawari.fr> Type: fix
Diffstat (limited to 'src/vnet/interface')
-rw-r--r--src/vnet/interface/rx_queue_funcs.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vnet/interface/rx_queue_funcs.h b/src/vnet/interface/rx_queue_funcs.h
index f3dd65a39f7..c36263ea02b 100644
--- a/src/vnet/interface/rx_queue_funcs.h
+++ b/src/vnet/interface/rx_queue_funcs.h
@@ -54,8 +54,10 @@ vnet_hw_if_rx_queue_set_int_pending (vnet_main_t *vnm, u32 queue_index)
vnet_hw_if_rx_queue_t *rxq = vnet_hw_if_get_rx_queue (vnm, queue_index);
vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, rxq->hw_if_index);
vlib_main_t *vm = vlib_mains[rxq->thread_index];
-
vnet_hw_if_rx_node_runtime_t *rt;
+ if (PREDICT_FALSE (rxq->mode != VNET_HW_IF_RX_MODE_INTERRUPT &&
+ rxq->mode != VNET_HW_IF_RX_MODE_ADAPTIVE))
+ return;
rt = vlib_node_get_runtime_data (vm, hi->input_node_index);
if (vm == vlib_get_main ())
clib_interrupt_set (rt->rxq_interrupts, queue_index);