c11 safe string handling support

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

diff --git a/src/plugins/vmxnet3/vmxnet3.c b/src/plugins/vmxnet3/vmxnet3.c
index 2ff6d79..e34b3e6 100644 (file)
--- a/src/plugins/vmxnet3/vmxnet3.c
+++ b/src/plugins/vmxnet3/vmxnet3.c
@@ -153,7 +153,7 @@ vmxnet3_provision_driver_shared (vlib_main_t * vm, vmxnet3_device_t * vd)
   if (error)
     return error;
 
-  memset (vd->dma, 0, sizeof (*vd->dma));
+  clib_memset (vd->dma, 0, sizeof (*vd->dma));
 
   q = &vd->dma->queues;
   q->tx.cfg.desc_address = vmxnet3_dma_addr (vm, vd, txq->tx_desc);
@@ -229,7 +229,7 @@ vmxnet3_rxq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz)
 
   vec_validate_aligned (vd->rxqs, qid, CLIB_CACHE_LINE_BYTES);
   rxq = vec_elt_at_index (vd->rxqs, qid);
-  memset (rxq, 0, sizeof (*rxq));
+  clib_memset (rxq, 0, sizeof (*rxq));
   rxq->size = qsz;
   for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++)
     {
@@ -239,20 +239,21 @@ vmxnet3_rxq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz)
                                    512);
       if (error)
        return error;
-      memset (rxq->rx_desc[rid], 0, qsz * sizeof (*rxq->rx_desc[rid]));
+      clib_memset (rxq->rx_desc[rid], 0, qsz * sizeof (*rxq->rx_desc[rid]));
     }
   rxq->rx_comp = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error,
                                             qsz * sizeof (*rxq->rx_comp),
                                             512);
   if (error)
     return error;
-  memset (rxq->rx_comp, 0, qsz * sizeof (*rxq->rx_comp));
+  clib_memset (rxq->rx_comp, 0, qsz * sizeof (*rxq->rx_comp));
   for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++)
     {
       vmxnet3_rx_ring *ring;
 
       ring = &rxq->rx_ring[rid];
       ring->gen = VMXNET3_RXF_GEN;
+      ring->rid = rid;
       vec_validate_aligned (ring->bufs, rxq->size, CLIB_CACHE_LINE_BYTES);
     }
   rxq->rx_comp_ring.gen = VMXNET3_RXCF_GEN;
@@ -274,24 +275,25 @@ vmxnet3_txq_init (vlib_main_t * vm, vmxnet3_device_t * vd, u16 qid, u16 qsz)
       if (txq->lock == 0)
        clib_spinlock_init (&txq->lock);
       vd->flags |= VMXNET3_DEVICE_F_SHARED_TXQ_LOCK;
+      return 0;
     }
 
   vec_validate_aligned (vd->txqs, qid, CLIB_CACHE_LINE_BYTES);
   txq = vec_elt_at_index (vd->txqs, qid);
-  memset (txq, 0, sizeof (*txq));
+  clib_memset (txq, 0, sizeof (*txq));
   txq->size = qsz;
   txq->tx_desc = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error,
                                             qsz * sizeof (*txq->tx_desc),
                                             512);
   if (error)
     return error;
-  memset (txq->tx_desc, 0, qsz * sizeof (*txq->tx_desc));
+  clib_memset (txq->tx_desc, 0, qsz * sizeof (*txq->tx_desc));
   txq->tx_comp = vlib_physmem_alloc_aligned (vm, vmxm->physmem_region, &error,
                                             qsz * sizeof (*txq->tx_comp),
                                             512);
   if (error)
     return error;
-  memset (txq->tx_comp, 0, qsz * sizeof (*txq->tx_comp));
+  clib_memset (txq->tx_comp, 0, qsz * sizeof (*txq->tx_comp));
   vec_validate_aligned (txq->tx_ring.bufs, txq->size, CLIB_CACHE_LINE_BYTES);
   txq->tx_ring.gen = VMXNET3_TXF_GEN;
   txq->tx_comp_ring.gen = VMXNET3_TXCF_GEN;
@@ -426,11 +428,11 @@ vmxnet3_device_init (vlib_main_t * vm, vmxnet3_device_t * vd,
 }
 
 static void
-vmxnet3_irq_0_handler (vlib_pci_dev_handle_t h, u16 line)
+vmxnet3_irq_0_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line)
 {
   vnet_main_t *vnm = vnet_get_main ();
   vmxnet3_main_t *vmxm = &vmxnet3_main;
-  uword pd = vlib_pci_get_private_data (h);
+  uword pd = vlib_pci_get_private_data (vm, h);
   vmxnet3_device_t *vd = pool_elt_at_index (vmxm->devices, pd);
   u16 qid = line;
 
@@ -439,11 +441,11 @@ vmxnet3_irq_0_handler (vlib_pci_dev_handle_t h, u16 line)
 }
 
 static void
-vmxnet3_irq_1_handler (vlib_pci_dev_handle_t h, u16 line)
+vmxnet3_irq_1_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, u16 line)
 {
   vnet_main_t *vnm = vnet_get_main ();
   vmxnet3_main_t *vmxm = &vmxnet3_main;
-  uword pd = vlib_pci_get_private_data (h);
+  uword pd = vlib_pci_get_private_data (vm, h);
   vmxnet3_device_t *vd = pool_elt_at_index (vmxm->devices, pd);
   u32 ret;
 
@@ -519,7 +521,7 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args)
     vd->flags |= VMXNET3_DEVICE_F_ELOG;
 
   if ((error =
-       vlib_pci_device_open (&args->addr, vmxnet3_pci_device_ids, &h)))
+       vlib_pci_device_open (vm, &args->addr, vmxnet3_pci_device_ids, &h)))
     {
       pool_put (vmxm->devices, vd);
       args->rv = VNET_API_ERROR_INVALID_INTERFACE;
@@ -530,29 +532,29 @@ vmxnet3_create_if (vlib_main_t * vm, vmxnet3_create_if_args_t * args)
     }
   vd->pci_dev_handle = h;
 
-  vlib_pci_set_private_data (h, vd->dev_instance);
+  vlib_pci_set_private_data (vm, h, vd->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, (void **) &vd->bar[0])))
+  if ((error = vlib_pci_map_region (vm, h, 0, (void **) &vd->bar[0])))
     goto error;
 
-  if ((error = vlib_pci_map_region (h, 1, (void **) &vd->bar[1])))
+  if ((error = vlib_pci_map_region (vm, h, 1, (void **) &vd->bar[1])))
     goto error;
 
-  if ((error = vlib_pci_register_msix_handler (h, 0, 1,
+  if ((error = vlib_pci_register_msix_handler (vm, h, 0, 1,
                                               &vmxnet3_irq_0_handler)))
     goto error;
 
-  if ((error = vlib_pci_register_msix_handler (h, 1, 1,
+  if ((error = vlib_pci_register_msix_handler (vm, h, 1, 1,
                                               &vmxnet3_irq_1_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 ((error = vlib_pci_intr_enable (h)))
+  if ((error = vlib_pci_intr_enable (vm, h)))
     goto error;
 
   if ((error = vmxnet3_device_init (vm, vd, args)))
@@ -609,7 +611,7 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd)
       ethernet_delete_interface (vnm, vd->hw_if_index);
     }
 
-  vlib_pci_device_close (vd->pci_dev_handle);
+  vlib_pci_device_close (vm, vd->pci_dev_handle);
 
   /* *INDENT-OFF* */
   vec_foreach_index (i, vd->rxqs)
@@ -623,15 +625,9 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd)
          vmxnet3_rx_ring *ring;
 
          ring = &rxq->rx_ring[rid];
-         desc_idx = ring->consume;
-         while (ring->fill)
-           {
-             desc_idx &= mask;
-             bi = ring->bufs[desc_idx];
-             vlib_buffer_free_no_next (vm, &bi, 1);
-             ring->fill--;
-             desc_idx++;
-           }
+         desc_idx = (ring->consume + 1) & mask;
+         vlib_buffer_free_from_ring (vm, ring->bufs, desc_idx, rxq->size,
+                                     ring->fill);
          vec_free (ring->bufs);
          vlib_physmem_free (vm, vmxm->physmem_region, rxq->rx_desc[rid]);
        }
@@ -667,7 +663,7 @@ vmxnet3_delete_if (vlib_main_t * vm, vmxnet3_device_t * vd)
   vlib_physmem_free (vm, vmxm->physmem_region, vd->dma);
 
   clib_error_free (vd->error);
-  memset (vd, 0, sizeof (*vd));
+  clib_memset (vd, 0, sizeof (*vd));
   pool_put (vmxm->devices, vd);
 }