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. *