From patchwork Sat Jan 28 13:08:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 122614 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EFEE7424AA; Sat, 28 Jan 2023 14:09:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CEA2410DC; Sat, 28 Jan 2023 14:09:34 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2049.outbound.protection.outlook.com [40.107.92.49]) by mails.dpdk.org (Postfix) with ESMTP id B9E4042BAC for ; Sat, 28 Jan 2023 14:09:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CRAy/cmKHJ8JZ9Hyi4RcHhkJyk140kcivpWGlrHbE2bla/Rc0OfXna3YzqxgdTOEL9NHUNlY/6PhmCFvDJYEY9TfsryFr2Wh1DThKiMAiISJIzu/dcGdDDJ6UiuJYQZKVYiF3IOm7PdCNFrjPE2UhKSgLYm7bov8sDcg8RK4p5OaGDcOacaAar9Yj2T3B0yQYZn3V6acAAyZbEyrZrLCxwIZ+KSDzE9NNnHSFFioIeQFJMuqUU3GTwmWKrUE83t86i11Ne3hkCBd6SIZzS/roAJNj/6WEOyeR1bvC8kVeQ34Um+T/ieKUyhjeJe8w8Op3NrWnmMfilB7HBEYrDqw1A== 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=DeTlW9MDpP8DtweU1GQSdqk3GSHIDobmZKglR8Lc9Ck=; b=l5ap971/4LCwclAhK3OvqC3m26Ubs9KdSa6LxhZXuiywKbrDngWKzKvq8mZzXLLcghsikunEPZiIY2myPoU5Ij0nkz9n2yMoA4/0aif/NUA4GR2aUtAc/iNxLbOEERl3u0UKO/SVmj3czssBaWqrg1UnNEHULPvWzI2sGf9vibTm0LIdoynh/24AIPSH/C/IE+qvuphhQABJQeQxUGVCxMu/9Ta3QxAmL8FyZKN/eaUtKUix0SjlBnKtYxQiRSNEF90CmKAGTvMf+3HqKg1ZN9CVZsf0DjPZDwd8IWAsSlVmEISbWVpuemuUUooVpoXzEDv+1AS2rA+f+l1RbCHyeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net 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=DeTlW9MDpP8DtweU1GQSdqk3GSHIDobmZKglR8Lc9Ck=; b=hoJuMmZqimwKRCaPl05SV5tegpmTZj2ZdcjeLyVZgTv+6hC1b1XGHwiGpt7m//K70orPmeG7H1lsfFEWKif+729mSD+r4x71ZqK2tNo2zRDhFVJpbe8PyF131E0A/jT9WkPRTvX5SRWG2e+CBVY/whdrJSAYHCIW5ebsT2e6skSRs87QGnbcKH58CxgxtcFQl139YgSmhR/adhLAyrBdYIYsNXBaaHrvU29tzc6CqMYXUc5KSFIpt16IwrgIAkwH5hpXEPkjIrhx3tPKA78fso1TLmkCHmdUmjRpX7fIwv5yuMXHcAi4tlk2hM91R/AIMkNjU89LWa0EDNQQfSc2cA== Received: from DS7PR05CA0086.namprd05.prod.outlook.com (2603:10b6:8:56::7) by SA1PR12MB7245.namprd12.prod.outlook.com (2603:10b6:806:2bf::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.28; Sat, 28 Jan 2023 13:09:30 +0000 Received: from DM6NAM11FT081.eop-nam11.prod.protection.outlook.com (2603:10b6:8:56:cafe::14) by DS7PR05CA0086.outlook.office365.com (2603:10b6:8:56::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.13 via Frontend Transport; Sat, 28 Jan 2023 13:09:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT081.mail.protection.outlook.com (10.13.172.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22 via Frontend Transport; Sat, 28 Jan 2023 13:09:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sat, 28 Jan 2023 05:09:25 -0800 Received: from nvidia.com (10.126.230.37) 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.36; Sat, 28 Jan 2023 05:09:22 -0800 From: Jiawei Wang To: , , , "Aman Singh" , Yuying Zhang , Ferruh Yigit , Andrew Rybchenko CC: , Subject: [PATCH 2/2] ethdev: introduce the mhpsdp hwport field in Tx queue API Date: Sat, 28 Jan 2023 15:08:57 +0200 Message-ID: <20230128130857.17399-3-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230128130857.17399-1-jiaweiw@nvidia.com> References: <20230128130857.17399-1-jiaweiw@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] 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: DM6NAM11FT081:EE_|SA1PR12MB7245:EE_ X-MS-Office365-Filtering-Correlation-Id: a13a163c-d49e-4add-343c-08db0130e3f7 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m2hamVKGSGDGDG1wFKx8J0/3lkuas0O0c3J3LpEDGnOl189o2+YU8ueGi6QGeqQxbudFj5v/dJ7DF0knyiW1AvSXE8WkrlD3tn34v6/h8ZjflLpFav1tJTK0IgVx0O6v+enPZvdXfTz03HoAXYra0qcWyrulp2BS5IIFHgy/3wSQ+IAhgbyZnhLgdTezYtOslHDV2IQMDrKGq9ro4GHzumV6Z023i4nYw3CihBrcfBiicpkD0lOgY/UAhD3Q04dlw6/FA61+6HmiBslpQAPpvbbO1NYJNdJHOW451bdNuYGjIKfoY/d6h7dCSJQaC+IJhGo7vckA9FBl4Id14kxG9Qo4e0i6A74cauDlHmp+okUq5SFURnnRFlSk07XIPyD16jGp4ZvCW7f1lrwtWT1GlduG9CEcV1i5wzLJhkslMN/2X2s+1JFrOTzYE/V49XLxUYNk69pNwQKMFNNzeeeWXYLkym2lg4dNeSgm6p1ro0sljEbZxDzxjWZQP3/TyruOF4VZUXbd9ZWvBMoVw3wVMowy8y1YvF3iG1Qaybbl9HSlno4HliM2k7AY3cwQVeDkZbOLF6IWxe423f48nqscyjiHDs3whlcR0Sv0ySHq31cvnTV6gpUj/mcTmA3VNYKbD9dhqjT32klMtneTYipH+16iVg+ZX36k0VhJBPpnwYs69Y2vCNm+pqCBC91m75a7EqWrZAFurdKf/QPi0HEhdDlICmf3hQpyPJ02pSZmc8M= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(346002)(376002)(396003)(39860400002)(451199018)(40470700004)(36840700001)(46966006)(356005)(478600001)(40460700003)(7696005)(2906002)(36756003)(2616005)(83380400001)(426003)(336012)(54906003)(47076005)(55016003)(40480700001)(316002)(16526019)(86362001)(186003)(6286002)(82310400005)(82740400003)(6666004)(107886003)(7636003)(36860700001)(26005)(110136005)(1076003)(5660300002)(8936002)(41300700001)(70206006)(70586007)(4326008)(8676002)(40753002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 13:09:29.6337 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a13a163c-d49e-4add-343c-08db0130e3f7 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT081.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7245 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 For the multiple hardware ports connect to a single DPDK port (mhpsdp), the previous patch introduces the new rte flow item to match the hardware port of the received packets. This patch adds the tx_mhpsdp_hwport setting in Tx queue API, the hwport value reflects packets be sent to which hardware port. 0 is no port assigned and traffic will be routed between different hardware ports, if 0 is disabled then try to match on MHPSDP_HW_PORT with 0 will result in an error. Adds the new tx_mhpsdp_hwport field into the padding hole of rte_eth_txconf structure, the size of rte_eth_txconf keeps the same. Adds a suppress type for structure change in the ABI check file. This patch adds the testpmd command line: testpmd> port config (port_id) txq (queue_id) mhpsdp_hwport (value) For example, there're two hardware ports 0 and 1 connected to a single DPDK port (port id 0), and mhpsdp_hwport 1 stood for hardware port 0 and mhpsdp_hwport 2 stood for hardware port 1, used the below command to config tx mhpsdp_hwport for per Tx Queue: port config 0 txq 0 mhpsdp_hwport 1 port config 0 txq 1 mhpsdp_hwport 1 port config 0 txq 2 mhpsdp_hwport 2 port config 0 txq 3 mhpsdp_hwport 2 These commands config the TxQ index 0 and TxQ index 1 with mhpsdp_hwport 1, uses TxQ 0 or TxQ 1 send packets, these packets will be sent from the hardware port 0, and similar with hardware port 1 if sending packets with TxQ 2 or TxQ 3. Signed-off-by: Jiawei Wang --- app/test-pmd/cmdline.c | 84 +++++++++++++++++++++ devtools/libabigail.abignore | 5 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 13 ++++ lib/ethdev/rte_ethdev.h | 8 ++ 4 files changed, 110 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b32dc8bfd4..db9ea8b18a 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -764,6 +764,10 @@ static void cmd_help_long_parsed(void *parsed_result, "port cleanup (port_id) txq (queue_id) (free_cnt)\n" " Cleanup txq mbufs for a specific Tx queue\n\n" + + "port config (port_id) txq (queue_id) mhpsdp_hwport (value)\n" + " Set the hwport value in mhpsdp " + "on a specific Tx queue\n\n" ); } @@ -12621,6 +12625,85 @@ static cmdline_parse_inst_t cmd_show_port_flow_transfer_proxy = { } }; +/* *** configure port txq mhpsdp_hwport value *** */ +struct cmd_config_tx_mhpsdp_hwport { + cmdline_fixed_string_t port; + cmdline_fixed_string_t config; + portid_t portid; + cmdline_fixed_string_t txq; + uint16_t qid; + cmdline_fixed_string_t mhpsdp_hwport; + uint16_t value; +}; + +static void +cmd_config_tx_mhpsdp_hwport_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_config_tx_mhpsdp_hwport *res = parsed_result; + struct rte_port *port; + + if (port_id_is_invalid(res->portid, ENABLED_WARN)) + return; + + if (res->portid == (portid_t)RTE_PORT_ALL) { + printf("Invalid port id\n"); + return; + } + + port = &ports[res->portid]; + + if (strcmp(res->txq, "txq")) { + printf("Unknown parameter\n"); + return; + } + if (tx_queue_id_is_invalid(res->qid)) + return; + + port->txq[res->qid].conf.tx_mhpsdp_hwport = res->value; + + cmd_reconfig_device_queue(res->portid, 0, 1); +} + +cmdline_parse_token_string_t cmd_config_tx_mhpsdp_hwport_port = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + port, "port"); +cmdline_parse_token_string_t cmd_config_tx_mhpsdp_hwport_config = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + config, "config"); +cmdline_parse_token_num_t cmd_config_tx_mhpsdp_hwport_portid = + TOKEN_NUM_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + portid, RTE_UINT16); +cmdline_parse_token_string_t cmd_config_tx_mhpsdp_hwport_txq = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + txq, "txq"); +cmdline_parse_token_num_t cmd_config_tx_mhpsdp_hwport_qid = + TOKEN_NUM_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + qid, RTE_UINT16); +cmdline_parse_token_string_t cmd_config_tx_mhpsdp_hwport_hwport = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + mhpsdp_hwport, "mhpsdp_hwport"); +cmdline_parse_token_num_t cmd_config_tx_mhpsdp_hwport_value = + TOKEN_NUM_INITIALIZER(struct cmd_config_tx_mhpsdp_hwport, + value, RTE_UINT16); + +static cmdline_parse_inst_t cmd_config_tx_mhpsdp_hwport = { + .f = cmd_config_tx_mhpsdp_hwport_parsed, + .data = (void *)0, + .help_str = "port config txq mhpsdp_hwport ", + .tokens = { + (void *)&cmd_config_tx_mhpsdp_hwport_port, + (void *)&cmd_config_tx_mhpsdp_hwport_config, + (void *)&cmd_config_tx_mhpsdp_hwport_portid, + (void *)&cmd_config_tx_mhpsdp_hwport_txq, + (void *)&cmd_config_tx_mhpsdp_hwport_qid, + (void *)&cmd_config_tx_mhpsdp_hwport_hwport, + (void *)&cmd_config_tx_mhpsdp_hwport_value, + NULL, + }, +}; + /* ******************************************************************************** */ /* list of instructions */ @@ -12851,6 +12934,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = { (cmdline_parse_inst_t *)&cmd_show_capability, (cmdline_parse_inst_t *)&cmd_set_flex_is_pattern, (cmdline_parse_inst_t *)&cmd_set_flex_spec_pattern, + (cmdline_parse_inst_t *)&cmd_config_tx_mhpsdp_hwport, NULL, }; diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 7a93de3ba1..cbbde4ef05 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -20,6 +20,11 @@ [suppress_file] soname_regexp = ^librte_.*mlx.*glue\. +; Ignore fields inserted in middle padding of rte_eth_txconf +[suppress_type] + name = rte_eth_txconf + has_data_member_inserted_between = {offset_after(tx_deferred_start), offset_of(offloads)} + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 7be7c55d63..a05fd0e7d0 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1605,6 +1605,19 @@ Enable or disable a per queue Tx offloading only on a specific Tx queue:: This command should be run when the port is stopped, or else it will fail. +config per queue Tx mhpsdp_hwport +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Configure a mhpsdp_hwport value per queue Tx offloading only on a specific Tx queue:: + + testpmd> port (port_id) txq (queue_id) mhpsdp_hwport (value) + +* ``mhpsdp_hwport``: reflects packet can be sent to which hardware port. + uses it on multiple hardware ports connect to + a single DPDK port (mhpsdp). + +This command should be run when the port is stopped, or else it will fail. + Config VXLAN Encap outer layers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index c129ca1eaf..c1cef9e21d 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1138,6 +1138,14 @@ struct rte_eth_txconf { less free descriptors than this value. */ uint8_t tx_deferred_start; /**< Do not start queue with rte_eth_dev_start(). */ + /** + * Hardware port index for mhpsdp. + * Value 0 is no port assigned and traffic could be routed between different + * hardware ports, if 0 is disabled then try to match on MHPSDP_HW_PORT with + * 0 will result in an error. + * Value starts from 1 means that the first hw port in the mhpsdp. + */ + uint8_t tx_mhpsdp_hwport; /** * Per-queue Tx offloads to be set using RTE_ETH_TX_OFFLOAD_* flags. * Only offloads set on tx_queue_offload_capa or tx_offload_capa