X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Foutput.c;h=2001c117d389bb81490f0c26131e5bd58020f2d1;hb=998dfd3c0fa1e25d3cea247fd9391a158108858b;hp=ec4d7f6c0a2546a4763cef696d78eab397f3fcad;hpb=812b32dd8f637118bf65de2cdff0e95b421a963b;p=vpp.git

diff --git a/src/plugins/avf/output.c b/src/plugins/avf/output.c
index ec4d7f6c0a2..2001c117d38 100644
--- a/src/plugins/avf/output.c
+++ b/src/plugins/avf/output.c
@@ -26,6 +26,7 @@
 #define AVF_TXQ_DESC_CMD(x)             (1 << (x + 4))
 #define AVF_TXQ_DESC_CMD_EOP		AVF_TXQ_DESC_CMD(0)
 #define AVF_TXQ_DESC_CMD_RS		AVF_TXQ_DESC_CMD(1)
+#define AVF_TXQ_DESC_CMD_RSV		AVF_TXQ_DESC_CMD(2)
 
 static_always_inline u8
 avf_tx_desc_get_dtyp (avf_tx_desc_t * d)
@@ -33,15 +34,14 @@ avf_tx_desc_get_dtyp (avf_tx_desc_t * d)
   return d->qword[1] & 0x0f;
 }
 
-uword
-CLIB_MULTIARCH_FN (avf_interface_tx) (vlib_main_t * vm,
-				      vlib_node_runtime_t * node,
-				      vlib_frame_t * frame)
+VNET_DEVICE_CLASS_TX_FN (avf_device_class) (vlib_main_t * vm,
+					    vlib_node_runtime_t * node,
+					    vlib_frame_t * frame)
 {
   avf_main_t *am = &avf_main;
   vnet_interface_output_runtime_t *rd = (void *) node->runtime_data;
   avf_device_t *ad = pool_elt_at_index (am->devices, rd->dev_instance);
-  u32 thread_index = vlib_get_thread_index ();
+  u32 thread_index = vm->thread_index;
   u8 qid = thread_index;
   avf_txq_t *txq = vec_elt_at_index (ad->txqs, qid % ad->num_queue_pairs);
   avf_tx_desc_t *d0, *d1, *d2, *d3;
@@ -50,16 +50,18 @@ CLIB_MULTIARCH_FN (avf_interface_tx) (vlib_main_t * vm,
   u16 n_left = frame->n_vectors;
   vlib_buffer_t *b0, *b1, *b2, *b3;
   u16 mask = txq->size - 1;
+  u64 bits = (AVF_TXQ_DESC_CMD_EOP | AVF_TXQ_DESC_CMD_RS |
+	      AVF_TXQ_DESC_CMD_RSV);
 
   clib_spinlock_lock_if_init (&txq->lock);
 
   /* release cosumed bufs */
-  if (txq->n_bufs)
+  if (txq->n_enqueued)
     {
       u16 first, slot, n_free = 0;
-      first = slot = (txq->next - txq->n_bufs) & mask;
+      first = slot = (txq->next - txq->n_enqueued) & mask;
       d0 = txq->descs + slot;
-      while (n_free < txq->n_bufs && avf_tx_desc_get_dtyp (d0) == 0x0F)
+      while (n_free < txq->n_enqueued && avf_tx_desc_get_dtyp (d0) == 0x0F)
 	{
 	  n_free++;
 	  slot = (slot + 1) & mask;
@@ -68,13 +70,13 @@ CLIB_MULTIARCH_FN (avf_interface_tx) (vlib_main_t * vm,
 
       if (n_free)
 	{
-	  txq->n_bufs -= n_free;;
+	  txq->n_enqueued -= n_free;
 	  vlib_buffer_free_from_ring (vm, txq->bufs, first, txq->size,
 				      n_free);
 	}
     }
 
-  while (n_left >= 7)
+  while (n_left >= 8)
     {
       u16 slot0, slot1, slot2, slot3;
 
@@ -111,20 +113,19 @@ CLIB_MULTIARCH_FN (avf_interface_tx) (vlib_main_t * vm,
       d->qword[0] = vlib_get_buffer_data_physical_address (vm, bi0) +
 	b0->current_data;
 #else
-      d0->qword[0] = pointer_to_uword (b0->data);
-      d1->qword[0] = pointer_to_uword (b1->data);
-      d2->qword[0] = pointer_to_uword (b2->data);
-      d3->qword[0] = pointer_to_uword (b3->data);
+      d0->qword[0] = pointer_to_uword (b0->data) + b0->current_data;
+      d1->qword[0] = pointer_to_uword (b1->data) + b1->current_data;
+      d2->qword[0] = pointer_to_uword (b2->data) + b2->current_data;
+      d3->qword[0] = pointer_to_uword (b3->data) + b3->current_data;
 
 #endif
-      u64 bits = AVF_TXQ_DESC_CMD_EOP | AVF_TXQ_DESC_CMD_RS;
       d0->qword[1] = ((u64) b0->current_length) << 34 | bits;
       d1->qword[1] = ((u64) b1->current_length) << 34 | bits;
       d2->qword[1] = ((u64) b2->current_length) << 34 | bits;
       d3->qword[1] = ((u64) b3->current_length) << 34 | bits;
 
       txq->next = (txq->next + 4) & mask;
-      txq->n_bufs += 4;
+      txq->n_enqueued += 4;
       buffers += 4;
       n_left -= 4;
     }
@@ -140,14 +141,12 @@ CLIB_MULTIARCH_FN (avf_interface_tx) (vlib_main_t * vm,
       d->qword[0] = vlib_get_buffer_data_physical_address (vm, bi0) +
 	b0->current_data;
 #else
-      d0->qword[0] = pointer_to_uword (b0->data);
-
+      d0->qword[0] = pointer_to_uword (b0->data) + b0->current_data;
 #endif
-      d0->qword[1] = ((u64) b0->current_length) << 34;
-      d0->qword[1] |= AVF_TXQ_DESC_CMD_EOP | AVF_TXQ_DESC_CMD_RS;
+      d0->qword[1] = (((u64) b0->current_length) << 34) | bits;
 
       txq->next = (txq->next + 1) & mask;
-      txq->n_bufs++;
+      txq->n_enqueued++;
       buffers++;
       n_left--;
     }
@@ -159,21 +158,6 @@ CLIB_MULTIARCH_FN (avf_interface_tx) (vlib_main_t * vm,
   return frame->n_vectors - n_left;
 }
 
-#ifndef CLIB_MARCH_VARIANT
-#if __x86_64__
-vlib_node_function_t __clib_weak avf_interface_tx_avx512;
-vlib_node_function_t __clib_weak avf_interface_tx_avx2;
-static void __clib_constructor
-avf_interface_tx_multiarch_select (void)
-{
-  if (avf_interface_tx_avx512 && clib_cpu_supports_avx512f ())
-    avf_device_class.tx_function = avf_interface_tx_avx512;
-  else if (avf_interface_tx_avx2 && clib_cpu_supports_avx2 ())
-    avf_device_class.tx_function = avf_interface_tx_avx2;
-}
-#endif
-#endif
-
 /*
  * fd.io coding-style-patch-verification: ON
  *