dpdk symmetric_mp: add patched version of main.c for old versions of dpdk

Author: mcgov

microsoft/testsuites/dpdk/dpdkutil.py

@@ -5,6 +5,7 @@
 from decimal import Decimal
 from enum import Enum
 from functools import partial
+from pathlib import PurePath
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 from assertpy import assert_that, fail
@@ -30,6 +31,7 @@
 from lisa.operating_system import OperatingSystem, Ubuntu
 from lisa.testsuite import TestResult
 from lisa.tools import (
+    Cp,
     Dmesg,
     Echo,
     Firewall,
@@ -1292,6 +1294,33 @@ def get_port_info(self, nics: List[NicInfo], expect_ports: int = 1) -> str:
         return self.port_mask
 
 
+# TODO: remove this method in 2028 when all updated versions are LTS
+def _apply_workaround_for_symmetric_mp_main(node: Node) -> None:
+    # workaround for unmerged code in dpdk project
+    # replace symmetric_mp main.c with patched version
+    symmetric_mp_local_dir = PurePath(__file__).parent.joinpath("symmetric_mp")
+    symmetric_mp_patched_main_c = "symmetric-mp-patched-main.c"
+    node.shell.copy(
+        symmetric_mp_local_dir.joinpath(symmetric_mp_patched_main_c),
+        node.working_path,
+    )
+    symmetric_mp_remote = (
+        "/usr/local/share/dpdk/examples/multi_process/symmetric_mp/main.c"
+    )
+    node.tools[Cp].run(
+        (
+            f"{str(node.working_path.joinpath(symmetric_mp_patched_main_c))} "
+            f"{symmetric_mp_remote}"
+        ),
+        force_run=True,
+        sudo=True,
+        expected_exit_code=0,
+        expected_exit_code_failure_message=(
+            "Could not copy patched symmetric_mp main.c to examples folder."
+        ),
+    )
+
+
 def run_dpdk_symmetric_mp(
     node: Node,
     log: Logger,
@@ -1351,6 +1380,11 @@ def run_dpdk_symmetric_mp(
             "DPDK symmetric_mp test is not implemented for "
             " package manager installation."
         )
+
+    # NOTE: apply workaround for unmerged change to main.c
+    # needed to run symmetric_mp on MANA for now.
+    _apply_workaround_for_symmetric_mp_main(node)
+
     symmetric_mp_path = testpmd.get_example_app_path("multi_process/symmetric_mp")
 
     # setup the DPDK EAL arguments for netvsc

microsoft/testsuites/dpdk/symmetric_mp/README.md

@@ -0,0 +1,9 @@
+# patched symmetric_mp example app
+
+The main.c file in this directory is a patched version of the multi_process/symmetric_mp example application from the DPDK project.
+
+https://git.dpdk.org/dpdk/tree/examples/multi_process/symmetric_mp
+
+This change in this main.c is under review, but not merged. This cached version of the main.c file for this app is a workaround for older versions of DPDK. It should build for most if not all recent versions of the project.
+
+https://patches.dpdk.org/project/dpdk/list/?series=36143