From patchwork Fri Feb 17 15:47:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 124130 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 E5C3E41CC1; Fri, 17 Feb 2023 16:48:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C962542D38; Fri, 17 Feb 2023 16:48:33 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2044.outbound.protection.outlook.com [40.107.93.44]) by mails.dpdk.org (Postfix) with ESMTP id 1A54742D0C for ; Fri, 17 Feb 2023 16:48:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZfj+baPjK/Dx6VYAEudGO3ylucWstneTLbFAsre9ivDm0sAYqBTlN49RuID4SIobHFNXmmoviUg9Y0EDBbfJtjJifcDAIRhoSn1d2Jh2jSupxwDNvt8zstvcP+Hhk37vzfdFCroVCYuwwCgXV1PzjNAdicEr/NRi72hgO/YeIUe8n1kRx16Cfj8ygdKzJ5CTlG8PUqV5wXqEzx4971rp2678fRy80LsWCWCfwxnJUJVXPOVQMCYdTRAEiwjMGC9+fX7IU8ujxwm2Xa3ymFYoGrzlMuGptNReIDoYwTlqZh3kI/LOPQwe8DgJaCLAxdbqAhDYDQtiAnTar6KjKPeWg== 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=T99tWNZVWdjqmXVGuZOuk8L7Hn+9bKiJlO//6RgoAqU=; b=LmW84EVjYp99M9XqOeBcpxKoSX1QJs1fs5hrJthfsNGFYu6aRdhabIFhstDyC0x4kR0v2TEVyrnZ+a6fyZGVLzteubpglPnCZwHfVp0D1MZVlaK/PtnbOlRu0YKnRNgDVRrMZrPUKJH0Sn3vvsLTJq8GnyZEZClMT8eDT8OWf7jxHceVRhqP9+dYm6+KtL+7vpDw1jrtPdtPjEbARMRsWlweP44MC6cvAOTMBMuPaNjI4L7grn9o6j+vwWznUAEaUB3a+3ZUOwrYoEx3U8QWQDuxGCtSGRwcmqUHizHz0xQU4R9jZY/6+cVcpvf7uK2kTMxM5hpbqJ3T17Kym2Facg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=T99tWNZVWdjqmXVGuZOuk8L7Hn+9bKiJlO//6RgoAqU=; b=mH3LEJvKKKSijoVnGjDilV4LkNovyzrrL2kQnrNkHQU0CDn9/vYqZ6VwKlRIt9dVdCSXI7pijBUjlB1q47OaVNd1eM5IN37Nn29zK4iZ0gqrMCro2qrdw8YKeSAWK4Ga7olBGesWd3Ecq8E8QbL/gMFaY6HNEQXShadOcidW1lBNvR0N7pXflPD8dCnfggaCkmV3vrBfsE8znunz9h8CI2kPOBolhA7HetDSXpYg4DSa8BgF6YhQQsCWQxQjsvFsFCa5cm301RWWOUI3K4omM5LcihELVIBokkdhUcAztTB13x0o+k+CcHNgUGSG6IiYOM8OdC8XbrzFX79oLE1FAw== Received: from BN9PR03CA0711.namprd03.prod.outlook.com (2603:10b6:408:ef::26) by MW6PR12MB8662.namprd12.prod.outlook.com (2603:10b6:303:243::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.12; Fri, 17 Feb 2023 15:48:29 +0000 Received: from BN8NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ef:cafe::d) by BN9PR03CA0711.outlook.office365.com (2603:10b6:408:ef::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.13 via Frontend Transport; Fri, 17 Feb 2023 15:48:29 +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 BN8NAM11FT040.mail.protection.outlook.com (10.13.177.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.17 via Frontend Transport; Fri, 17 Feb 2023 15:48:29 +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.36; Fri, 17 Feb 2023 07:48:21 -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; Fri, 17 Feb 2023 07:48:18 -0800 From: Jiawei Wang To: , , , , , Aman Singh , Yuying Zhang CC: , Subject: [PATCH v7 1/2] ethdev: add Tx queue mapping of aggregated ports Date: Fri, 17 Feb 2023 17:47:46 +0200 Message-ID: <20230217154747.12401-2-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230217154747.12401-1-jiaweiw@nvidia.com> References: <20230203050717.46914-1-jiaweiw@nvidia.com> <20230217154747.12401-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: BN8NAM11FT040:EE_|MW6PR12MB8662:EE_ X-MS-Office365-Filtering-Correlation-Id: 0af90cee-7abb-4751-9a46-08db10fe6a66 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: 9fO8q7PvFxLBKQ3C2IqueClph/xJoRUo9ebcL9bOrX/JORdr7TNN1TLCSf9QjEaYHGb9kzhOME5qsqxoO6ki2DYYtV3JF9oXf1jkMBoBUjKgGhkhp0wGqHyywkEsHzsm0+Z3uZXP98RH9BkOTCXeD+BH/P0runvklpcZ4JnrClGp+OrpoTZkkcLxQXK2dyHZoqDukYc0M6lXy9pofbFmlcxy1COEwPHMAkISGYyDGFTABtDHAQbIBQ8oscSsgFpZpsf9dZrs9NeQ1hl/0UVfqqBstoDYmoS1iZrVSbDo84a2gdqCiCD4Ex0cVx+yELXNGr41rDF+PQMQeO48xV3iPHWiZUH2Z6Kj35nCCwhYYa79qZxhTJLuHQAZDdHuPdo+S3P+ik5YLF1v8MnxmXN+kyDzYkEq64zu2w6CoIVgt2y/H/XoTU8pMltoOaubO+gzTVCLflMAARRfQ1W6O2hMx5jqRyerApbQ101cyyID2Zf2YLPuWOAXigenUAD4704ByfWY6HEQyedswlVPN1bH5B6HC3SYI/Zokj8+D7Pf5SIz8h90ewLSNh/zW1NSixJ9oqLG86VPOuszD8FXIZ8VUth/zn0T8t/PopKr7ZeOYdXxmx3fk5EA+4njKlG+bdAFh478FDgO2FUA+ROXaPqFpAv/lG2LAAaWh9v+hsaJhoLrtzvJ+r7k+H7V1oBmFqVnOhpLy21aXsJc3+jDLAVC3w== 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:(13230025)(4636009)(136003)(39860400002)(376002)(346002)(396003)(451199018)(40470700004)(46966006)(36840700001)(86362001)(36860700001)(82310400005)(82740400003)(55016003)(356005)(7636003)(36756003)(4326008)(40480700001)(40460700003)(70206006)(70586007)(110136005)(54906003)(41300700001)(316002)(8676002)(5660300002)(30864003)(2906002)(8936002)(2616005)(83380400001)(7696005)(478600001)(426003)(47076005)(336012)(16526019)(6666004)(6286002)(107886003)(26005)(186003)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 15:48:29.3716 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0af90cee-7abb-4751-9a46-08db10fe6a66 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: BN8NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8662 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 When multiple ports are aggregated into a single DPDK port, (example: Linux bonding, DPDK bonding, failsafe, etc.), we want to know which port use for Tx via a queue. This patch introduces the new ethdev API rte_eth_dev_map_aggr_tx_affinity(), it's used to map a Tx queue with an aggregated port of the DPDK port (specified with port_id), The affinity is the number of the aggregated port. Value 0 means no affinity and traffic could be routed to any aggregated port, this is the default current behavior. The maximum number of affinity is given by rte_eth_dev_count_aggr_ports(). Add the trace point for ethdev rte_eth_dev_count_aggr_ports() and rte_eth_dev_map_aggr_tx_affinity() functions. Add the testpmd command line: testpmd> port config (port_id) txq (queue_id) affinity (value) For example, there're two physical ports connected to a single DPDK port (port id 0), and affinity 1 stood for the first physical port and affinity 2 stood for the second physical port. Use the below commands to config tx phy affinity for per Tx Queue: port config 0 txq 0 affinity 1 port config 0 txq 1 affinity 1 port config 0 txq 2 affinity 2 port config 0 txq 3 affinity 2 These commands config the Tx Queue index 0 and Tx Queue index 1 with phy affinity 1, uses Tx Queue 0 or Tx Queue 1 send packets, these packets will be sent from the first physical port, and similar with the second physical port if sending packets with Tx Queue 2 or Tx Queue 3. Signed-off-by: Jiawei Wang Acked-by: Thomas Monjalon --- app/test-pmd/cmdline.c | 92 +++++++++++++++++++++ doc/guides/rel_notes/release_23_03.rst | 7 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 14 ++++ lib/ethdev/ethdev_driver.h | 37 +++++++++ lib/ethdev/ethdev_trace.h | 17 ++++ lib/ethdev/ethdev_trace_points.c | 6 ++ lib/ethdev/rte_ethdev.c | 72 ++++++++++++++++ lib/ethdev/rte_ethdev.h | 49 +++++++++++ lib/ethdev/version.map | 2 + 9 files changed, 296 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index bb7ff2b449..151f356224 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -776,6 +776,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) affinity (value)\n" + " Map a Tx queue with an aggregated port " + "of the DPDK port\n\n" ); } @@ -12636,6 +12640,93 @@ static cmdline_parse_inst_t cmd_show_port_flow_transfer_proxy = { } }; +/* *** configure port txq affinity value *** */ +struct cmd_config_tx_affinity_map { + 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 affinity; + uint8_t value; +}; + +static void +cmd_config_tx_affinity_map_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_config_tx_affinity_map *res = parsed_result; + int ret; + + if (port_id_is_invalid(res->portid, ENABLED_WARN)) + return; + + if (res->portid == (portid_t)RTE_PORT_ALL) { + printf("Invalid port id\n"); + return; + } + + if (strcmp(res->txq, "txq")) { + printf("Unknown parameter\n"); + return; + } + if (tx_queue_id_is_invalid(res->qid)) + return; + + ret = rte_eth_dev_count_aggr_ports(res->portid); + if (ret < 0) { + printf("Failed to count the aggregated ports: (%s)\n", + strerror(-ret)); + return; + } + + ret = rte_eth_dev_map_aggr_tx_affinity(res->portid, res->qid, res->value); + if (ret != 0) { + printf("Failed to map tx queue with an aggregated port: %s\n", + rte_strerror(-ret)); + return; + } +} + +cmdline_parse_token_string_t cmd_config_tx_affinity_map_port = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_affinity_map, + port, "port"); +cmdline_parse_token_string_t cmd_config_tx_affinity_map_config = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_affinity_map, + config, "config"); +cmdline_parse_token_num_t cmd_config_tx_affinity_map_portid = + TOKEN_NUM_INITIALIZER(struct cmd_config_tx_affinity_map, + portid, RTE_UINT16); +cmdline_parse_token_string_t cmd_config_tx_affinity_map_txq = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_affinity_map, + txq, "txq"); +cmdline_parse_token_num_t cmd_config_tx_affinity_map_qid = + TOKEN_NUM_INITIALIZER(struct cmd_config_tx_affinity_map, + qid, RTE_UINT16); +cmdline_parse_token_string_t cmd_config_tx_affinity_map_affinity = + TOKEN_STRING_INITIALIZER(struct cmd_config_tx_affinity_map, + affinity, "affinity"); +cmdline_parse_token_num_t cmd_config_tx_affinity_map_value = + TOKEN_NUM_INITIALIZER(struct cmd_config_tx_affinity_map, + value, RTE_UINT8); + +static cmdline_parse_inst_t cmd_config_tx_affinity_map = { + .f = cmd_config_tx_affinity_map_parsed, + .data = (void *)0, + .help_str = "port config txq affinity ", + .tokens = { + (void *)&cmd_config_tx_affinity_map_port, + (void *)&cmd_config_tx_affinity_map_config, + (void *)&cmd_config_tx_affinity_map_portid, + (void *)&cmd_config_tx_affinity_map_txq, + (void *)&cmd_config_tx_affinity_map_qid, + (void *)&cmd_config_tx_affinity_map_affinity, + (void *)&cmd_config_tx_affinity_map_value, + NULL, + }, +}; + /* ******************************************************************************** */ /* list of instructions */ @@ -12869,6 +12960,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = { (cmdline_parse_inst_t *)&cmd_show_port_cman_capa, (cmdline_parse_inst_t *)&cmd_show_port_cman_config, (cmdline_parse_inst_t *)&cmd_set_port_cman_config, + (cmdline_parse_inst_t *)&cmd_config_tx_affinity_map, NULL, }; diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index 6ecc22db3a..97a9a56bc7 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -68,6 +68,13 @@ New Features * Applications can register a callback at startup via ``rte_lcore_register_usage_cb()`` to provide lcore usage information. +* **Added support for Tx queue mapping with an aggregated port.** + + * Introduced new function ``rte_eth_dev_count_aggr_ports()`` + to get the number of aggregated ports. + * Introduced new function ``rte_eth_dev_map_aggr_tx_affinity()`` + to map a Tx queue with an aggregated port of the DPDK port. + * **Added flow matching of IPv6 routing extension.** Added ``RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 357adb09d7..1d3c372601 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1612,6 +1612,20 @@ 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 affinity mapping +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Map a Tx queue with an aggregated port of the DPDK port (specified with port_id):: + + testpmd> port (port_id) txq (queue_id) affinity (value) + +* ``affinity``: the number of the aggregated port. + When multiple ports are aggregated into a single one, + it allows to choose which port to use for Tx via a queue. + +This command should be run when the port is stopped, otherwise it fails. + + Config VXLAN Encap outer layers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 6a550cfc83..2c9d615fb5 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -1171,6 +1171,38 @@ typedef int (*eth_tx_descriptor_dump_t)(const struct rte_eth_dev *dev, uint16_t queue_id, uint16_t offset, uint16_t num, FILE *file); +/** + * @internal + * Get the number of aggregated ports. + * + * @param dev + * Port (ethdev) handle. + * + * @return + * Negative errno value on error, 0 or positive on success. + * + * @retval >=0 + * The number of aggregated port if success. + */ +typedef int (*eth_count_aggr_ports_t)(struct rte_eth_dev *dev); + +/** + * @internal + * Map a Tx queue with an aggregated port of the DPDK port. + * + * @param dev + * Port (ethdev) handle. + * @param tx_queue_id + * The index of the transmit queue used in rte_eth_tx_burst(). + * @param affinity + * The number of the aggregated port. + * + * @return + * Negative on error, 0 on success. + */ +typedef int (*eth_map_aggr_tx_affinity_t)(struct rte_eth_dev *dev, uint16_t tx_queue_id, + uint8_t affinity); + /** * @internal A structure containing the functions exported by an Ethernet driver. */ @@ -1403,6 +1435,11 @@ struct eth_dev_ops { eth_cman_config_set_t cman_config_set; /** Retrieve congestion management configuration */ eth_cman_config_get_t cman_config_get; + + /** Get the number of aggregated ports */ + eth_count_aggr_ports_t count_aggr_ports; + /** Map a Tx queue with an aggregated port of the DPDK port */ + eth_map_aggr_tx_affinity_t map_aggr_tx_affinity; }; /** diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h index 8932ac33e0..53d1a71ff0 100644 --- a/lib/ethdev/ethdev_trace.h +++ b/lib/ethdev/ethdev_trace.h @@ -1385,6 +1385,23 @@ RTE_TRACE_POINT( rte_trace_point_emit_int(ret); ) +RTE_TRACE_POINT( + rte_eth_trace_count_aggr_ports, + RTE_TRACE_POINT_ARGS(uint16_t port_id, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_int(ret); +) + +RTE_TRACE_POINT( + rte_eth_trace_map_aggr_tx_affinity, + RTE_TRACE_POINT_ARGS(uint16_t port_id, uint16_t tx_queue_id, + uint8_t affinity, int ret), + rte_trace_point_emit_u16(port_id); + rte_trace_point_emit_u16(tx_queue_id); + rte_trace_point_emit_u8(affinity); + rte_trace_point_emit_int(ret); +) + RTE_TRACE_POINT( rte_flow_trace_dynf_metadata_register, RTE_TRACE_POINT_ARGS(int offset, uint64_t flag), diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c index 34d12e2859..61010cae56 100644 --- a/lib/ethdev/ethdev_trace_points.c +++ b/lib/ethdev/ethdev_trace_points.c @@ -475,6 +475,12 @@ RTE_TRACE_POINT_REGISTER(rte_eth_trace_cman_config_set, RTE_TRACE_POINT_REGISTER(rte_eth_trace_cman_config_get, lib.ethdev.cman_config_get) +RTE_TRACE_POINT_REGISTER(rte_eth_trace_count_aggr_ports, + lib.ethdev.count_aggr_ports) + +RTE_TRACE_POINT_REGISTER(rte_eth_trace_map_aggr_tx_affinity, + lib.ethdev.map_aggr_tx_affinity) + RTE_TRACE_POINT_REGISTER(rte_flow_trace_copy, lib.ethdev.flow.copy) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 055c46082b..36f4222fe8 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6946,6 +6946,78 @@ rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t *ptypes return j; } +int rte_eth_dev_count_aggr_ports(uint16_t port_id) +{ + struct rte_eth_dev *dev; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (*dev->dev_ops->count_aggr_ports == NULL) + return 0; + ret = eth_err(port_id, (*dev->dev_ops->count_aggr_ports)(dev)); + + rte_eth_trace_count_aggr_ports(port_id, ret); + + return ret; +} + +int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, + uint8_t affinity) +{ + struct rte_eth_dev *dev; + int aggr_ports; + int ret; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (tx_queue_id >= dev->data->nb_tx_queues) { + RTE_ETHDEV_LOG(ERR, "Invalid Tx queue_id=%u\n", tx_queue_id); + return -EINVAL; + } + + if (*dev->dev_ops->map_aggr_tx_affinity == NULL) + return -ENOTSUP; + + if (dev->data->dev_configured == 0) { + RTE_ETHDEV_LOG(ERR, + "Port %u must be configured before Tx affinity mapping\n", + port_id); + return -EINVAL; + } + + if (dev->data->dev_started) { + RTE_ETHDEV_LOG(ERR, + "Port %u must be stopped to allow configuration\n", + port_id); + return -EBUSY; + } + + aggr_ports = rte_eth_dev_count_aggr_ports(port_id); + if (aggr_ports == 0) { + RTE_ETHDEV_LOG(ERR, + "Port %u number of aggregated ports is 0 which is invalid\n", + port_id); + return -ENOTSUP; + } + + if (affinity > aggr_ports) { + RTE_ETHDEV_LOG(ERR, + "Port %u map invalid affinity %u exceeds the maximum number %u\n", + port_id, affinity, aggr_ports); + return -EINVAL; + } + + ret = eth_err(port_id, (*dev->dev_ops->map_aggr_tx_affinity)(dev, + tx_queue_id, affinity)); + + rte_eth_trace_map_aggr_tx_affinity(port_id, tx_queue_id, affinity, ret); + + return ret; +} + RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); RTE_INIT(ethdev_init_telemetry) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index c129ca1eaf..049641d57c 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -2589,6 +2589,55 @@ int rte_eth_hairpin_bind(uint16_t tx_port, uint16_t rx_port); __rte_experimental int rte_eth_hairpin_unbind(uint16_t tx_port, uint16_t rx_port); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Get the number of aggregated ports of the DPDK port (specified with port_id). + * It is used when multiple ports are aggregated into a single one. + * + * For the regular physical port doesn't have aggregated ports, + * the number of aggregated ports is reported as 0. + * + * @param port_id + * The port identifier of the Ethernet device. + * @return + * - (>=0) the number of aggregated port if success. + */ +__rte_experimental +int rte_eth_dev_count_aggr_ports(uint16_t port_id); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Map a Tx queue with an aggregated port of the DPDK port (specified with port_id). + * When multiple ports are aggregated into a single one, + * it allows to choose which port to use for Tx via a queue. + * + * The application should use rte_eth_dev_map_aggr_tx_affinity() + * after rte_eth_dev_configure(), rte_eth_tx_queue_setup(), and + * before rte_eth_dev_start(). + * + * @param port_id + * The identifier of the port used in rte_eth_tx_burst(). + * @param tx_queue_id + * The index of the transmit queue used in rte_eth_tx_burst(). + * The value must be in the range [0, nb_tx_queue - 1] previously supplied + * to rte_eth_dev_configure(). + * @param affinity + * The number of the aggregated port. + * Value 0 means no affinity and traffic could be routed to any aggregated port. + * The first aggregated port is number 1 and so on. + * The maximum number is given by rte_eth_dev_count_aggr_ports(). + * + * @return + * Zero if successful. Non-zero otherwise. + */ +__rte_experimental +int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, + uint8_t affinity); + /** * Return the NUMA socket to which an Ethernet device is connected * diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 40d43035eb..72c443e996 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -300,6 +300,8 @@ EXPERIMENTAL { rte_mtr_meter_profile_get; # added in 23.03 + rte_eth_dev_count_aggr_ports; + rte_eth_dev_map_aggr_tx_affinity; rte_flow_action_handle_query_update; rte_flow_async_action_handle_query_update; rte_flow_async_create_by_index; From patchwork Fri Feb 17 15:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 124131 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 8DDE041CC1; Fri, 17 Feb 2023 16:48:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A11EF42D3F; Fri, 17 Feb 2023 16:48:39 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2067.outbound.protection.outlook.com [40.107.92.67]) by mails.dpdk.org (Postfix) with ESMTP id 79D0D42D3C for ; Fri, 17 Feb 2023 16:48:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cf21+h1+2IFZi4TjynjPNIiC1KDDW+ldWgFlEWdQHJnrOvlfrQ3DuPvyuDmzE7jZJZnuRuaZXAt0JS+1Gh8Ixt2VTuFn9u5UsDQOITW+UhbRcSVZih5B0R2HnHrjB2aBHpvIEbN04zcWpRYiEt5MMVxpYcTsgKxU2GXi9GynIlyI5s30yn8/Ix7RMeywC+kJmwU/ApILwxBv+7GCp33rm5I6oyj5lGRSJ2lQCjyWUcVuvsUF/ecFr9+Edh6IpFIhVI6nvwPyj66FYh81nt3YzATG825WxpJXlJxQlY9nXKjBOgWTVk909/gDGaIzNkZJezCyX/NJDY7EXc8zvaqFlA== 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=irLsRdl9eeqauYH+WXKvC0bjlfXlt/6igXhoqsSpsQE=; b=hlJ8U7j7H53eKWJzrGv+QcF22Q4UE8eZMvzEOvLpiD0tdQ47T22J1E/e+lcYskIMCNTfFya9YkE3XaiOpQPHDNSqtQCOmhIfxKmXw2ZGndq+MBRixGKcvM0kgw9a6FpIfW9h6s6dFTAXOfn/e8xDIp4k8ALD6/BaRD7UnkrebqM/55vIA0o0Cs2LsHR23EH1ZukZcjnwb1zJOexsP/Ktda6RxCpTp0O162EemDRk5aTzjiZ1Xepq9zqw0i6BBFxnQmB5hTnHpBKoyHHSMPCGSh/H/8B53ttsc98MB/5iRhf+oxPqmIz4bwwI0hSlVbglDfVIU1qrSAoAv0DiN5Xhig== 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=irLsRdl9eeqauYH+WXKvC0bjlfXlt/6igXhoqsSpsQE=; b=KND+hYuWDhXgDkBdvRTjtOnjuzMsf3F4HzPSNsTA5FATFtg5AJrE61qFjzCHlqlHwPxrWN9bYSgv4ypTDEhuC/zps9UlBnFDNWopXszdz9E8ezKuUyrzwcfo4rfr0NcEC1an8yqQGh/u7pzLjfFXgjYHnFrIIDcNKZD/P2XiPZSxw2+xBz/vxSw8Xe2iduZcoZOVt2qjRtH3l2RRW850lWqPgApTqSa+ZwDuh15DkcNH5/81kO/kBpd17Sb8d1u9y+k4JsOuGbgIheWGsIhJKKNdWtvTsp/Kw5j3Tr0kwtZ/1Hc8UIKIq3aS9GOF5dyP3k7LMtkAVeGLdWoys7Pg3w== Received: from DM6PR18CA0021.namprd18.prod.outlook.com (2603:10b6:5:15b::34) by DM6PR12MB4313.namprd12.prod.outlook.com (2603:10b6:5:21e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.17; Fri, 17 Feb 2023 15:48:36 +0000 Received: from DM6NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:5:15b:cafe::b3) by DM6PR18CA0021.outlook.office365.com (2603:10b6:5:15b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.13 via Frontend Transport; Fri, 17 Feb 2023 15:48:36 +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 DM6NAM11FT028.mail.protection.outlook.com (10.13.173.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.17 via Frontend Transport; Fri, 17 Feb 2023 15:48:36 +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; Fri, 17 Feb 2023 07:48:26 -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; Fri, 17 Feb 2023 07:48:23 -0800 From: Jiawei Wang To: , , , , , Aman Singh , Yuying Zhang CC: , Subject: [PATCH v7 2/2] ethdev: add flow matching of aggregated port Date: Fri, 17 Feb 2023 17:47:47 +0200 Message-ID: <20230217154747.12401-3-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230217154747.12401-1-jiaweiw@nvidia.com> References: <20230203050717.46914-1-jiaweiw@nvidia.com> <20230217154747.12401-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: DM6NAM11FT028:EE_|DM6PR12MB4313:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ebf56cd-c27d-4b74-a412-08db10fe6e84 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: 7G5+e1aKQvRIkj+lhIkjgg8JZhYmUi+toysDF26Y8OSmsDr102YcvUBNEmbpQmYholIifnwj+zy2AIW7Pwy5+ehVrTxZnPefa6dC0ZAhyXZF+/eBtH/auNwFRlt/YSypys9MgZDFD7q0x/sgi+am5jRFCGOPd1hhpeJcZNWCN5EOsKts0IQBlWt+h0xwqFD12cDJO3Z4Hmu7gWmJu0AkLKxmJOtnfZpudZFEtzfgG1IhErGBFUmDLM2uo51YsEA+MgoiYvoN2bXoVDOwNTZCHW9AkyVPZq8MC1xNDpMHfMSyGhu1GhIEiLRDlrQQJEeBFxOk+EjvT8v0nlRTctafkz970o+niJcQ1/WEn1AoE0Hwluv4TwiXzhU5pVrX6U8GdK3jYObYxwUw8gm1X2OWOG50rK293eZ1+ECjkaK5vZBLelfk23J7QmlkmSFm0ZNJD3EdTi51TocaPS7UZ8eq5YQpVCNfikBv7sdm7aT4GQAJetIQMyIKgFlXIgoYX/ryV0e/NwJDgfSaJwfpm/5THqMLxhJzknyKXgGGrCHpgAE+7kuV+m1EQJwPoW3wbWo7PMVTChUSsQU/2gHFoP28+RAOKe2Vd5RpwugMXw2fGbrVYaPTNHq8zWwEEVQMftAt0hASnr1zHCKhV3Fx7SO/0SWklL5de8T1i+InFEP76Q5DDyvmzbWntrbKvVX/IOR8uManpj0pBWPrfMkPV1Ab4Q== 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)(396003)(136003)(346002)(39860400002)(376002)(451199018)(36840700001)(46966006)(40470700004)(36860700001)(86362001)(82740400003)(2906002)(7636003)(40460700003)(426003)(47076005)(7696005)(336012)(110136005)(6286002)(26005)(54906003)(478600001)(186003)(55016003)(40480700001)(82310400005)(36756003)(356005)(16526019)(70586007)(70206006)(83380400001)(8676002)(316002)(41300700001)(6666004)(107886003)(2616005)(4326008)(8936002)(1076003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 15:48:36.3731 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ebf56cd-c27d-4b74-a412-08db10fe6e84 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: DM6NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4313 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 When multiple ports are aggregated into a single DPDK port, (example: Linux bonding, DPDK bonding, failsafe, etc.), we want to know which port is used for Rx and Tx. This patch allows to map a Rx queue with an aggregated port by using a flow rule. The new item is called RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY. While uses the aggregated affinity as a matching item in the flow rule, and sets the same affinity value by call rte_eth_dev_map_aggr_tx_affinity(), then the packet can be sent from the same port as the receiving one. The affinity numbering starts from 1, then trying to match on aggr_affinity 0 will result in an error. Add the testpmd command line to match the new item: flow create 0 ingress group 0 pattern aggr_affinity affinity is 1 / end actions queue index 0 / end The above command means that creates a flow on a single DPDK port and matches the packet from the first physical port and redirects these packets into Rx queue 0. Signed-off-by: Jiawei Wang Acked-by: Thomas Monjalon --- app/test-pmd/cmdline_flow.c | 28 +++++++++++++++++ doc/guides/prog_guide/rte_flow.rst | 8 +++++ doc/guides/rel_notes/release_23_03.rst | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 +++ lib/ethdev/rte_flow.c | 1 + lib/ethdev/rte_flow.h | 35 +++++++++++++++++++++ 6 files changed, 77 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index b74dabed8b..f1991a5a9a 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -494,6 +494,8 @@ enum index { ITEM_QUOTA, ITEM_QUOTA_STATE, ITEM_QUOTA_STATE_NAME, + ITEM_AGGR_AFFINITY, + ITEM_AGGR_AFFINITY_VALUE, /* Validate/create actions. */ ACTIONS, @@ -1449,6 +1451,7 @@ static const enum index next_item[] = { ITEM_PPP, ITEM_METER, ITEM_QUOTA, + ITEM_AGGR_AFFINITY, END_SET, ZERO, }; @@ -1944,6 +1947,12 @@ static const enum index item_quota[] = { ZERO, }; +static const enum index item_aggr_affinity[] = { + ITEM_AGGR_AFFINITY_VALUE, + ITEM_NEXT, + ZERO, +}; + static const enum index next_action[] = { ACTION_END, ACTION_VOID, @@ -6920,6 +6929,22 @@ static const struct token token_list[] = { ARGS_ENTRY(struct buffer, port)), .call = parse_mp, }, + [ITEM_AGGR_AFFINITY] = { + .name = "aggr_affinity", + .help = "match on the aggregated port receiving the packets", + .priv = PRIV_ITEM(AGGR_AFFINITY, + sizeof(struct rte_flow_item_aggr_affinity)), + .next = NEXT(item_aggr_affinity), + .call = parse_vc, + }, + [ITEM_AGGR_AFFINITY_VALUE] = { + .name = "affinity", + .help = "aggregated affinity value", + .next = NEXT(item_aggr_affinity, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_aggr_affinity, + affinity)), + }, }; /** Remove and return last entry from argument stack. */ @@ -11821,6 +11846,9 @@ flow_item_default_mask(const struct rte_flow_item *item) case RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT: mask = &ipv6_routing_ext_default_mask; break; + case RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY: + mask = &rte_flow_item_aggr_affinity_mask; + break; default: break; } diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 7f6e0c3350..fff9e7b3e9 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1543,6 +1543,14 @@ Matches flow quota state set by quota action. - ``state``: Flow quota state +Item: ``AGGR_AFFINITY`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Matches on the aggregated port of the received packet. +In case of multiple aggregated ports, the affinity numbering starts from 1. + +- ``affinity``: Aggregated affinity. + Actions ~~~~~~~ diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index 97a9a56bc7..d678d28dc1 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -74,6 +74,7 @@ New Features to get the number of aggregated ports. * Introduced new function ``rte_eth_dev_map_aggr_tx_affinity()`` to map a Tx queue with an aggregated port of the DPDK port. + * Added Rx affinity flow matching of an aggregated port. * **Added flow matching of IPv6 routing extension.** diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 1d3c372601..5a88933635 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3775,6 +3775,10 @@ This section lists supported pattern items and their attributes, if any. - ``color {value}``: meter color value (green/yellow/red). +- ``aggr_affinity``: match aggregated port. + + - ``affinity {value}``: aggregated port (starts from 1). + - ``send_to_kernel``: send packets to kernel. diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index e21e32a4af..69e6e749f7 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -163,6 +163,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(METER_COLOR, sizeof(struct rte_flow_item_meter_color)), MK_FLOW_ITEM(IPV6_ROUTING_EXT, sizeof(struct rte_flow_item_ipv6_routing_ext)), MK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)), + MK_FLOW_ITEM(AGGR_AFFINITY, sizeof(struct rte_flow_item_aggr_affinity)), }; /** Generate flow_action[] entry. */ diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 362d297790..119defa438 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -663,6 +663,15 @@ enum rte_flow_item_type { * @see struct rte_flow_item_quota */ RTE_FLOW_ITEM_TYPE_QUOTA, + + /** + * Matches on the aggregated port of the received packet. + * Used in case multiple ports are aggregated to the a DPDK port. + * First port is number 1. + * + * @see struct rte_flow_item_aggr_affinity. + */ + RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY, }; /** @@ -2225,6 +2234,32 @@ static const struct rte_flow_item_meter_color rte_flow_item_meter_color_mask = { }; #endif +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY + * + * For multiple ports aggregated to a single DPDK port, + * match the aggregated port receiving the packets. + */ +struct rte_flow_item_aggr_affinity { + /** + * An aggregated port receiving the packets. + * Numbering starts from 1. + * Number of aggregated ports is reported by rte_eth_dev_count_aggr_ports(). + */ + uint8_t affinity; +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY. */ +#ifndef __cplusplus +static const struct rte_flow_item_aggr_affinity +rte_flow_item_aggr_affinity_mask = { + .affinity = 0xff, +}; +#endif + /** * Action types. *