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 7E2C741C96; Tue, 14 Feb 2023 16:49:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67C8E42F84; Tue, 14 Feb 2023 16:49:46 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2072.outbound.protection.outlook.com [40.107.100.72]) by mails.dpdk.org (Postfix) with ESMTP id C94F2410D1 for ; Tue, 14 Feb 2023 16:49:44 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NNp0CH30aomP+mkAVi2oiSNLmjj23Aevcp1npAAU9xAxcoY7TNo5baZBDzbQMtM+HDgJw8IVi377+VoacGezkll+nSChJfcaXUzur96t0ubNfJBKaIUEfIhV8VffeUsT3mu9YmCD3RDzj3ncOHEH0IAmIQ8Uu0/vBz64oHvVnzYthLsWt8w25RaLPssUrAtVzKAHc0YLzXboiPk84LCJyVJru+yp2PYc06vUMfEDUIkBzopHTPh50ZTEkGonlx/Ab6xgh3x78wlVelmIPADQsWSUYdLrQG2sYnp2OoTIPpfSdfDv3A0+G6AxxbXKkl4GAf9DzHttAS6/8w/0SDnQyw== 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=A23NYFgJLYqoVc1/i2Y97AqHEg9XV0HTODKi/s0+37A=; b=Z3j8ccA0D7VEL29WOGATWlxmIdpytglhlXtgcQ8UQ9fiLXraB3mKwSa61LdOHcB7uEiFwv72TGmNEgwPK3h07E9YkwVMriresFWYVr1Inek85oLhRBLyoak+87oJM/YEiQh5OOTrANcUOQPG6Eq+WFfcEw6kxmjF9RFgwdH5dA2kbYP99chL2ODY/4OQVubbhTDG9NWcu8AA8wcbXur4D0WU3a3ptaW1bXMYfRcS7+WRw94luVFUx/VM3ZKkTfsuJLHiX1EcOoQ/SswRhVquXa5SoH4SKfbQ7G+i4eHy61/iyOu8Fko9QyiJQ9DHzPk4LwPuDKQBPKS6rZKsAQozUg== 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=A23NYFgJLYqoVc1/i2Y97AqHEg9XV0HTODKi/s0+37A=; b=G0ryhhBvkhO+zh8Aa/SjMLxGzngRafYWyUNpe7sKFXeVJVjFJAgj48NCMni+xcFjIl+E3d4TRLl6XkrWImwdlunYQyaks4WWIswLQ1MRfF9j9Rn5OHx0ANJIqt/8kSh7um9GUCK2hxAO+j0o5SYGRvmvQX7fZxp32gOmNd4BthZMifLrJNlaGxT2gsXLfydOhAJE2vpFzS6QcjHy5ae4MtCDxun5uFXqePvyG6NquGCPxhcRhLGiMamiKs2HC7TCpD7Z5UFGLAIqP+qUjnbBKpRuRaFYMvOIBjklXLjaj7qYW0iKM6MBX0RfalKD69BKx8CXHkum/qWLWQN7sH+kJQ== Received: from CY5PR15CA0057.namprd15.prod.outlook.com (2603:10b6:930:1b::32) by DM4PR12MB7719.namprd12.prod.outlook.com (2603:10b6:8:101::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:49:43 +0000 Received: from CY4PEPF0000C97E.namprd02.prod.outlook.com (2603:10b6:930:1b:cafe::9c) by CY5PR15CA0057.outlook.office365.com (2603:10b6:930:1b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26 via Frontend Transport; Tue, 14 Feb 2023 15:49:42 +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 CY4PEPF0000C97E.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.8 via Frontend Transport; Tue, 14 Feb 2023 15:49:42 +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; Tue, 14 Feb 2023 07:49:07 -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; Tue, 14 Feb 2023 07:49:04 -0800 From: Jiawei Wang To: , , , , Aman Singh , Yuying Zhang , Ferruh Yigit CC: , Subject: [PATCH v5 2/2] ethdev: add Aggregated affinity match item Date: Tue, 14 Feb 2023 17:48:36 +0200 Message-ID: <20230214154836.9681-3-jiaweiw@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230214154836.9681-1-jiaweiw@nvidia.com> References: <20230203050717.46914-1-jiaweiw@nvidia.com> <20230214154836.9681-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: CY4PEPF0000C97E:EE_|DM4PR12MB7719:EE_ X-MS-Office365-Filtering-Correlation-Id: 0bf09d1e-2bc0-4427-54df-08db0ea316eb 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: PXBO35qsz0ueMxh19eE19FKsVLnHVZCoaUqRfRaM8b+neen8z8KVEf56JvWunuN8iFkFQeEitQ0daZ7UKPYeXGQfLvfGwrecn8tz6Ekkcl9dW+WmemXv0Rw5V3nXOJbFLR8upn4vndyxXQ1G06uVswLnSaAzp8Z9J+A06BwaY3CJrIMfpybRWbCCO/ajxOunmzeTV7pQWYb/5dV+M8MI1BljQbA2C7eZSbx2sbLFl+t1bVLSKZF7raxaPYSbu9+Ed7usi/Jdn1dbEZFtlZ2U1GodkXv5gF6GdzrB8z+dOhiSuJZ5m0BHNOb3sBAn/4BYPuP6DuZBxtrrsoBOsIhWrgFy8UB2rD4/X2h57Yq8wQ/P2mYPq1aDcmOKkS0RlCqUCgR6ZqWc03OiZRcCbWv6iiFqbBcYe9oeJnHoCmaYgaewYt+Dx98+s0g8oTniFXMeB5Cue5Cwk1iBdKgFic3ncRbQPuJfUaYWmejlqD5OPak3ZxoZuddEyx50ZDgIAziOJhn3IXK9g+8khsoxJzYcMGOYGU0tAV1ELDJVp8PatLWAHTN0GI3qtxlvbMqTqRLP/Cwj6025nIZAIdK1yyJfC7u2JOQA4GsRybJCenaZKAMomAxq2trS15uX+41QinSUcKt1+cyQzYKRq75TjiaQKpsk2sj9YxqMWt/sBFhCcfnj3Eh5OWfVNiTWPNYH2xfB6rB9T9Rq482Rue6CvA6dsw== 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)(39860400002)(396003)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(86362001)(36756003)(2616005)(40460700003)(70586007)(70206006)(426003)(40480700001)(47076005)(336012)(4326008)(8676002)(55016003)(478600001)(7696005)(54906003)(6286002)(186003)(26005)(316002)(16526019)(107886003)(6666004)(1076003)(110136005)(82740400003)(7636003)(2906002)(356005)(5660300002)(41300700001)(83380400001)(8936002)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:49:42.8942 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0bf09d1e-2bc0-4427-54df-08db0ea316eb 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: CY4PEPF0000C97E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7719 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 --- app/test-pmd/cmdline_flow.c | 28 +++++++++++++++++ doc/guides/prog_guide/rte_flow.rst | 9 ++++++ 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, 78 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 161c5dce53..dcc8b42540 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1536,6 +1536,15 @@ Matches IPv6 routing extension header. - ``type``: IPv6 routing extension header type. - ``segments_left``: How many IPv6 destination addresses carries on. + +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 becf6fed91..7bd8881077 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 rte_flow support for matching IPv6 routing extension header fields.** 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 6a51442b8c..6fc2d37847 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