iperf3: backport upstream patch

The team working on the XXV + EOE implementation (25G PL Ethernet using SFP+)
observed a bug in iperf3 which causes a roughly 50% drop in the bitrate (from
9.57Gbps down to 5.35Gbps). On scarthgap iperf3 is at version 3.16; this bug
is fixed in version 3.18. Instead of bumping the entire code base to 3.18 it
would be safer to simply apply the fix for this bug onto 3.16 instead.

Link: https://github.com/esnet/iperf/pull/1708/commits/ac6b9f7fd335ddebc5212eed40083ef4cd3cb86d
Signed-off-by: Trevor Woerner <trevor.woerner@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

3 files changed, 25 insertions, 0 deletions

diff --git a/meta-xilinx-standalone-sdt/conf/layer.conf b/meta-xilinx-standalone-sdt/conf/layer.conf
index 81e75110..10eb6385 100644
--- a/meta-xilinx-standalone-sdt/conf/layer.conf
+++ b/meta-xilinx-standalone-sdt/conf/layer.conf
@@ -15,6 +15,8 @@ BBFILE_PRIORITY_xilinx-standalone-sdt = "7"
 BBFILES_DYNAMIC += " \
 openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bb \
 openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bbappend \
+openembedded-layer:${LAYERDIR}/dynamic-layers/meta-oe/recipes-*/*/*.bb \
+openembedded-layer:${LAYERDIR}/dynamic-layers/meta-oe/recipes-*/*/*.bbappend \
 "
 
 # Allow other layers to find the root of this layer if necessary
diff --git a/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3/do-not-listen-to-old-udp-prot-listener.patch b/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3/do-not-listen-to-old-udp-prot-listener.patch
new file mode 100644
index 00000000..579ed326
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3/do-not-listen-to-old-udp-prot-listener.patch
@@ -0,0 +1,21 @@
+From ac6b9f7fd335ddebc5212eed40083ef4cd3cb86d Mon Sep 17 00:00:00 2001
+From: David Bar-On <david.cdb004@gmail.com>
+Date: Sun, 2 Jun 2024 11:52:03 +0300
+Subject: [PATCH] Do not listen to old pro_listener
+
+---
+ src/iperf_udp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/iperf_udp.c b/src/iperf_udp.c
+index a603236df..40f2b1ca7 100644
+--- a/src/iperf_udp.c
++++ b/src/iperf_udp.c
+@@ -446,6 +446,7 @@ iperf_udp_accept(struct iperf_test *test)
+     /*
+      * Create a new "listening" socket to replace the one we were using before.
+      */
++    FD_CLR(test->prot_listener, &test->read_set); // No control messages from old listener
+     test->prot_listener = netannounce(test->settings->domain, Pudp, test->bind_address, test->bind_dev, test->server_port);
+     if (test->prot_listener < 0) {
+         i_errno = IESTREAMLISTEN;
diff --git a/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3_%.bbappend b/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3_%.bbappend
new file mode 100644
index 00000000..8422870a
--- /dev/null
+++ b/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://do-not-listen-to-old-udp-prot-listener.patch"