patch 'app/testpmd: fix MAC header in checksum forward engine' has been queued to stable release 20.11.7

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/827c2ba4facb66c180365f123e76a4ff3f400b13

Thanks.

Luca Boccassi

---
From 827c2ba4facb66c180365f123e76a4ff3f400b13 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Wed, 26 Oct 2022 14:07:20 +0300
Subject: [PATCH] app/testpmd: fix MAC header in checksum forward engine

[ upstream commit 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 ]

MLX5 SR-IOV Tx engine will not transmit Ethernet frame
if destination MAC address matched local port address. The frame ether
looped-back to Rx or dropped, depending on the port configuration.

Application running over MLX5 SR-IOV port cannot transmit packet
polled from Rx queue as is. The packet Ethernet destination address
must be changed.

Add new run-time configuration parameter to the `csum` forwarding
engine to control MAC addresses configuration:

testpmd> csum mac-swap on|off <port_id>

`mac-swap on`  replace MAC addresses.
`mac-swap off` keep Ethernet header unchanged.

Fixes: 9b4ea7ae77fa ("app/testpmd: revert MAC update in checksum forwarding")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Huisong Li <lihuisong@huawei.com>
---
 app/test-pmd/cmdline.c  | 50 +++++++++++++++++++++++++++++++++++++++++
 app/test-pmd/csumonly.c |  6 +++++
 app/test-pmd/testpmd.c  |  4 +++-
 app/test-pmd/testpmd.h  |  3 ++-
 4 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 83bb041484..9f46570cc4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -4778,6 +4778,55 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
 	},
 };
 
+struct cmd_csum_mac_swap_result {
+	cmdline_fixed_string_t csum;
+	cmdline_fixed_string_t parse;
+	cmdline_fixed_string_t onoff;
+	portid_t port_id;
+};
+
+static void
+cmd_csum_mac_swap_parsed(void *parsed_result,
+		       __rte_unused struct cmdline *cl,
+		       __rte_unused void *data)
+{
+	struct cmd_csum_mac_swap_result *res = parsed_result;
+
+	if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+		return;
+	if (strcmp(res->onoff, "on") == 0)
+		ports[res->port_id].fwd_mac_swap = 1;
+	else
+		ports[res->port_id].fwd_mac_swap = 0;
+}
+
+static cmdline_parse_token_string_t cmd_csum_mac_swap_csum =
+	TOKEN_STRING_INITIALIZER(struct cmd_csum_mac_swap_result,
+				 csum, "csum");
+static cmdline_parse_token_string_t cmd_csum_mac_swap_parse =
+	TOKEN_STRING_INITIALIZER(struct cmd_csum_mac_swap_result,
+				 parse, "mac-swap");
+static cmdline_parse_token_string_t cmd_csum_mac_swap_onoff =
+	TOKEN_STRING_INITIALIZER(struct cmd_csum_mac_swap_result,
+				 onoff, "on#off");
+static cmdline_parse_token_num_t cmd_csum_mac_swap_portid =
+	TOKEN_NUM_INITIALIZER(struct cmd_csum_mac_swap_result,
+			      port_id, RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_csum_mac_swap = {
+	.f = cmd_csum_mac_swap_parsed,
+	.data = NULL,
+	.help_str = "csum mac-swap on|off <port_id>: "
+		    "Enable/Disable forward mac address swap",
+	.tokens = {
+		(void *)&cmd_csum_mac_swap_csum,
+		(void *)&cmd_csum_mac_swap_parse,
+		(void *)&cmd_csum_mac_swap_onoff,
+		(void *)&cmd_csum_mac_swap_portid,
+		NULL,
+	},
+};
+
 /* *** ENABLE HARDWARE SEGMENTATION IN TX NON-TUNNELED PACKETS *** */
 struct cmd_tso_set_result {
 	cmdline_fixed_string_t tso;
@@ -16913,6 +16962,7 @@ cmdline_parse_ctx_t main_ctx[] = {
 	(cmdline_parse_inst_t *)&cmd_csum_set,
 	(cmdline_parse_inst_t *)&cmd_csum_show,
 	(cmdline_parse_inst_t *)&cmd_csum_tunnel,
+	(cmdline_parse_inst_t *)&cmd_csum_mac_swap,
 	(cmdline_parse_inst_t *)&cmd_tso_set,
 	(cmdline_parse_inst_t *)&cmd_tso_show,
 	(cmdline_parse_inst_t *)&cmd_tunnel_tso_set,
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index ffec25f308..aa1c60e7b3 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -888,6 +888,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 		 * and inner headers */
 
 		eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
+		if (ports[fs->tx_port].fwd_mac_swap) {
+			rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
+					    &eth_hdr->d_addr);
+			rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
+					    &eth_hdr->s_addr);
+		}
 		parse_ethernet(eth_hdr, &info);
 		l3_hdr = (char *)eth_hdr + info.l2_len;
 
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index c29f1f153c..d0cd11fe4e 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3813,8 +3813,10 @@ init_port(void)
 				"rte_zmalloc(%d struct rte_port) failed\n",
 				RTE_MAX_ETHPORTS);
 	}
-	for (i = 0; i < RTE_MAX_ETHPORTS; i++)
+	for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+		ports[i].fwd_mac_swap = 1;
 		LIST_INIT(&ports[i].flow_tunnel_list);
+	}
 	/* Initialize ports NUMA structures */
 	memset(port_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS);
 	memset(rxring_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS);
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index d21d8501d5..76c2c55981 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -237,7 +237,8 @@ struct rte_port {
 	struct rte_ether_addr   *mc_addr_pool; /**< pool of multicast addrs */
 	uint32_t                mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
 	uint8_t                 slave_flag : 1, /**< bonding slave port */
-				bond_flag : 1; /**< port is bond device */
+				bond_flag : 1, /**< port is bond device */
+				fwd_mac_swap : 1; /**< swap packet MAC before forward */
 	struct port_flow        *flow_list; /**< Associated flows. */
 	struct port_shared_action *actions_list;
 	/**< Associated shared actions. */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-17 23:07:55.659959543 +0000
+++ 0003-app-testpmd-fix-MAC-header-in-checksum-forward-engin.patch	2022-11-17 23:07:55.428328925 +0000
@@ -1 +1 @@
-From 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 Mon Sep 17 00:00:00 2001
+From 827c2ba4facb66c180365f123e76a4ff3f400b13 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 ]
+
@@ -23 +24,0 @@
-Cc: stable@dpdk.org
@@ -30 +31 @@
- app/test-pmd/testpmd.c  |  5 +++--
+ app/test-pmd/testpmd.c  |  4 +++-
@@ -32 +33 @@
- 4 files changed, 61 insertions(+), 3 deletions(-)
+ 4 files changed, 61 insertions(+), 2 deletions(-)
@@ -35 +36 @@
-index 8dc60e9388..3fbcb6ca8f 100644
+index 83bb041484..9f46570cc4 100644
@@ -38 +39 @@
-@@ -4793,6 +4793,55 @@ static cmdline_parse_inst_t cmd_csum_tunnel = {
+@@ -4778,6 +4778,55 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
@@ -94 +95 @@
-@@ -12628,6 +12677,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
+@@ -16913,6 +16962,7 @@ cmdline_parse_ctx_t main_ctx[] = {
@@ -103 +104 @@
-index 144f28819c..1c24598515 100644
+index ffec25f308..aa1c60e7b3 100644
@@ -106 +107 @@
-@@ -915,6 +915,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
+@@ -888,6 +888,12 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
@@ -112 +113 @@
-+					    &eth_hdr->dst_addr);
++					    &eth_hdr->d_addr);
@@ -114 +115 @@
-+					    &eth_hdr->src_addr);
++					    &eth_hdr->s_addr);
@@ -120 +121 @@
-index aa7ea29f15..bf589c4e8d 100644
+index c29f1f153c..d0cd11fe4e 100644
@@ -123 +124 @@
-@@ -4214,10 +4214,11 @@ init_port(void)
+@@ -3813,8 +3813,10 @@ init_port(void)
@@ -130,2 +130,0 @@
- 		ports[i].xstats_info.allocated = false;
--	for (i = 0; i < RTE_MAX_ETHPORTS; i++)
@@ -138 +137 @@
-index 349f02e18a..93fdb9d331 100644
+index d21d8501d5..76c2c55981 100644
@@ -141,3 +140,3 @@
-@@ -316,7 +316,8 @@ struct rte_port {
- 	queueid_t               queue_nb; /**< nb. of queues for flow rules */
- 	uint32_t                queue_sz; /**< size of a queue for flow rules */
+@@ -237,7 +237,8 @@ struct rte_port {
+ 	struct rte_ether_addr   *mc_addr_pool; /**< pool of multicast addrs */
+ 	uint32_t                mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
@@ -148,3 +147,3 @@
- 	struct port_template    *pattern_templ_list; /**< Pattern templates. */
- 	struct port_template    *actions_templ_list; /**< Actions templates. */
- 	struct port_table       *table_list; /**< Flow tables. */
+ 	struct port_flow        *flow_list; /**< Associated flows. */
+ 	struct port_shared_action *actions_list;
+ 	/**< Associated shared actions. */