port: re-apply F-Stack DPDK patches missed in 14355bf (mlx5/i40e/dts)

Fills the 3 omissions vs upstream commit 5f3768c 'Sync DPDK's modifies':
  #2 mlx5: dlsym(RTLD_NEXT, if_indextoname) hijack in
       drivers/net/mlx5/linux/{mlx5_ethdev_os,mlx5_os}.c
  #3 i40e: add I40E_DEV_ID_10G_BASE_T_X722 to the SFP-X722
       802.1ad-unsupported branch in drivers/net/i40e/i40e_ethdev.c
  #5 dts: replace 24.11.6 dpdk/dts/ with the actual upstream-23.11.5
       backup tree (per user instruction; not a literal port of 5f3768c)

Build sanity: ninja drivers/librte_net_{i40e,mlx5}.a both PASS.

Author: dpdk-port-leader

dpdk/drivers/net/i40e/i40e_ethdev.c

@@ -1620,7 +1620,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
 	}
 	/* Firmware of SFP x722 does not support 802.1ad frames ability */
 	if (hw->device_id == I40E_DEV_ID_SFP_X722 ||
-		hw->device_id == I40E_DEV_ID_SFP_I_X722)
+		hw->device_id == I40E_DEV_ID_SFP_I_X722 ||
+		hw->device_id == I40E_DEV_ID_10G_BASE_T_X722)
 		hw->flags &= ~I40E_HW_FLAG_802_1AD_CAPABLE;
 
 	PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d eetrack %04x",

dpdk/drivers/net/mlx5/linux/mlx5_ethdev_os.c

@@ -23,6 +23,7 @@
 #include <stdalign.h>
 #include <sys/un.h>
 #include <time.h>
+#include <dlfcn.h>
 
 #include <ethdev_linux_ethtool.h>
 #include <ethdev_driver.h>
@@ -1004,6 +1005,7 @@ mlx5_sysfs_check_switch_info(bool device_dir,
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
+static char *(*real_if_indextoname)(unsigned int, char *) = NULL;
 int
 mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 {
@@ -1024,7 +1026,16 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	char c;
 	ssize_t line_size;
 
-	if (!if_indextoname(ifindex, ifname)) {
+	// for ff tools
+	if (!real_if_indextoname) {
+		real_if_indextoname = __extension__ (char *(*)(unsigned int, char *))dlsym(RTLD_NEXT, "if_indextoname");
+		if (!real_if_indextoname) {
+			rte_errno = errno;
+			return -rte_errno;
+		}
+	}
+
+	if (!real_if_indextoname(ifindex, ifname)) {
 		rte_errno = errno;
 		return -rte_errno;
 	}

dpdk/drivers/net/mlx5/linux/mlx5_os.c

@@ -14,6 +14,7 @@
 #include <linux/sockios.h>
 #include <linux/ethtool.h>
 #include <fcntl.h>
+#include <dlfcn.h>
 
 #include <rte_malloc.h>
 #include <ethdev_driver.h>
@@ -2211,6 +2212,7 @@ mlx5_nl_esw_multiport_get(struct rte_pci_addr *pci_addr, int *enabled)
 
 #define SYSFS_MPESW_PARAM_MAX_LEN 16
 
+static char *(*real_if_indextoname)(unsigned int, char *) = NULL;
 static int
 mlx5_sysfs_esw_multiport_get(struct ibv_device *ibv, struct rte_pci_addr *pci_addr, int *enabled)
 {
@@ -2240,7 +2242,16 @@ mlx5_sysfs_esw_multiport_get(struct ibv_device *ibv, struct rte_pci_addr *pci_ad
 		ifindex = mlx5_nl_ifindex(nl_rdma, ibv->name, i);
 		if (!ifindex)
 			continue;
-		if (!if_indextoname(ifindex, ifname))
+
+		// for ff tools
+		if (!real_if_indextoname) {
+			real_if_indextoname = __extension__ (char *(*)(unsigned int, char *))dlsym(RTLD_NEXT, "if_indextoname");
+			if (!real_if_indextoname) {
+				rte_errno = errno;
+				return -rte_errno;
+			}
+		}
+		if (!real_if_indextoname(ifindex, ifname))
 			continue;
 		MKSTR(sysfs_if_path, "/sys/class/net/%s", ifname);
 		if (mlx5_get_pci_addr(sysfs_if_path, &if_pci_addr))

dpdk/dts/Dockerfile

@@ -1,90 +1,67 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2022-2023 The DPDK contributors
-# Copyright 2023 Arm Limited
 
-test_runs:
-  # define one test run environment
-  - dpdk_build:
-      dpdk_location:
-        # dpdk_tree: Commented out because `tarball` is defined.
-        tarball: dpdk-tarball.tar.xz
-        # Either `dpdk_tree` or `tarball` can be defined, but not both.
-        remote: false # Optional, defaults to false. If it's true, the `dpdk_tree` or `tarball`
-                      # is located on the SUT node, instead of the execution host.
-
-      # precompiled_build_dir: Commented out because `build_options` is defined.
-      build_options:
-        arch: x86_64
+executions:
+  - build_targets:
+      - arch: x86_64
         os: linux
         cpu: native
-        # the combination of the following two makes CC="ccache gcc"
         compiler: gcc
-        compiler_wrapper: ccache # Optional.
-      # If `precompiled_build_dir` is defined, DPDK has been pre-built and the build directory is
-      # in a subdirectory of DPDK tree root directory. Otherwise, will be using the `build_options`
-      # to build the DPDK from source. Either `precompiled_build_dir` or `build_options` can be
-      # defined, but not both.
-    perf: false # disable performance testing
-    func: true # enable functional testing
-    skip_smoke_tests: false # optional
-    test_suites: # the following test suites will be run in their entirety
+        compiler_wrapper: ccache
+    perf: false
+    func: true
+    skip_smoke_tests: false # optional flag that allows you to skip smoke tests
+    test_suites:
       - hello_world
-    # The machine running the DPDK test executable
+      - os_udp
     system_under_test_node:
       node_name: "SUT 1"
-      vdevs: # optional; if removed, vdevs won't be used in the test run
+      vdevs: # optional; if removed, vdevs won't be used in the execution
         - "crypto_openssl"
-    # Traffic generator node to use for this test run
     traffic_generator_node: "TG 1"
 nodes:
-  # Define a system under test node, having two network ports physically
-  # connected to the corresponding ports in TG 1 (the peer node)
   - name: "SUT 1"
     hostname: sut1.change.me.localhost
     user: dtsuser
     arch: x86_64
     os: linux
-    lcores: "" # use all the available logical cores
-    use_first_core: false # tells DPDK to use any physical core
-    memory_channels: 4 # tells DPDK to use 4 memory channels
-    hugepages_2mb: # optional; if removed, will use system hugepage configuration
-        number_of: 256
+    lcores: ""
+    use_first_core: false
+    memory_channels: 4
+    hugepages:  # optional; if removed, will use system hugepage configuration
+        amount: 256
         force_first_numa: false
     ports:
-      # sets up the physical link between "SUT 1"@0000:00:08.0 and "TG 1"@0000:00:08.0
       - pci: "0000:00:08.0"
         os_driver_for_dpdk: vfio-pci # OS driver that DPDK will use
-        os_driver: i40e              # OS driver to bind when the tests are not running
+        os_driver: i40e
         peer_node: "TG 1"
         peer_pci: "0000:00:08.0"
-      # sets up the physical link between "SUT 1"@0000:00:08.1 and "TG 1"@0000:00:08.1
       - pci: "0000:00:08.1"
         os_driver_for_dpdk: vfio-pci
         os_driver: i40e
         peer_node: "TG 1"
         peer_pci: "0000:00:08.1"
-  # Define a Scapy traffic generator node, having two network ports
-  # physically connected to the corresponding ports in SUT 1 (the peer node).
   - name: "TG 1"
     hostname: tg1.change.me.localhost
     user: dtsuser
     arch: x86_64
     os: linux
+    lcores: ""
     ports:
-      # sets up the physical link between "TG 1"@0000:00:08.0 and "SUT 1"@0000:00:08.0
       - pci: "0000:00:08.0"
         os_driver_for_dpdk: rdma
         os_driver: rdma
         peer_node: "SUT 1"
         peer_pci: "0000:00:08.0"
-      # sets up the physical link between "SUT 1"@0000:00:08.0 and "TG 1"@0000:00:08.0
       - pci: "0000:00:08.1"
         os_driver_for_dpdk: rdma
         os_driver: rdma
         peer_node: "SUT 1"
         peer_pci: "0000:00:08.1"
-    hugepages_2mb: # optional; if removed, will use system hugepage configuration
-        number_of: 256
+    use_first_core: false
+    hugepages:  # optional; if removed, will use system hugepage configuration
+        amount: 256
         force_first_numa: false
     traffic_generator:
         type: SCAPY

dpdk/dts/README.md

@@ -1,13 +1,3 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2022 PANTHEON.tech s.r.o.
 # Copyright(c) 2022 University of New Hampshire
-
-"""Libraries and utilities for running DPDK Test Suite (DTS).
-
-The various modules in the DTS framework offer:
-
-* Connections to nodes, both interactive and non-interactive,
-* A straightforward way to add support for different operating systems of remote nodes,
-* Test suite setup, execution and teardown, along with test case setup, execution and teardown,
-* Pre-test suite setup and post-test suite teardown.
-"""