ikev2: fix DNS resolution overflow

[vpp.git] / src / plugins / vmxnet3 / output.c

diff --git a/src/plugins/vmxnet3/output.c b/src/plugins/vmxnet3/output.c
index 81a1afb..8ba3f99 100644 (file)
--- a/src/plugins/vmxnet3/output.c
+++ b/src/plugins/vmxnet3/output.c
@@ -20,6 +20,8 @@
 #include <vlib/pci/pci.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/devices/devices.h>
+#include <vnet/ip/ip6_packet.h>
+#include <vnet/ip/ip4_packet.h>
 
 #include <vmxnet3/vmxnet3.h>
 
@@ -108,7 +110,8 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
   u16 space_left;
   u16 n_left = frame->n_vectors;
   vmxnet3_txq_t *txq;
-  u16 qid = vm->thread_index % vd->num_tx_queues, produce;
+  vnet_hw_if_tx_frame_t *tf = vlib_frame_scalar_args (frame);
+  u16 qid = tf->queue_id, produce;
 
   if (PREDICT_FALSE (!(vd->flags & VMXNET3_DEVICE_F_LINK_UP)))
     {
@@ -119,7 +122,8 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
     }
 
   txq = vec_elt_at_index (vd->txqs, qid);
-  clib_spinlock_lock_if_init (&txq->lock);
+  if (tf->shared_queue)
+    clib_spinlock_lock (&txq->lock);
 
   vmxnet3_txq_release (vm, vd, txq);
 
@@ -128,6 +132,7 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
     {
       u16 space_needed = 1, i;
       u32 gso_size = 0;
+      u32 l4_hdr_sz;
       vlib_buffer_t *b;
       u32 hdr_len = 0;
 
@@ -172,7 +177,6 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
       for (i = 0; i < space_needed; i++)
        {
          b0 = vlib_get_buffer (vm, bi0);
-         VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
 
          desc_idx = txq->tx_ring.produce;
 
@@ -193,8 +197,13 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
               */
              ASSERT (vd->gso_enable == 1);
              gso_size = vnet_buffer2 (b0)->gso_size;
-             hdr_len = vnet_buffer (b0)->l4_hdr_offset +
-               sizeof (ethernet_header_t);
+             l4_hdr_sz = vnet_buffer2 (b0)->gso_l4_hdr_sz;
+             if (b0->flags & VNET_BUFFER_F_IS_IP6)
+               hdr_len = sizeof (ethernet_header_t) + sizeof (ip6_header_t) +
+                 l4_hdr_sz;
+             else
+               hdr_len = sizeof (ethernet_header_t) + sizeof (ip4_header_t) +
+                 l4_hdr_sz;
            }
 
          generation = txq->tx_ring.gen;
@@ -202,9 +211,9 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
        }
       if (PREDICT_FALSE (gso_size != 0))
        {
-         txd->flags[1] = hdr_len;
-         txd->flags[1] |= VMXNET3_TXF_OM (VMXNET3_OM_TSO);
-         txd->flags[0] |= VMXNET3_TXF_MSSCOF (gso_size);
+         txq->tx_desc[first_idx].flags[1] = hdr_len;
+         txq->tx_desc[first_idx].flags[1] |= VMXNET3_TXF_OM (VMXNET3_OM_TSO);
+         txq->tx_desc[first_idx].flags[0] |= VMXNET3_TXF_MSSCOF (gso_size);
        }
       txd->flags[1] |= VMXNET3_TXF_CQ | VMXNET3_TXF_EOP;
       asm volatile ("":::"memory");
@@ -221,7 +230,8 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
   if (PREDICT_TRUE (produce != txq->tx_ring.produce))
     vmxnet3_reg_write_inline (vd, 0, txq->reg_txprod, txq->tx_ring.produce);
 
-  clib_spinlock_unlock_if_init (&txq->lock);
+  if (tf->shared_queue)
+    clib_spinlock_unlock (&txq->lock);
 
   return (frame->n_vectors - n_left);
 }