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 28AE9A0542; Wed, 26 Oct 2022 13:07:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CDC9F40F17; Wed, 26 Oct 2022 13:07:55 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2083.outbound.protection.outlook.com [40.107.100.83]) by mails.dpdk.org (Postfix) with ESMTP id 24F0A40041 for ; Wed, 26 Oct 2022 13:07:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LpmJM/0Qg8BLkE4WpO8pThV9YO7IPdFYY2zQlIUSO0R1/l3bOKBNl15t47XDvi20fvwDaarX6kCDyAJLhEBPJ0q9wb+6SN61Q0LR77kmeZeZBnpBX7CTzWnmTIDinDVqm8smae6XzPgLz3MnrcUYLkeYi3wUwNhjHUzFJ1uLJNAAwOrwQxp03+G6ZVpAfkdGKIxd+M9DjYptUcVC7VVT11Vq8RlfOvxxOlhOTW+nfJuF44MQxHFgbW4f28J35F1YdETn5DcIyeVo6pYCPMQnmh9K0YXSp+IPfkJudUCNhx4UbeeAS2X7eS6xHJ8WDbB/pbeccKfDr5Ajp8t66aet/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PsIV81hcywfIHVPREz8q4hunNLs/tcNgx3fCcjC55V0=; b=K3QCce/ZzDgXxpF0WCJMO7umXcHFM5uR9hV8fsiKpiwLx6lrRrWOYOw1uqTbFDx6gfFE6gAEVg2NTiTKLB9dpS9FvawxPxEN55WpZcAyoOAEIIzvzcaz2oSsL9mV2mYIP3jodxLrjWeIwLt0O6U5KflEeVss9koeYVYiplB275S9+Ty4buhF7Kk7y3wOVGJaoZ0Bk4aGcf+FaUbmtIGqdzDJKSOAiAWgxGT8fFgnlAIcarPfOwFUakTfRuL6bTGesvt5E+EqcRRNWGFNKxNfx+AH0ODJ1ok/8S6dphkVuYfpPAyzr62IYty0eDjgDBM24hn0LP4nnEwpy/M3wTntww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PsIV81hcywfIHVPREz8q4hunNLs/tcNgx3fCcjC55V0=; b=Dyr/gdB4F/kkxrl4e692jBhGTKLcwzbT3wEOsvvIW0FmeYnDLp8R8BUThPLWvbozzHssRvg8EX9cs4nmtG10w+K/ykDYj88f+TKo6AK6dcyhHeedvMq1BVykmDfag1ZYJQ1EBfYEO7KdF/gUmSn0USIBprrZ34EYJsUNbYHKWc/z9f2UoOVqNfJX4Qcj1KVLnuiZf9m0lqd/eniL96pn4g7ICGtD5AcjwKthCRruljOvENRqOecMWcpPUvfe4UezxRB83lgZE4A0akGDgPGJ5NvmbtCAnTGG6e4S3MLzWnyzU5MkjCZwyxuCf7lx0WAWiVPf8pajklpzkDtgeiLcQA== Received: from BN8PR16CA0007.namprd16.prod.outlook.com (2603:10b6:408:4c::20) by PH7PR12MB6635.namprd12.prod.outlook.com (2603:10b6:510:210::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Wed, 26 Oct 2022 11:07:53 +0000 Received: from BN8NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:408:4c:cafe::fa) by BN8PR16CA0007.outlook.office365.com (2603:10b6:408:4c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21 via Frontend Transport; Wed, 26 Oct 2022 11:07:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT013.mail.protection.outlook.com (10.13.176.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Wed, 26 Oct 2022 11:07:52 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 26 Oct 2022 04:07:39 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 26 Oct 2022 04:07:36 -0700 From: Gregory Etelson To: CC: , , , "Aman Singh" , Yuying Zhang , Chenbo Xia , Maxime Coquelin Subject: [PATCH] app/testpmd: fix MAC header in csum forward engine Date: Wed, 26 Oct 2022 14:07:20 +0300 Message-ID: <20221026110721.26226-1-getelson@nvidia.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT013:EE_|PH7PR12MB6635:EE_ X-MS-Office365-Filtering-Correlation-Id: b9c706a2-8c49-4d29-3554-08dab74253a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d5UbbFyZBDAP5OXqE7ttz6FZrXtmak5ieLDbWhHi1aoIYT82m1ezYsrxYqlV4SU6tMpmm9AVOBEsVh8VgH2fu/aeKDu7q5dVPcCznVy6VZURxVFE2C+3A1mmUpWUvNLL96EeWh2I9tj+tUyk7oIbYUO8K+EgZpBBV1SjpVZpwXUZi/fTaaByvgQBZ0KpG9Z9TMfRff2VrqI/w1ZjjnyZXbscUFxCIxbqtjsWdBnBkowjap1jWLVRANeWXdUtLCVZtzau3SyMR4RmpDEs1LlaIBwMLVTrq2wLp6PfSpPIlO6XfQodTXOzGCIvYb/vJ/0CMDu+lF2AkpsYJcB40KJNWDNzLKnIendIKYy5b/ebRD/Zr2+40Hl3sdlqxszF189eqGeN6KLya7fB/i5HyzI3rbiSRYK4vjDWtzso+Y31vYT4KeB9SJ9BdGxplaD123nv3bRBHpw1PWZx/q2nBzTmIWfFUlaDpQelWcr4hYSDcou8KV5loMvqT7PJqNMEvN+ZqMTDAr3LXjdcPxTu+bDRb+qXhW9C67owLOCFvG08aDAYxGBsMSaP9rFEwJwe7qlwVEu2LTHL05oUjzUNPqQgDVffMzb2vcL12vARqcs9PRQc3El38CmsEG6KR/nw2Bz4qnGT4km556ryMDyhnJDB95BV07fzIlt5TpkxpSCLRPyzLflFvhVBDgE+hjIi70CMvMtOGyfOng9PVfHn/yQUIa+a0UCwEmP3eMNXZ/C5Z0j/01nG5GlUdXeMRog7w7xa84DG11UjvYXY055PvFlYzQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(39860400002)(136003)(346002)(396003)(451199015)(40470700004)(46966006)(36840700001)(40480700001)(70206006)(316002)(7696005)(6666004)(478600001)(70586007)(6916009)(4326008)(54906003)(55016003)(8676002)(26005)(6286002)(36860700001)(7636003)(5660300002)(8936002)(86362001)(41300700001)(336012)(2616005)(1076003)(186003)(16526019)(2906002)(40460700003)(83380400001)(36756003)(82310400005)(356005)(47076005)(426003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 11:07:52.3466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b9c706a2-8c49-4d29-3554-08dab74253a4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6635 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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. The patch adds 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 --- 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 8dc60e9388..3fbcb6ca8f 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -4793,6 +4793,55 @@ static 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 { cmdline_fixed_string_t tso; @@ -12628,6 +12677,7 @@ static cmdline_parse_ctx_t builtin_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 144f28819c..1c24598515 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -915,6 +915,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], + ð_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 97adafacd0..a61142bd32 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -4218,10 +4218,11 @@ 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; 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); memset(rxring_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 7fef96f9b1..9182bad26c 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -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 */ 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_template *pattern_templ_list; /**< Pattern templates. */ struct port_template *actions_templ_list; /**< Actions templates. */ struct port_table *table_list; /**< Flow tables. */ -- 2.34.1