X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Favf%2Fdevice.c;h=cf493dd41b659516804d0a7acdea7f9f7de9cb19;hb=e430b6ec123dbe117b579d8284d7201da635be8d;hp=6bf1fe05f05eac7ace75a488c87788063a9f6385;hpb=5100aa9cb9e7acff35fa3bfde8aa95b5ace60344;p=vpp.git

diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c
index 6bf1fe05f05..cf493dd41b6 100644
--- a/src/plugins/avf/device.c
+++ b/src/plugins/avf/device.c
@@ -106,7 +106,7 @@ avf_aq_desc_enq (vlib_main_t * vm, avf_device_t * ad, avf_aq_desc_t * dt,
   int n_retry = 5;
 
   d = &ad->atq[ad->atq_next_slot];
-  clib_memcpy (d, dt, sizeof (avf_aq_desc_t));
+  clib_memcpy_fast (d, dt, sizeof (avf_aq_desc_t));
   d->flags |= AVF_AQ_F_RD | AVF_AQ_F_SI;
   if (len)
     d->datalen = len;
@@ -116,13 +116,13 @@ avf_aq_desc_enq (vlib_main_t * vm, avf_device_t * ad, avf_aq_desc_t * dt,
       pa = ad->atq_bufs_pa + ad->atq_next_slot * AVF_MBOX_BUF_SZ;
       d->addr_hi = (u32) (pa >> 32);
       d->addr_lo = (u32) pa;
-      clib_memcpy (ad->atq_bufs + ad->atq_next_slot * AVF_MBOX_BUF_SZ, data,
-		   len);
+      clib_memcpy_fast (ad->atq_bufs + ad->atq_next_slot * AVF_MBOX_BUF_SZ,
+			data, len);
       d->flags |= AVF_AQ_F_BUF;
     }
 
   if (ad->flags & AVF_DEVICE_F_ELOG)
-    clib_memcpy (&dc, d, sizeof (avf_aq_desc_t));
+    clib_memcpy_fast (&dc, d, sizeof (avf_aq_desc_t));
 
   CLIB_MEMORY_BARRIER ();
   vlib_log_debug (am->log_class, "%U", format_hexdump, data, len);
@@ -144,7 +144,7 @@ retry:
       goto retry;
     }
 
-  clib_memcpy (dt, d, sizeof (avf_aq_desc_t));
+  clib_memcpy_fast (dt, d, sizeof (avf_aq_desc_t));
   if (d->flags & AVF_AQ_F_ERR)
     return clib_error_return (0, "adminq enqueue error [opcode 0x%x, retval "
 			      "%d]", d->opcode, d->retval);
@@ -398,7 +398,7 @@ retry:
 	return clib_error_return (0, "event message error");
 
       vec_add2 (ad->events, e, 1);
-      clib_memcpy (e, buf, sizeof (virtchnl_pf_event_t));
+      clib_memcpy_fast (e, buf, sizeof (virtchnl_pf_event_t));
       avf_arq_slot_init (ad, ad->arq_next_slot);
       ad->arq_next_slot++;
       n_retry = 5;
@@ -425,7 +425,7 @@ retry:
   if (d->flags & AVF_AQ_F_BUF)
     {
       void *buf = ad->arq_bufs + ad->arq_next_slot * AVF_MBOX_BUF_SZ;
-      clib_memcpy (out, buf, out_len);
+      clib_memcpy_fast (out, buf, out_len);
     }
 
   avf_arq_slot_init (ad, ad->arq_next_slot);
@@ -637,7 +637,7 @@ avf_op_add_eth_addr (vlib_main_t * vm, avf_device_t * ad, u8 count, u8 * macs)
   al->vsi_id = ad->vsi_id;
   al->num_elements = count;
   for (i = 0; i < count; i++)
-    clib_memcpy (&al->list[i].addr, macs + i * 6, 6);
+    clib_memcpy_fast (&al->list[i].addr, macs + i * 6, 6);
   return avf_send_to_pf (vm, ad, VIRTCHNL_OP_ADD_ETH_ADDR, msg, msg_len, 0,
 			 0);
 }
@@ -788,7 +788,7 @@ avf_device_init (vlib_main_t * vm, avf_main_t * am, avf_device_t * ad,
   ad->rss_key_size = res.rss_key_size;
   ad->rss_lut_size = res.rss_lut_size;
 
-  clib_memcpy (ad->hwaddr, res.vsi_res[0].default_mac_addr, 6);
+  clib_memcpy_fast (ad->hwaddr, res.vsi_res[0].default_mac_addr, 6);
 
   /*
    * Disable VLAN stripping
@@ -1169,6 +1169,7 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad)
     }
   /* *INDENT-ON* */
   vec_free (ad->txqs);
+  vec_free (ad->name);
 
   clib_error_free (ad->error);
   clib_memset (ad, 0, sizeof (*ad));
@@ -1201,6 +1202,7 @@ avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args)
   pool_get (am->devices, ad);
   ad->dev_instance = ad - am->devices;
   ad->per_interface_next_index = ~0;
+  ad->name = vec_dup (args->name);
 
   if (args->enable_elog)
     ad->flags |= AVF_DEVICE_F_ELOG;
@@ -1405,7 +1407,6 @@ avf_init (vlib_main_t * vm)
   avf_main_t *am = &avf_main;
   clib_error_t *error;
   vlib_thread_main_t *tm = vlib_get_thread_main ();
-  int i;
 
   if ((error = vlib_call_init_function (vm, pci_bus_init)))
     return error;
@@ -1413,30 +1414,6 @@ avf_init (vlib_main_t * vm)
   vec_validate_aligned (am->per_thread_data, tm->n_vlib_mains - 1,
 			CLIB_CACHE_LINE_BYTES);
 
-  /* initialize ptype based loopup table */
-  vec_validate_aligned (am->ptypes, 255, CLIB_CACHE_LINE_BYTES);
-
-  /* *INDENT-OFF* */
-  vec_foreach_index (i, am->ptypes)
-    {
-      avf_ptype_t *p = vec_elt_at_index (am->ptypes, i);
-      if ((i >= 22) && (i <= 87))
-	{
-	  p->next_node = VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
-	  p->flags = VNET_BUFFER_F_IS_IP4;
-	}
-      else if ((i >= 88) && (i <= 153))
-	{
-	  p->next_node = VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
-	  p->flags = VNET_BUFFER_F_IS_IP6;
-	}
-      else
-	p->next_node = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-      p->buffer_advance = device_input_next_node_advance[p->next_node];
-      p->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID;
-    }
-  /* *INDENT-ON* */
-
   am->log_class = vlib_log_register_class ("avf_plugin", 0);
   vlib_log_debug (am->log_class, "initialized");