From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1BB06A00C2 for ; Wed, 23 Nov 2022 19:04:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4593142DA9; Wed, 23 Nov 2022 19:04:33 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AF7AE40E5A for ; Wed, 23 Nov 2022 19:04:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eXEw6sYAcay4Gp4qR4BD4B4TlyZJCIEJKoInxDrybkE=; b=cKBFcOM8zQVx4dUsZgQlPhSQhvXVe9OS5Lcf2pp6RNbMypdz4uSkSiR2GsK3WnFt91l57c AS0KJgTfP1l8PiRHcpweH9kr/LILyYRzdIzwtAwsGwlRj1jJz3gOuE/SRv06fN96132CY1 vEP6vu7UVWSiHU184uLhALXafQOB4n8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-135-XkJ1oW-eNhaTxI1LYm5z2A-1; Wed, 23 Nov 2022 13:04:29 -0500 X-MC-Unique: XkJ1oW-eNhaTxI1LYm5z2A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0C59B85A5A6; Wed, 23 Nov 2022 18:04:29 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D09F492B0B; Wed, 23 Nov 2022 18:04:28 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Huisong Li , dpdk stable Subject: patch 'app/testpmd: fix MAC header in checksum forward engine' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:15 +0000 Message-Id: <20221123180413.733554-2-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 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/28/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/185674ed26176597c820c136cbb133e9ab477b03 Thanks. Kevin --- >From 185674ed26176597c820c136cbb133e9ab477b03 Mon Sep 17 00:00:00 2001 From: Gregory Etelson 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 `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 Acked-by: Huisong Li --- app/test-pmd/cmdline.c | 50 +++++++++++++++++++++++++++++++++++++++++ app/test-pmd/csumonly.c | 6 +++++ app/test-pmd/testpmd.c | 5 +++-- app/test-pmd/testpmd.h | 3 ++- 4 files changed, 61 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 82386c02ee..2e8fec3552 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -4898,4 +4898,53 @@ 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 : " + "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 { @@ -17762,4 +17811,5 @@ cmdline_parse_ctx_t main_ctx[] = { (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, diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index d661e21e02..0a72690c37 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -907,4 +907,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) 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], + ð_hdr->dst_addr); + rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, + ð_hdr->src_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 3a8eef48e4..b8b311f982 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -4198,8 +4198,9 @@ init_port(void) 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; ports[i].xstats_info.allocated = false; - for (i = 0; i < RTE_MAX_ETHPORTS; i++) LIST_INIT(&ports[i].flow_tunnel_list); + } /* Initialize ports NUMA structures */ memset(port_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 8f3a89e9be..e53320e630 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -262,5 +262,6 @@ struct rte_port { 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_indirect_action *actions_list; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.167794705 +0000 +++ 0002-app-testpmd-fix-MAC-header-in-checksum-forward-engin.patch 2022-11-23 09:55:57.003149140 +0000 @@ -1 +1 @@ -From 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 Mon Sep 17 00:00:00 2001 +From 185674ed26176597c820c136cbb133e9ab477b03 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 8dc60e9388..3fbcb6ca8f 100644 +index 82386c02ee..2e8fec3552 100644 @@ -38 +39 @@ -@@ -4794,4 +4794,53 @@ static cmdline_parse_inst_t cmd_csum_tunnel = { +@@ -4898,4 +4898,53 @@ cmdline_parse_inst_t cmd_csum_tunnel = { @@ -92 +93 @@ -@@ -12629,4 +12678,5 @@ static cmdline_parse_ctx_t builtin_ctx[] = { +@@ -17762,4 +17811,5 @@ cmdline_parse_ctx_t main_ctx[] = { @@ -99 +100 @@ -index 144f28819c..1c24598515 100644 +index d661e21e02..0a72690c37 100644 @@ -102 +103 @@ -@@ -916,4 +916,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) +@@ -907,4 +907,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) @@ -114 +115 @@ -index aa7ea29f15..bf589c4e8d 100644 +index 3a8eef48e4..b8b311f982 100644 @@ -117 +118 @@ -@@ -4215,8 +4215,9 @@ init_port(void) +@@ -4198,8 +4198,9 @@ init_port(void) @@ -130 +131 @@ -index 349f02e18a..93fdb9d331 100644 +index 8f3a89e9be..e53320e630 100644 @@ -133,2 +134,2 @@ -@@ -317,5 +317,6 @@ struct rte_port { - uint32_t queue_sz; /**< size of a queue for flow rules */ +@@ -262,5 +262,6 @@ struct rte_port { + uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */ @@ -139,2 +140,2 @@ - struct port_template *pattern_templ_list; /**< Pattern templates. */ - struct port_template *actions_templ_list; /**< Actions templates. */ + struct port_flow *flow_list; /**< Associated flows. */ + struct port_indirect_action *actions_list;