memif: handle unexpected EPOLLOUT for RX queue

[vpp.git] / src / plugins / memif / memif.c

diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index c1bab0b..e9bdf42 100644 (file)
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -193,6 +193,17 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err)
   clib_fifo_free (mif->msg_queue);
 }
 
+static clib_error_t *
+memif_int_fd_write_ready (clib_file_t * uf)
+{
+  memif_main_t *mm = &memif_main;
+  u16 qid = uf->private_data & 0xFFFF;
+  memif_if_t *mif = vec_elt_at_index (mm->interfaces, uf->private_data >> 16);
+
+  memif_log_warn (mif, "unexpected EPOLLOUT on RX for queue %u", qid);
+  return 0;
+}
+
 static clib_error_t *
 memif_int_fd_read_ready (clib_file_t * uf)
 {
@@ -255,6 +266,7 @@ memif_connect (memif_if_t * mif)
   /* *INDENT-ON* */
 
   template.read_function = memif_int_fd_read_ready;
+  template.write_function = memif_int_fd_write_ready;
 
   /* *INDENT-OFF* */
   vec_foreach_index (i, mif->tx_queues)
@@ -296,17 +308,17 @@ memif_connect (memif_if_t * mif)
       mq->buffer_pool_index =
        vlib_buffer_pool_get_default_for_numa (vm, vlib_mains[ti]->numa_node);
       rv = vnet_hw_interface_set_rx_mode (vnm, mif->hw_if_index, i,
-                                         VNET_HW_INTERFACE_RX_MODE_DEFAULT);
+                                         VNET_HW_IF_RX_MODE_DEFAULT);
       if (rv)
        memif_log_err
          (mif, "Warning: unable to set rx mode for interface %d queue %d: "
           "rc=%d", mif->hw_if_index, i, rv);
       else
        {
-         vnet_hw_interface_rx_mode rxmode;
+         vnet_hw_if_rx_mode rxmode;
          vnet_hw_interface_get_rx_mode (vnm, mif->hw_if_index, i, &rxmode);
 
-         if (rxmode == VNET_HW_INTERFACE_RX_MODE_POLLING)
+         if (rxmode == VNET_HW_IF_RX_MODE_POLLING)
            mq->ring->flags |= MEMIF_RING_FLAG_MASK_INT;
          else
            vnet_device_input_set_interrupt_pending (vnm, mif->hw_if_index, i);