thread: Add show threads api

[vpp.git] / src / plugins / dpdk / device / common.c

diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index dad4332..8699dc8 100644 (file)
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -43,6 +43,8 @@ dpdk_device_setup (dpdk_device_t * xd)
   vnet_main_t *vnm = vnet_get_main ();
   vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, xd->sw_if_index);
   vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, xd->hw_if_index);
+  struct rte_eth_dev_info dev_info;
+  u64 bitmap;
   int rv;
   int j;
 
@@ -66,6 +68,24 @@ dpdk_device_setup (dpdk_device_t * xd)
        xd->port_conf.fdir_conf.mode = RTE_FDIR_MODE_NONE;
     }
 
+  rte_eth_dev_info_get (xd->port_id, &dev_info);
+
+  bitmap = xd->port_conf.txmode.offloads & ~dev_info.tx_offload_capa;
+  if (bitmap)
+    {
+      dpdk_log_warn ("unsupported tx offloads requested on port %u: %U",
+                    xd->port_id, format_dpdk_tx_offload_caps, bitmap);
+      xd->port_conf.txmode.offloads ^= bitmap;
+    }
+
+  bitmap = xd->port_conf.rxmode.offloads & ~dev_info.rx_offload_capa;
+  if (bitmap)
+    {
+      dpdk_log_warn ("unsupported rx offloads requested on port %u: %U",
+                    xd->port_id, format_dpdk_rx_offload_caps, bitmap);
+      xd->port_conf.rxmode.offloads ^= bitmap;
+    }
+
   rv = rte_eth_dev_configure (xd->port_id, xd->rx_q_used,
                              xd->tx_q_used, &xd->port_conf);
 
@@ -99,7 +119,7 @@ dpdk_device_setup (dpdk_device_t * xd)
       dpdk_mempool_private_t *privp;
       uword tidx = vnet_get_device_input_thread_index (dm->vnet_main,
                                                       xd->hw_if_index, j);
-      unsigned lcore = vlib_worker_threads[tidx].lcore_id;
+      unsigned lcore = vlib_worker_threads[tidx].cpu_id;
       u16 socket_id = rte_lcore_to_socket_id (lcore);
 
       rv =
@@ -194,6 +214,7 @@ dpdk_device_stop (dpdk_device_t * xd)
 
   rte_eth_allmulticast_disable (xd->port_id);
   rte_eth_dev_stop (xd->port_id);
+  memset (&xd->link, 0, sizeof (struct rte_eth_link));
 
   /* For bonded interface, stop slave links */
   if (xd->pmd == VNET_DPDK_PMD_BOND)
@@ -222,7 +243,6 @@ static uword
 send_garp_na_process (vlib_main_t * vm,
                      vlib_node_runtime_t * rt, vlib_frame_t * f)
 {
-  vnet_main_t *vnm = vnet_get_main ();
   uword event_type, *event_data = 0;
 
   while (1)
@@ -238,11 +258,9 @@ send_garp_na_process (vlib_main_t * vm,
          if (i < 5)            /* wait 0.2 sec for link to settle, max total 1 sec */
            vlib_process_suspend (vm, 0.2);
          dpdk_device_t *xd = &dpdk_main.devices[dpdk_port];
-         u32 hw_if_index = xd->hw_if_index;
-         vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
          dpdk_update_link_state (xd, vlib_time_now (vm));
-         send_ip4_garp (vm, hi);
-         send_ip6_na (vm, hi);
+         send_ip4_garp (vm, xd->sw_if_index);
+         send_ip6_na (vm, xd->sw_if_index);
        }
       vec_reset_length (event_data);
     }