Fix coverity issues in DPDK code, fixes VPP-189

[vpp.git] / vnet / vnet / devices / dpdk / dpdk_priv.h

diff --git a/vnet/vnet/devices/dpdk/dpdk_priv.h b/vnet/vnet/devices/dpdk/dpdk_priv.h
index 2e4909f..d4d1422 100644 (file)
--- a/vnet/vnet/devices/dpdk/dpdk_priv.h
+++ b/vnet/vnet/devices/dpdk/dpdk_priv.h
@@ -17,16 +17,25 @@
 #define DPDK_NB_TX_DESC_DEFAULT   512
 #define DPDK_NB_RX_DESC_VIRTIO    256
 #define DPDK_NB_TX_DESC_VIRTIO    256
-#define DPDK_NB_RX_DESC_10GE    2048
-#define DPDK_NB_TX_DESC_10GE    2048
-#define DPDK_NB_RX_DESC_40GE    (4096-128)
-#define DPDK_NB_TX_DESC_40GE    2048
+#define DPDK_NB_RX_DESC_10GE    1024
+#define DPDK_NB_TX_DESC_10GE    1024
+#define DPDK_NB_RX_DESC_40GE    1024
+#define DPDK_NB_TX_DESC_40GE    1024
+#define DPDK_NB_RX_DESC_ENIC    1024
+
+#if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0)
+#define I40E_DEV_ID_SFP_XL710           0x1572
+#define I40E_DEV_ID_QSFP_A              0x1583
+#define I40E_DEV_ID_QSFP_B              0x1584
+#define I40E_DEV_ID_QSFP_C              0x1585
+#define I40E_DEV_ID_10G_BASE_T          0x1586
+#define I40E_DEV_ID_VF                  0x154C
+#endif
 
 /* These args appear by themselves */
 #define foreach_eal_double_hyphen_predicate_arg \
 _(no-shconf)                                    \
 _(no-hpet)                                      \
-_(no-pci)                                       \
 _(no-huge)                                      \
 _(vmware-tsc-map)                               \
 _(virtio-vhost)
@@ -45,7 +54,6 @@ _(force-ranks, r)
 _(huge-dir)                                     \
 _(proc-type)                                    \
 _(file-prefix)                                  \
-_(socket-mem)                                   \
 _(vdev)
 
 static inline u32
@@ -72,6 +80,7 @@ dpdk_rx_burst ( dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
             break;
       }
     }
+#if DPDK_VHOST_USER
   else if (xd->dev_type == VNET_DPDK_DEV_VHOST_USER)
     {
       vlib_main_t * vm = vlib_get_main();
@@ -79,7 +88,6 @@ dpdk_rx_burst ( dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
       unsigned socket_id = rte_socket_id();
       u32 offset = 0;
 
-#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
       offset = queue_id * VIRTIO_QNUM;
 
       struct vhost_virtqueue *vq =
@@ -87,17 +95,21 @@ dpdk_rx_burst ( dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
 
       if (PREDICT_FALSE(!vq->enabled))
         return 0;
-#else
-      if (PREDICT_FALSE(!xd->vu_is_running))
-        return 0;
-#endif
 
-      n_buffers = rte_vhost_dequeue_burst(&xd->vu_vhost_dev, offset + VIRTIO_TXQ,
-                                          bm->pktmbuf_pools[socket_id],
-                                          xd->rx_vectors[queue_id], VLIB_FRAME_SIZE);
+      struct rte_mbuf **pkts = xd->rx_vectors[queue_id];
+      while (n_left) {
+          n_this_chunk = rte_vhost_dequeue_burst(&xd->vu_vhost_dev,
+                                                 offset + VIRTIO_TXQ,
+                                                 bm->pktmbuf_pools[socket_id],
+                                                 pkts + n_buffers,
+                                                 n_left);
+          n_buffers += n_this_chunk;
+          n_left -= n_this_chunk;
+          if (n_this_chunk == 0)
+              break;
+      }
 
       int i; u32 bytes = 0;
-      struct rte_mbuf **pkts = xd->rx_vectors[queue_id];
       for (i = 0; i < n_buffers; i++) {
           struct rte_mbuf *buff = pkts[i];
           bytes += rte_pktmbuf_data_len(buff);
@@ -105,26 +117,28 @@ dpdk_rx_burst ( dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
 
       f64 now = vlib_time_now (vm);
 
-      dpdk_vu_vring *vring = &(xd->vu_intf->vrings[offset + VIRTIO_TXQ]);
-      vring->packets += n_buffers;
-      vring->bytes += bytes;
-
+      dpdk_vu_vring *vring = NULL;
       /* send pending interrupts if needed */
       if (dpdk_vhost_user_want_interrupt(xd, offset + VIRTIO_TXQ)) {
+          vring = &(xd->vu_intf->vrings[offset + VIRTIO_TXQ]);
           vring->n_since_last_int += n_buffers;
 
           if ((vring->n_since_last_int && (vring->int_deadline < now))
-              || (vring->n_since_last_int > dm->vhost_coalesce_frames))
+              || (vring->n_since_last_int > dm->conf->vhost_coalesce_frames))
             dpdk_vhost_user_send_interrupt(vm, xd, offset + VIRTIO_TXQ);
       }
 
+      vring = &(xd->vu_intf->vrings[offset + VIRTIO_RXQ]);
+      vring->packets += n_buffers;
+      vring->bytes += bytes;
+
       if (dpdk_vhost_user_want_interrupt(xd, offset + VIRTIO_RXQ)) {
-          vring = &(xd->vu_intf->vrings[offset + VIRTIO_RXQ]);
           if (vring->n_since_last_int && (vring->int_deadline < now))
             dpdk_vhost_user_send_interrupt(vm, xd, offset + VIRTIO_RXQ);
       }
 
     }
+#endif
 #ifdef RTE_LIBRTE_KNI
   else if (xd->dev_type == VNET_DPDK_DEV_KNI)
     {
@@ -141,6 +155,27 @@ dpdk_rx_burst ( dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id)
 }
 
 
+static inline void
+dpdk_get_xstats (dpdk_device_t * xd)
+{
+  int len;
+  if ((len = rte_eth_xstats_get(xd->device_index, NULL, 0)) > 0)
+    {
+      vec_validate(xd->xstats, len - 1);
+      vec_validate(xd->last_cleared_xstats, len - 1);
+
+      len = rte_eth_xstats_get(xd->device_index, xd->xstats, vec_len(xd->xstats));
+
+      ASSERT(vec_len(xd->xstats) == len);
+      ASSERT(vec_len(xd->last_cleared_xstats) == len);
+
+      _vec_len(xd->xstats) = len;
+      _vec_len(xd->last_cleared_xstats) = len;
+
+    }
+}
+
+
 static inline void
 dpdk_update_counters (dpdk_device_t * xd, f64 now)
 {
@@ -148,7 +183,6 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now)
   vnet_main_t * vnm = vnet_get_main();
   u32 my_cpu = os_get_cpu_number();
   u64 rxerrors, last_rxerrors;
-  int len;
 
   /* only update counters for PMD interfaces */
   if (xd->dev_type != VNET_DPDK_DEV_ETH)
@@ -163,7 +197,7 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now)
   if (xd->admin_up != 0xff)
     {
       xd->time_last_stats_update = now ? now : xd->time_last_stats_update;
-      memcpy (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
+      clib_memcpy (&xd->last_stats, &xd->stats, sizeof (xd->last_stats));
       rte_eth_stats_get (xd->device_index, &xd->stats);
 
       /* maybe bump interface rx no buffer counter */
@@ -187,15 +221,8 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now)
                                          xd->stats.imissed -
                                          xd->last_stats.imissed);
         }
-#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
       rxerrors = xd->stats.ierrors;
       last_rxerrors = xd->last_stats.ierrors;
-#else
-      rxerrors = xd->stats.ibadcrc
-        + xd->stats.ibadlen + xd->stats.ierrors;
-      last_rxerrors = xd->last_stats.ibadcrc
-        + xd->last_stats.ibadlen + xd->last_stats.ierrors;
-#endif
 
       if (PREDICT_FALSE (rxerrors != last_rxerrors))
         {
@@ -207,11 +234,5 @@ dpdk_update_counters (dpdk_device_t * xd, f64 now)
         }
     }
 
-  if ((len = rte_eth_xstats_get(xd->device_index, NULL, 0)) > 0)
-    {
-      vec_validate(xd->xstats, len - 1);
-      len = rte_eth_xstats_get(xd->device_index, xd->xstats, vec_len(xd->xstats));
-      ASSERT(vec_len(xd->xstats) == len);
-      _vec_len(xd->xstats) = len;
-    }
+  dpdk_get_xstats(xd);
 }