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 8A6DA41CBE; Fri, 17 Feb 2023 11:51:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD26D42D0B; Fri, 17 Feb 2023 11:51:06 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2070.outbound.protection.outlook.com [40.107.220.70]) by mails.dpdk.org (Postfix) with ESMTP id 5828440EE1 for ; Fri, 17 Feb 2023 11:51:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIGraGxTK5Y4YqEAvChXYD91mzMKaFyCdHNDkZitBvgVegsnkQJJFVgwQz0c0jbiHaS3c9wES3L7qXoYdkIN2jD2GstqSuVRXZqJ+67jzjfOmYgoAOwxDB7WeXhEtKHL68qXbAkquIEtI/Ef6vynqY1HaLsz/TtuZyHNNZqmQy2RJFt+k7IY4hQxGuIrvKYrUleOURAwgCNjqxwHXZqQD3VzdNlx7Ukz/PyFnxvNU8pFxM6ZQWUrdVJa2IhEZ6+fA7GxemoSzdMoPh1qozQIqX+tRzBW1SSotp/8lQBkd99b8EJeLWXu1J0IUj+xsoN6cVxX3H8sdr3WHZROL4VSJg== 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=2JNMvoknap2kK0kdxGnieoy9Zt47h0EkL8tKTnr+JY0=; b=gmbgkmT+a4R1mTb3LRH3FQPkyF2swKaAJ5/pWPmvHIR7M/iba2GsN6o54ENybJ6e+pEAqsbOb++3OM+q8iV6TTTlA2CMthVtX1jY2B6ZKEGtLtPwEfl/gEffoNWU70Udes1/LyiVygp5O1Z7OZH4K/ZxyFcVkKuCOjG79tGQHM4KP6+YTXTEMt6gleOoGpy85dKS8+OBRK6kMTkzTKwF8aEtHJkV4W1+GgpQCZUcTNxnMOX6J9+sMTSM1d0qysdKxQ6FuhoJkSy+Jn8Q4sxRGymqgLqvPeL94q+bcYxQk0W+16jX+j0fKxj38rMQo4aGOvy3WdkHVXky39qkzavlRw== 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=2JNMvoknap2kK0kdxGnieoy9Zt47h0EkL8tKTnr+JY0=; b=dglpJ7IxNu6EPJMRBxWBVgQgq0sOoK/4QGjHRcPDNUPofjSdbxQdv/Uevnc3N4FpV2ZbDl0vmTlWjGOEfS4axgwDfNVQNmM2zgjT01XeXcpmGB4vI3kYjFSjzplJxhugThHA0qCld1YPnT3C1LsGmuqyHzqE6lnys9N7Kai3hB/TzEQuf+OlUN9cjfDEoQSAC8IL4/JOYp3AlcE7tUfxb/5Wbj54ZW9KGLsIhzfBAjFPJ4rJoLuSpSi6zTD3n4vLjg7ozW047y43obOl7xIU1Tr4TjaFShZ4d61d+GPMSrBBgdTl3oA4PGdu4BqtjKpfGXi+JpC77uEsaS9LJtmafA== Received: from MW4PR03CA0079.namprd03.prod.outlook.com (2603:10b6:303:b6::24) by SJ2PR12MB7989.namprd12.prod.outlook.com (2603:10b6:a03:4c3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Fri, 17 Feb 2023 10:51:04 +0000 Received: from CO1NAM11FT095.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b6:cafe::82) by MW4PR03CA0079.outlook.office365.com (2603:10b6:303:b6::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.15 via Frontend Transport; Fri, 17 Feb 2023 10:51:03 +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 CO1NAM11FT095.mail.protection.outlook.com (10.13.174.179) 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 10:51:03 +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 02:50:51 -0800 Received: from nvidia.com (10.126.231.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 02:50:48 -0800 From: Jiawei Wang To: , , , , , Aman Singh , Yuying Zhang CC: , Subject: [PATCH v6 2/2] ethdev: add flow matching of aggregated port Date: Fri, 17 Feb 2023 12:50:26 +0200 Message-ID: <20230217105026.12927-3-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230217105026.12927-1-jiaweiw@nvidia.com> References: <20230203050717.46914-1-jiaweiw@nvidia.com> <20230217105026.12927-1-jiaweiw@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.231.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: CO1NAM11FT095:EE_|SJ2PR12MB7989:EE_ X-MS-Office365-Filtering-Correlation-Id: 23983b58-9cee-4306-1135-08db10d4dd7c 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: z5bFrItF9XRQqeYgsw2M5OuAVqiP0qxZbK6DjcdhVRq15ts3WqqmZtRKVaYys5whHU6b5jD/u2/Luqp/hvga6pCsXF9OD5XQ3LVMYZUS+tUyvsqqPErk3f88Tfyqr0kQ1421rMbMTwxIOjEFFZVSOOa8kl5rZXMSjx/uejW7Tmhl8+kyqvNdKcQLjRkm+oXKW2NU/LwMMojA4AVE5c3lOlW1nhv+64ltBQISzI0VzTSCIaXolkZCsxvcqbHDnOaDCkwNRa7nxSbsl3CX4CukfpfhUqlA0p8xMuUjOiuS9Q7w/h7NE1NIa4vtwn1lXLC0T4dwAaPt6W/VTxHsQhlDxZ54C3xOzXdEiZ635SAi6rTjhiOCW6hrc4TGw0H8tYrVQSaI+gnl+PNBFBIcZaEBQslhYXaoUNwBBG+nZpf+ozyv+ALSF4U/ECPlvx4uzoJuJpeaRi/2eeZDbfLt71XWTV+60Wi7D0zBHlisyM2yFaT1EiesThKonqsaZe3HnynI4o0NRaU7DhahE0F2plpqk1ulodaosh1vCfqi1h2gBHpI/720BPtuaHjtd0NRkN9Z/BwaN7yhWLzriofVKmM0kf2ip+TdPMUpLmxOys+Co3BIYenvVOQsoIbwrV0uvfzirHPpwhL6w1/xmCvXJPMaFjHd1ikVXNOs+OjtjKyOqj+sNut62gaRtnV9rxT88kx7Xh4gz6JiPm2/7wOpAZvYPw== 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)(396003)(346002)(376002)(136003)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(36756003)(41300700001)(8936002)(5660300002)(2906002)(110136005)(4326008)(70586007)(478600001)(8676002)(54906003)(316002)(7696005)(70206006)(6286002)(82310400005)(7636003)(82740400003)(55016003)(356005)(47076005)(336012)(107886003)(426003)(2616005)(1076003)(16526019)(36860700001)(186003)(6666004)(26005)(86362001)(40480700001)(40460700003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2023 10:51:03.6501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 23983b58-9cee-4306-1135-08db10d4dd7c 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: CO1NAM11FT095.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7989 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 63a0b36622..889c49a28a 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -481,6 +481,8 @@ enum index { ITEM_METER, ITEM_METER_COLOR, ITEM_METER_COLOR_NAME, + ITEM_AGGR_AFFINITY, + ITEM_AGGR_AFFINITY_VALUE, /* Validate/create actions. */ ACTIONS, @@ -1403,6 +1405,7 @@ static const enum index next_item[] = { ITEM_L2TPV2, ITEM_PPP, ITEM_METER, + ITEM_AGGR_AFFINITY, END_SET, ZERO, }; @@ -1892,6 +1895,12 @@ static const enum index item_meter[] = { 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, @@ -6694,6 +6703,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. */ @@ -11424,6 +11449,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 8ad01ef05c..d825c788d0 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1536,6 +1536,14 @@ Matches Color Marker set by a Meter. - ``color``: Metering color marker. +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 30a7eaca2b..5f37a41f78 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 b29c66e2f4..749effb19b 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -162,6 +162,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(PPP, sizeof(struct rte_flow_item_ppp)), 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(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 fb984a1097..abaf49f781 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -656,6 +656,15 @@ enum rte_flow_item_type { * @see struct rte_flow_item_icmp6_echo. */ RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY, + + /** + * 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, }; /** @@ -2187,6 +2196,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. * -- 2.18.1