dpdk: only look at PCI information on PCI devices

[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 99dd181..b9ba161 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)
@@ -324,6 +345,19 @@ dpdk_port_state_callback (dpdk_portid_t port_id,
   return dpdk_port_state_callback_inline (port_id, type, param);
 }
 
+/* If this device is PCI return pointer to info, otherwise NULL */
+struct rte_pci_device *
+dpdk_get_pci_device (const struct rte_eth_dev_info *info)
+{
+  const struct rte_bus *bus;
+
+  bus = rte_bus_find_by_device (info->device);
+  if (bus && !strcmp (bus->name, "pci"))
+    return RTE_DEV_TO_PCI (info->device);
+  else
+    return NULL;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *