c11 safe string handling support

[vpp.git] / src / plugins / avf / device.c

diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c
index 71105e8..914c32c 100644 (file)
--- a/src/plugins/avf/device.c
+++ b/src/plugins/avf/device.c
@@ -227,7 +227,7 @@ avf_rxq_init (vlib_main_t * vm, avf_device_t * ad, u16 qid, u16 rxq_size)
   rxq->descs = vlib_physmem_alloc_aligned (vm, am->physmem_region, &error,
                                           rxq->size * sizeof (avf_rx_desc_t),
                                           2 * CLIB_CACHE_LINE_BYTES);
-  memset ((void *) rxq->descs, 0, rxq->size * sizeof (avf_rx_desc_t));
+  clib_memset ((void *) rxq->descs, 0, rxq->size * sizeof (avf_rx_desc_t));
   vec_validate_aligned (rxq->bufs, rxq->size, CLIB_CACHE_LINE_BYTES);
   rxq->qrx_tail = ad->bar0 + AVF_QRX_TAIL (qid);
 
@@ -240,14 +240,11 @@ avf_rxq_init (vlib_main_t * vm, avf_device_t * ad, u16 qid, u16 rxq_size)
   avf_rx_desc_t *d = rxq->descs;
   for (i = 0; i < n_alloc; i++)
     {
+      vlib_buffer_t *b = vlib_get_buffer (vm, rxq->bufs[i]);
       if (ad->flags & AVF_DEVICE_F_IOVA)
-       {
-         vlib_buffer_t *b = vlib_get_buffer (vm, rxq->bufs[i]);
-         d->qword[0] = pointer_to_uword (b->data);
-       }
+       d->qword[0] = vlib_buffer_get_va (b);
       else
-       d->qword[0] =
-         vlib_get_buffer_data_physical_address (vm, rxq->bufs[i]);
+       d->qword[0] = vlib_buffer_get_pa (vm, b);
       d++;
     }
 
@@ -298,7 +295,7 @@ avf_arq_slot_init (avf_device_t * ad, u16 slot)
   avf_aq_desc_t *d;
   u64 pa = ad->arq_bufs_pa + slot * AVF_MBOX_BUF_SZ;
   d = &ad->arq[slot];
-  memset (d, 0, sizeof (avf_aq_desc_t));
+  clib_memset (d, 0, sizeof (avf_aq_desc_t));
   d->flags = AVF_AQ_F_BUF;
   d->datalen = AVF_MBOX_BUF_SZ;
   d->addr_hi = (u32) (pa >> 32);
@@ -321,7 +318,7 @@ avf_adminq_init (vlib_main_t * vm, avf_device_t * ad)
   int i;
 
   /* VF MailBox Transmit */
-  memset (ad->atq, 0, sizeof (avf_aq_desc_t) * AVF_MBOX_LEN);
+  clib_memset (ad->atq, 0, sizeof (avf_aq_desc_t) * AVF_MBOX_LEN);
   ad->atq_bufs_pa = avf_dma_addr (vm, ad, ad->atq_bufs);
 
   pa = avf_dma_addr (vm, ad, ad->atq);
@@ -332,7 +329,7 @@ avf_adminq_init (vlib_main_t * vm, avf_device_t * ad)
   avf_reg_write (ad, AVF_ATQBAH, (u32) (pa >> 32));    /* Base Address High */
 
   /* VF MailBox Receive */
-  memset (ad->arq, 0, sizeof (avf_aq_desc_t) * AVF_MBOX_LEN);
+  clib_memset (ad->arq, 0, sizeof (avf_aq_desc_t) * AVF_MBOX_LEN);
   ad->arq_bufs_pa = avf_dma_addr (vm, ad, ad->arq_bufs);
 
   for (i = 0; i < AVF_MBOX_LEN; i++)
@@ -501,7 +498,7 @@ avf_op_config_rss_lut (vlib_main_t * vm, avf_device_t * ad)
   u8 msg[msg_len];
   virtchnl_rss_lut_t *rl;
 
-  memset (msg, 0, msg_len);
+  clib_memset (msg, 0, msg_len);
   rl = (virtchnl_rss_lut_t *) msg;
   rl->vsi_id = ad->vsi_id;
   rl->lut_entries = ad->rss_lut_size;
@@ -520,7 +517,7 @@ avf_op_config_rss_key (vlib_main_t * vm, avf_device_t * ad)
   u8 msg[msg_len];
   virtchnl_rss_key_t *rk;
 
-  memset (msg, 0, msg_len);
+  clib_memset (msg, 0, msg_len);
   rk = (virtchnl_rss_key_t *) msg;
   rk->vsi_id = ad->vsi_id;
   rk->key_len = ad->rss_key_size;
@@ -561,7 +558,7 @@ avf_op_config_vsi_queues (vlib_main_t * vm, avf_device_t * ad)
   u8 msg[msg_len];
   virtchnl_vsi_queue_config_info_t *ci;
 
-  memset (msg, 0, msg_len);
+  clib_memset (msg, 0, msg_len);
   ci = (virtchnl_vsi_queue_config_info_t *) msg;
   ci->vsi_id = ad->vsi_id;
   ci->num_queue_pairs = n_qp;
@@ -606,7 +603,7 @@ avf_op_config_irq_map (vlib_main_t * vm, avf_device_t * ad)
   u8 msg[msg_len];
   virtchnl_irq_map_info_t *imi;
 
-  memset (msg, 0, msg_len);
+  clib_memset (msg, 0, msg_len);
   imi = (virtchnl_irq_map_info_t *) msg;
   imi->num_vectors = count;
 
@@ -627,7 +624,7 @@ avf_op_add_eth_addr (vlib_main_t * vm, avf_device_t * ad, u8 count, u8 * macs)
   virtchnl_ether_addr_list_t *al;
   int i;
 
-  memset (msg, 0, msg_len);
+  clib_memset (msg, 0, msg_len);
   al = (virtchnl_ether_addr_list_t *) msg;
   al->vsi_id = ad->vsi_id;
   al->num_elements = count;
@@ -1039,11 +1036,10 @@ VLIB_REGISTER_NODE (avf_process_node, static)  = {
 /* *INDENT-ON* */
 
 static void
-avf_irq_0_handler (vlib_pci_dev_handle_t h, u16 line)
+avf_irq_0_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line)
 {
-  vlib_main_t *vm = vlib_get_main ();
   avf_main_t *am = &avf_main;
-  uword pd = vlib_pci_get_private_data (h);
+  uword pd = vlib_pci_get_private_data (vm, h);
   avf_device_t *ad = pool_elt_at_index (am->devices, pd);
   u32 icr0;
 
@@ -1078,12 +1074,11 @@ avf_irq_0_handler (vlib_pci_dev_handle_t h, u16 line)
 }
 
 static void
-avf_irq_n_handler (vlib_pci_dev_handle_t h, u16 line)
+avf_irq_n_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line)
 {
   vnet_main_t *vnm = vnet_get_main ();
-  vlib_main_t *vm = vlib_get_main ();
   avf_main_t *am = &avf_main;
-  uword pd = vlib_pci_get_private_data (h);
+  uword pd = vlib_pci_get_private_data (vm, h);
   avf_device_t *ad = pool_elt_at_index (am->devices, pd);
   u16 qid;
   int i;
@@ -1129,7 +1124,7 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad)
       ethernet_delete_interface (vnm, ad->hw_if_index);
     }
 
-  vlib_pci_device_close (ad->pci_dev_handle);
+  vlib_pci_device_close (vm, ad->pci_dev_handle);
 
   vlib_physmem_free (vm, am->physmem_region, ad->atq);
   vlib_physmem_free (vm, am->physmem_region, ad->arq);
@@ -1166,7 +1161,7 @@ avf_delete_if (vlib_main_t * vm, avf_device_t * ad)
   vec_free (ad->txqs);
 
   clib_error_free (ad->error);
-  memset (ad, 0, sizeof (*ad));
+  clib_memset (ad, 0, sizeof (*ad));
   pool_put (am->devices, ad);
 }
 
@@ -1200,7 +1195,8 @@ avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args)
   if (args->enable_elog)
     ad->flags |= AVF_DEVICE_F_ELOG;
 
-  if ((error = vlib_pci_device_open (&args->addr, avf_pci_device_ids, &h)))
+  if ((error = vlib_pci_device_open (vm, &args->addr, avf_pci_device_ids,
+                                    &h)))
     {
       pool_put (am->devices, ad);
       args->rv = VNET_API_ERROR_INVALID_INTERFACE;
@@ -1211,21 +1207,23 @@ avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args)
     }
   ad->pci_dev_handle = h;
 
-  vlib_pci_set_private_data (h, ad->dev_instance);
+  vlib_pci_set_private_data (vm, h, ad->dev_instance);
 
-  if ((error = vlib_pci_bus_master_enable (h)))
+  if ((error = vlib_pci_bus_master_enable (vm, h)))
     goto error;
 
-  if ((error = vlib_pci_map_region (h, 0, &ad->bar0)))
+  if ((error = vlib_pci_map_region (vm, h, 0, &ad->bar0)))
     goto error;
 
-  if ((error = vlib_pci_register_msix_handler (h, 0, 1, &avf_irq_0_handler)))
+  if ((error = vlib_pci_register_msix_handler (vm, h, 0, 1,
+                                              &avf_irq_0_handler)))
     goto error;
 
-  if ((error = vlib_pci_register_msix_handler (h, 1, 1, &avf_irq_n_handler)))
+  if ((error = vlib_pci_register_msix_handler (vm, h, 1, 1,
+                                              &avf_irq_n_handler)))
     goto error;
 
-  if ((error = vlib_pci_enable_msix_irq (h, 0, 2)))
+  if ((error = vlib_pci_enable_msix_irq (vm, h, 0, 2)))
     goto error;
 
   if (am->physmem_region_alloc == 0)
@@ -1261,7 +1259,7 @@ avf_create_if (vlib_main_t * vm, avf_create_if_args_t * args)
   if (error)
     goto error;
 
-  if ((error = vlib_pci_intr_enable (h)))
+  if ((error = vlib_pci_intr_enable (vm, h)))
     goto error;
 
   /* FIXME detect */