[Review] Dpdk: add symmetric_mp test

lisa/nic.py

@@ -56,6 +56,7 @@ def __str__(self) -> str:
             f"pci_slot: {self.pci_slot}\n"
             f"ip_addr: {self.ip_addr}\n"
             f"mac_addr: {self.mac_addr}\n"
+            f"dev_uuid: {self.dev_uuid}\n"
         )
 
     @property

microsoft/testsuites/dpdk/devname/Makefile

@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+
+# binary name
+APP = devname
+
+# all source are stored in SRCS-y
+SRCS-y := main.c
+
+PKGCONF ?= pkg-config
+
+# Build using pkg-config variables if possible
+ifneq ($(shell $(PKGCONF) --exists libdpdk && echo 0),0)
+$(error "no installation of DPDK found")
+endif
+
+all: shared
+.PHONY: shared static
+shared: build/$(APP)-shared
+	ln -sf $(APP)-shared build/$(APP)
+static: build/$(APP)-static
+	ln -sf $(APP)-static build/$(APP)
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+
+ifeq ($(MAKECMDGOALS),static)
+# check for broken pkg-config
+ifeq ($(shell echo $(LDFLAGS_STATIC) | grep 'whole-archive.*l:lib.*no-whole-archive'),)
+$(warning "pkg-config output list does not contain drivers between 'whole-archive'/'no-whole-archive' flags.")
+$(error "Cannot generate statically-linked binaries with this version of pkg-config")
+endif
+endif
+
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+
+build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
+	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
+
+build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
+	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
+
+build:
+	@mkdir -p $@
+
+.PHONY: clean
+clean:
+	rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
+	test -d build && rmdir -p build || true

microsoft/testsuites/dpdk/devname/README.md

@@ -0,0 +1,33 @@
+# dpdk-devname
+
+Print info about DPDK ports on a system.
+
+## NOTE: This is a frozen copy from https://www.github.com/mcgov/devname
+
+## build
+clone into dpdk/examples
+``` bash
+git clone https://www.github.com/DPDK/dpdk.git
+cd ./dpdk/examples
+git clone https://github.com/mcgov/devname.git
+cd ..
+meson setup -Dexamples=devname [other options] build
+cd build && ninja && ninja install
+```
+
+## usage:
+```
+$ ./build/examples/dpdk-devname
+EAL: Detected CPU lcores: 32
+EAL: Detected NUMA nodes: 1
+EAL: Detected static linkage of DPDK
+EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
+EAL: Selected IOVA mode 'PA'
+EAL: Probe PCI driver: net_mana (1414:ba) device: 7870:00:00.0 (socket 0)
+mana_init_once(): MP INIT PRIMARY
+TELEMETRY: No legacy callbacks, legacy socket not created
+dpdk-devname found port=0 driver=net_mana eth_dev_info_name=7870:00:00.0 get_name_by_port_name=7870:00:00.0_port3 owner_id=0x0000000000000002 owner_name=f8615163-0002-1000-2000-6045bda6bbc0 macaddr=60:45:bd:a6:bb:c0
+dpdk-devname found port=1 driver=net_mana eth_dev_info_name=7870:00:00.0 get_name_by_port_name=7870:00:00.0_port2 owner_id=0x0000000000000001 owner_name=f8615163-0001-1000-2000-6045bda6bd76 macaddr=60:45:bd:a6:bd:76
+dpdk-devname found port=2 driver=net_netvsc eth_dev_info_name=f8615163-0001-1000-2000-6045bda6bd76 get_name_by_port_name=f8615163-0001-1000-2000-6045bda6bd76 owner_id=0x0000000000000000 owner_name=null macaddr=60:45:bd:a6:bd:76
+dpdk-devname found port=3 driver=net_netvsc eth_dev_info_name=f8615163-0002-1000-2000-6045bda6bbc0 get_name_by_port_name=f8615163-0002-1000-2000-6045bda6bbc0 owner_id=0x0000000000000000 owner_name=null macaddr=60:45:bd:a6:bb:c0
+```

microsoft/testsuites/dpdk/devname/main.c

@@ -0,0 +1,98 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <sys/queue.h>
+#include <rte_memory.h>
+#include <rte_launch.h>
+#include <rte_eal.h>
+#include <rte_per_lcore.h>
+#include <rte_lcore.h>
+#include <rte_debug.h>
+#include <rte_ethdev.h>
+#include <rte_dev.h>
+
+const char usage_info[] = "usage: dpdk-devname\n";
+
+/*a tiny application to print dpdk device and port id info */
+int main(int argc, char **argv)
+{
+	int ret;
+	/* Initialization of Environment Abstraction Layer (EAL). */
+	ret = rte_eal_init(argc, argv);
+	if (ret < 0)
+		rte_panic("Cannot init EAL\n");
+	/* >8 End of initialization of Environment Abstraction Layer */
+
+	struct rte_eth_dev_info device_info;
+	char device_name_by_port[RTE_ETH_NAME_MAX_LEN] = {0};
+	for (uint16_t portid = 0; portid < RTE_MAX_ETHPORTS; portid++)
+	{
+		if (!rte_eth_dev_is_valid_port(portid))
+			continue;
+
+		ret = rte_eth_dev_info_get(portid, &device_info);
+		if (ret < 0)
+		{
+			fprintf(stderr,
+					"Invalid or no info for port %i, err: %s\n",
+					portid, rte_strerror(ret));
+			continue;
+		}
+		ret = rte_eth_dev_get_name_by_port(portid, device_name_by_port);
+		if (ret < 0)
+		{
+			fprintf(stderr,
+					"No name info returned for port %i, err: %s\n",
+					portid, rte_strerror(ret));
+			continue;
+		}
+		struct rte_eth_dev_owner device_owner;
+		ret = rte_eth_dev_owner_get(portid, &device_owner);
+		if (ret < 0)
+		{
+			fprintf(stderr, "Could not get ownership for port %i (%s)\n",
+					portid, device_name_by_port);
+			memset(&device_owner, 0, sizeof(struct rte_eth_dev_owner));
+		}
+
+		if (!device_owner.name[0])
+			strcpy(device_owner.name, "null");
+
+		struct rte_ether_addr macaddr;
+		ret = rte_eth_macaddr_get(portid, &macaddr);
+		if (ret < 0)
+		{
+			fprintf(stderr, "Could not get macaddr info for port %i (%s)\n",
+					portid, device_name_by_port);
+			memset(&macaddr, 0, sizeof(struct rte_ether_addr));
+		}
+		printf("dpdk-devname found port=%i "
+			   "driver=%s "
+			   "get_name_by_port_name=%s "
+			   "owner_id=0x%016lx "
+			   "owner_name=%s "
+			   "macaddr=%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx\n",
+			   portid,
+			   device_info.driver_name,
+			   device_name_by_port,
+			   device_owner.id,
+			   device_owner.name,
+			   macaddr.addr_bytes[0],
+			   macaddr.addr_bytes[1],
+			   macaddr.addr_bytes[2],
+			   macaddr.addr_bytes[3],
+			   macaddr.addr_bytes[4],
+			   macaddr.addr_bytes[5]
+		);
+	}
+
+	/* clean up the EAL */
+	rte_eal_cleanup();
+
+	return 0;
+}

microsoft/testsuites/dpdk/devname/meson.build

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+# meson file, for building this example as part of a main DPDK build.
+#
+# To build this example as a standalone application with an already-installed
+# DPDK instance, use 'make'
+
+allow_experimental_apis = true
+sources = files(
+        'main.c',
+)

microsoft/testsuites/dpdk/dpdksuite.py

@@ -40,10 +40,11 @@
     UnsupportedPackageVersionException,
     check_send_receive_compatibility,
     do_parallel_cleanup,
-    enable_uio_hv_generic_for_nic,
+    enable_uio_hv_generic,
     generate_send_receive_run_info,
     init_nodes_concurrent,
     initialize_node_resources,
+    run_dpdk_symmetric_mp,
     run_testpmd_concurrent,
     verify_dpdk_build,
     verify_dpdk_l3fwd_ntttcp_tcp,
@@ -103,6 +104,58 @@ def verify_dpdk_build_netvsc(
             node, log, variables, "netvsc", HugePageSize.HUGE_2MB, result=result
         )
 
+    @TestCaseMetadata(
+        description="""
+            netvsc pmd version.
+            This test case checks DPDK can be built and installed correctly.
+            Prerequisites, accelerated networking must be enabled.
+            The VM should have at least two network interfaces,
+             with one interface for management.
+            More details refer https://docs.microsoft.com/en-us/azure/virtual-network/setup-dpdk#prerequisites # noqa: E501
+        """,
+        priority=2,
+        requirement=simple_requirement(
+            min_core_count=8,
+            min_nic_count=3,
+            network_interface=Sriov(),
+            unsupported_features=[Gpu, Infiniband],
+        ),
+    )
+    def verify_dpdk_symmetric_mp(
+        self,
+        node: Node,
+        log: Logger,
+        variables: Dict[str, Any],
+        result: TestResult,
+    ) -> None:
+        run_dpdk_symmetric_mp(node, log, variables)
+
+    @TestCaseMetadata(
+        description="""
+            netvsc pmd version.
+            This test case checks DPDK can be built and installed correctly.
+            Prerequisites, accelerated networking must be enabled.
+            The VM should have at least two network interfaces,
+             with one interface for management.
+            More details refer https://docs.microsoft.com/en-us/azure/virtual-network/setup-dpdk#prerequisites # noqa: E501
+        """,
+        priority=2,
+        requirement=simple_requirement(
+            min_core_count=8,
+            min_nic_count=3,
+            network_interface=Sriov(),
+            unsupported_features=[Gpu, Infiniband],
+        ),
+    )
+    def verify_dpdk_symmetric_mp_netvsc_rescind(
+        self,
+        node: Node,
+        log: Logger,
+        variables: Dict[str, Any],
+        result: TestResult,
+    ) -> None:
+        run_dpdk_symmetric_mp(node, log, variables, trigger_rescind=True)
+
     @TestCaseMetadata(
         description="""
             netvsc pmd version with 1GiB hugepages
@@ -925,7 +978,7 @@ def verify_uio_binding(
         nic = node.nics.get_secondary_nic()
         node.nics.get_nic_driver(nic.name)
         if nic.module_name == "hv_netvsc":
-            enable_uio_hv_generic_for_nic(node, nic)
+            enable_uio_hv_generic(node)
 
         original_driver = nic.driver_sysfs_path
         node.nics.unbind(nic)

microsoft/testsuites/dpdk/dpdktestpmd.py

@@ -198,6 +198,8 @@ class DpdkSourceInstall(Installer):
         "l3fwd",
         "multi_process/client_server_mp/mp_server",
         "multi_process/client_server_mp/mp_client",
+        "multi_process/symmetric_mp",
+        "devname",
     ]
 
     def _check_if_installed(self) -> bool:
@@ -255,8 +257,21 @@ def get_installed_version(self) -> VersionInfo:
             "libdpdk", update_cached=True
         )
 
+    __devname_files = ["main.c", "Makefile", "meson.build"]
+
     def _install(self) -> None:
         super()._install()
+        # copy devname application into the examples directory
+        devname_local_folder = PurePath(__file__).parent.joinpath("devname")
+        self._node.shell.mkdir(
+            self.asset_path.joinpath("examples/devname"), parents=False, exist_ok=False
+        )
+        for file in self.__devname_files:
+            self._node.shell.copy(
+                devname_local_folder.joinpath(file),
+                self.asset_path.joinpath(f"examples/devname/{file}"),
+            )
+        # stringify the example app list
         if self._sample_applications:
             sample_apps = f"-Dexamples={','.join(self._sample_applications)}"
         else: