flow dpdk avf: add support for using l2tpv3 as RSS type

[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 ab14231..1143534 100644 (file)
--- a/src/plugins/dpdk/device/format.c
+++ b/src/plugins/dpdk/device/format.c
@@ -17,9 +17,6 @@
 #include <vppinfra/format.h>
 #include <assert.h>
 
-#define __USE_GNU
-#include <dlfcn.h>
-
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ethernet/sfp.h>
 #include <dpdk/device/dpdk.h>
@@ -347,7 +344,7 @@ format_dpdk_burst_fn (u8 *s, va_list *args)
   dpdk_device_t *xd = va_arg (*args, dpdk_device_t *);
   vlib_rx_or_tx_t dir = va_arg (*args, vlib_rx_or_tx_t);
   void *p;
-  Dl_info info = { 0 };
+  clib_elf_symbol_t sym;
 
 #if RTE_VERSION < RTE_VERSION_NUM(21, 11, 0, 0)
 #define rte_eth_fp_ops rte_eth_devices
@@ -356,10 +353,14 @@ format_dpdk_burst_fn (u8 *s, va_list *args)
   p = (dir == VLIB_TX) ? rte_eth_fp_ops[xd->port_id].tx_pkt_burst :
                         rte_eth_fp_ops[xd->port_id].rx_pkt_burst;
 
-  if (dladdr (p, &info) == 0 || info.dli_sname == 0)
-    return format (s, "(not available)");
-
-  return format (s, "%s", info.dli_sname);
+  if (clib_elf_symbol_by_address (pointer_to_uword (p), &sym))
+    {
+      return format (s, "%s", clib_elf_symbol_name (&sym));
+    }
+  else
+    {
+      return format (s, "(not available)");
+    }
 }
 
 static u8 *
@@ -384,6 +385,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)
@@ -391,6 +402,7 @@ format_dpdk_rte_device (u8 *s, va_list *args)
 
   if (d->bus)
     s = format (s, ", bus: %s", d->bus->name);
+#endif
 
   return s;
 }
@@ -421,9 +433,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",