dpdk: code preparation for bumping to DPDK 22.11

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

diff --git a/src/plugins/dpdk/device/format.c b/src/plugins/dpdk/device/format.c
index db90602..d3234d1 100644 (file)
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -197,8 +197,9 @@ format_dpdk_link_status (u8 * s, va_list * args)
     {
       u32 promisc = rte_eth_promiscuous_get (xd->port_id);
 
-      s = format (s, "%s duplex ", (l->link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                 "full" : "half");
+      s = format (s, "%s duplex ",
+                 (l->link_duplex == RTE_ETH_LINK_FULL_DUPLEX) ? "full" :
+                                                                      "half");
       s = format (s, "max-frame-size %d %s\n", hi->max_frame_size,
                  promisc ? " promisc" : "");
     }
@@ -238,8 +239,6 @@ format_offload (u8 * s, va_list * va)
   uword i, l;
 
   l = ~0;
-  if (clib_mem_is_vec (id))
-    l = vec_len (id);
 
   if (id)
     for (i = 0; id[i] != 0 && i < l; i++)
@@ -385,6 +384,16 @@ format_dpdk_rte_device (u8 *s, va_list *args)
   if (!d)
     return format (s, "not available");
 
+#if RTE_VERSION >= RTE_VERSION_NUM(22, 11, 0, 0)
+  s =
+    format (s, "name: %s, numa: %d", rte_dev_name (d), rte_dev_numa_node (d));
+
+  if (rte_dev_driver (d))
+    s = format (s, ", driver: %s", rte_driver_name (rte_dev_driver (d)));
+
+  if (rte_dev_bus (d))
+    s = format (s, ", bus: %s", rte_bus_name (rte_dev_bus (d)));
+#else
   s = format (s, "name: %s, numa: %d", d->name, d->numa_node);
 
   if (d->driver)
@@ -392,6 +401,7 @@ format_dpdk_rte_device (u8 *s, va_list *args)
 
   if (d->bus)
     s = format (s, ", bus: %s", d->bus->name);
+#endif
 
   return s;
 }
@@ -422,9 +432,15 @@ format_dpdk_device (u8 * s, va_list * args)
              format_white_space, indent + 2, format_dpdk_link_status, xd);
   s = format (s, "%Uflags: %U\n",
              format_white_space, indent + 2, format_dpdk_device_flags, xd);
+#if RTE_VERSION >= RTE_VERSION_NUM(22, 11, 0, 0)
+  if (rte_dev_devargs (di.device) && rte_dev_devargs (di.device)->args)
+    s = format (s, "%UDevargs: %s\n", format_white_space, indent + 2,
+               rte_dev_devargs (di.device)->args);
+#else
   if (di.device->devargs && di.device->devargs->args)
     s = format (s, "%UDevargs: %s\n",
                format_white_space, indent + 2, di.device->devargs->args);
+#endif
   s = format (s,
              "%Urx: queues %d (max %d), desc %d "
              "(min %d max %d align %d)\n",
@@ -484,9 +500,9 @@ format_dpdk_device (u8 * s, va_list * args)
   vlan_off = rte_eth_dev_get_vlan_offload (xd->port_id);
   s = format (s, "%Uvlan offload: strip %s filter %s qinq %s\n",
              format_white_space, indent + 2,
-             vlan_off & ETH_VLAN_STRIP_OFFLOAD ? "on" : "off",
-             vlan_off & ETH_VLAN_FILTER_OFFLOAD ? "on" : "off",
-             vlan_off & ETH_VLAN_EXTEND_OFFLOAD ? "on" : "off");
+             vlan_off & RTE_ETH_VLAN_STRIP_OFFLOAD ? "on" : "off",
+             vlan_off & RTE_ETH_VLAN_FILTER_OFFLOAD ? "on" : "off",
+             vlan_off & RTE_ETH_VLAN_EXTEND_OFFLOAD ? "on" : "off");
   s = format (s, "%Urx offload avail:  %U\n", format_white_space, indent + 2,
              format_dpdk_rx_offload_caps, di.rx_offload_capa);
   s = format (s, "%Urx offload active: %U\n", format_white_space, indent + 2,