From patchwork Tue Feb 6 02:06:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 136415 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 1081D43A94; Tue, 6 Feb 2024 03:07:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9B05410E7; Tue, 6 Feb 2024 03:07:15 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2075.outbound.protection.outlook.com [40.107.95.75]) by mails.dpdk.org (Postfix) with ESMTP id 6255D410E3 for ; Tue, 6 Feb 2024 03:07:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BYbOf5v7xb9XR56ucZTllQhTJjyNxNtRSTr/7+MATst7N03bY0bZnePTI+G/a4yiEvr7m5Kc5OsSjJ3Dk0kqijFgWPEXMbiB9NYlM8V1eqFJ558rGfOCk2daSNwqWVlzc9vXyjr+e8LZMkJc6FvNHpOD2hPXH1uRzHb0d4IM2sZDJ5bFnKDGhx8U3A025wsci4r7qEuHEGyMZw5upsb7H7KmW5v0x3udXWv/Gu/lgXMGergRXsM0irUm10T8yXa0k957vgKtRilR/QoDOo1bPnxKH7lvkNJt0pN1/NFFIvHc9EiCIe5isBld9z2Q/HvZOlACT70bD4PRdRY11y2tEA== 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=OdLPwlX3F56dwv69N+yzKNjklBBfQZEqnRTE2/cBAxE=; b=b+N/M9UlsbZMCYyllw/z+qDmUmHoHUoyREQDo+lqoVDlFTeHuwKBTMktTfh5KHn2O7NQDFAfeLOBPK1ElMFxJ8loc5i6xrOgSuxE7msp1GMdL6DADBXxon0Wg4+7BIewqmkL10nQMI1fRhXmnGZBiASJzeoCpFLE8cjHY/0kNgAVnU8KKYBA7u7NiDlrdQfUkkQI8688SAQOVjvz4ZA1MVxLdyHQtE6CHODga+vYrgaxEXnIL+AeDob+Mte2jdFD89Yw3+X9NDRYCAS1asdH0y8KxHTU0UUE+rPxUNeFQUdsP3XBcwKv/1hk25JoqeB3whuY9DJ3HLsvA810NMc0Ww== 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 (0) 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=OdLPwlX3F56dwv69N+yzKNjklBBfQZEqnRTE2/cBAxE=; b=bEIbvZrmsGnPgNVOtl2q2BW9B7mCabRlidweDP1k6hYEid+rAVuOsX1QaMCzNdrHj1mi467Fud8nh1amCKcNdRcITb0Aha/D1b8l/lpwXFyrsqsjdPclHfY/9c//MH6T+rZ/+A14i3R8t4kq8vm5pL37vNqOlRRF8LyOy/K8EzgNrBdAzkr/MjFiiSedAXKYaFCOQqh6SGCRgp1Zeebk1EUbYhECcZwGP0nHhI8kKx7fwGinZao1oyu15qp0vV7fP3T62mju3fGSclDXS9ZrOWf3/5icuGB8vsaZH2QyrLb3AFGhatFQmIV0r+C1mDIuLMbZuPaimTxTApPO0WlmLA== Received: from BYAPR08CA0025.namprd08.prod.outlook.com (2603:10b6:a03:100::38) by CH3PR12MB8535.namprd12.prod.outlook.com (2603:10b6:610:160::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.15; Tue, 6 Feb 2024 02:07:11 +0000 Received: from SJ1PEPF00001CE9.namprd03.prod.outlook.com (2603:10b6:a03:100:cafe::74) by BYAPR08CA0025.outlook.office365.com (2603:10b6:a03:100::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34 via Frontend Transport; Tue, 6 Feb 2024 02:07:11 +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 SJ1PEPF00001CE9.mail.protection.outlook.com (10.167.242.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Tue, 6 Feb 2024 02:07:11 +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.41; Mon, 5 Feb 2024 18:06:57 -0800 Received: from nvidia.com (10.126.230.35) 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.1258.12; Mon, 5 Feb 2024 18:06:54 -0800 From: Suanming Mou To: , , Dariusz Sosnowski , Viacheslav Ovsiienko , "Ori Kam" , Matan Azrad CC: Subject: [PATCH v7 4/4] net/mlx5: add compare item support Date: Tue, 6 Feb 2024 10:06:25 +0800 Message-ID: <20240206020626.545946-5-suanmingm@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240206020626.545946-1-suanmingm@nvidia.com> References: <20231214031227.363911-1-suanmingm@nvidia.com> <20240206020626.545946-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE9:EE_|CH3PR12MB8535:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f95c156-6315-4f3e-975e-08dc26b85490 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: DlmmBVqaUOOh+kYrMjdLKakN4I8LNtiXpGrHnAV4kRI3AuRfF1o+NEfU5lJqvKNSiyuV+gdBXkx7KnQGQ26GmpMxeKsdzQf/CoYKZycU2jjm5jt/cvihlSMZ+zA17L0PQ7d1qmVE8B/FeZx9Oq9HOX3sJBdJCF9/fQIjRnYRxZk+8YGN2c8VuZUuGpluMYzL6qI97xxqxYPQdC8/Sr6+N9ZpKgQbD0zEpI2vTuGrpmC1TwuR262lvpj/MJpS3T70rVO4Yr8asL7meDlEpNAdl3JaZ55WI4ZySKpFPJpZsRIFZZFhoEAYblWkVrug1s2UQaXC4Xs1Lux+q+DdiYcHBCfmYN2Sf3fODwnfc/PXClgRphyzPIqShoBvuHW+JbZwI0ovzI6tPgfC7upKPEHHjPcO66bjZk+SdX66FGxKsCSzw0uKOSkrdfWlgmXHhDTnNCyngM3BdklLiDAQlKp83WJzU97uV8AZMGRZeUR32qzsm3AMtEc8ctQWb+LP900PocbbY8+I37V7avmHnx543g1vB7yMcmSblIepevb6c6upLMXOBNKg1t3KmNDXwqnvUjmk/qfwJb9lYzA0R5Tt0FPShxS61RSJRL0M+L8nn7anQc+JqH76o3zmkuUXAqlC9twsLwzdkfwIz/TjKUk8/10c/2DK7CzSiZ2E4wxN5Ed/bZp5hk2i68nJPY/SwGAoW/CMijDPK9mJzYhFiDvQQ7Xfn6M1Gw3SFOFT6brz0cj1MD6Sy42rzoFYKdGUBxh8 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:(13230031)(4636009)(39860400002)(136003)(396003)(376002)(346002)(230922051799003)(64100799003)(1800799012)(82310400011)(451199024)(186009)(36840700001)(46966006)(40470700004)(83380400001)(26005)(16526019)(426003)(47076005)(336012)(86362001)(40480700001)(478600001)(7696005)(55016003)(7636003)(40460700003)(2616005)(6286002)(1076003)(70586007)(4326008)(6636002)(6666004)(8676002)(8936002)(110136005)(316002)(70206006)(356005)(36860700001)(82740400003)(36756003)(41300700001)(5660300002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 02:07:11.2649 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f95c156-6315-4f3e-975e-08dc26b85490 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: SJ1PEPF00001CE9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8535 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 The compare item allows adding flow match with comparison result. This commit adds compare item support to the PMD code. Due to HW limitation: - Only HWS supported. - Only 32-bit comparison is supported. - Only single compare flow is supported in the flow table. - Only match with compare result between packet fields is supported. Signed-off-by: Suanming Mou Acked-by: Ori Kam --- doc/guides/nics/features/mlx5.ini | 1 + doc/guides/nics/mlx5.rst | 7 +++ doc/guides/rel_notes/release_24_03.rst | 2 + drivers/net/mlx5/mlx5_flow.h | 3 ++ drivers/net/mlx5/mlx5_flow_hw.c | 73 ++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) diff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini index 0739fe9d63..00e9348fc6 100644 --- a/doc/guides/nics/features/mlx5.ini +++ b/doc/guides/nics/features/mlx5.ini @@ -56,6 +56,7 @@ Usage doc = Y [rte_flow items] aggr_affinity = Y +compare = Y conntrack = Y ecpri = Y esp = Y diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 6b52fb93c5..18b40bc22d 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -778,6 +778,13 @@ Limitations The flow engine of a process cannot move from active to standby mode if preceding active application rules are still present and vice versa. +- Match with compare result item (``RTE_FLOW_ITEM_TYPE_COMPARE``): + + - Only supported in HW steering(``dv_flow_en`` = 2) mode. + - Only single flow is supported to the flow table. + - Only 32-bit comparison is supported. + - Only match with compare result between packet fields is supported. + Statistics ---------- diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 59eda27606..01d2d6d043 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -80,6 +80,8 @@ New Features * Added support for Atomic Rules' TK242 packet-capture family of devices with PCI IDs: ``0x1024, 0x1025, 0x1026``. + * Added support for comparing result between packet fields or value. + Removed Items ------------- diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index ecfb04ead2..f0a11949e6 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -277,6 +277,9 @@ enum mlx5_feature_name { /* NSH ITEM */ #define MLX5_FLOW_ITEM_NSH (1ull << 53) +/* COMPARE ITEM */ +#define MLX5_FLOW_ITEM_COMPARE (1ull << 54) + /* Outer Masks. */ #define MLX5_FLOW_LAYER_OUTER_L3 \ (MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index da873ae2e2..f21c22131c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -426,6 +426,9 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) case RTE_FLOW_ITEM_TYPE_GTP: last_item = MLX5_FLOW_LAYER_GTP; break; + case RTE_FLOW_ITEM_TYPE_COMPARE: + last_item = MLX5_FLOW_ITEM_COMPARE; + break; default: break; } @@ -4386,6 +4389,8 @@ flow_hw_table_create(struct rte_eth_dev *dev, rte_errno = EINVAL; goto it_error; } + if (item_templates[i]->item_flags & MLX5_FLOW_ITEM_COMPARE) + matcher_attr.mode = MLX5DR_MATCHER_RESOURCE_MODE_HTABLE; ret = __atomic_fetch_add(&item_templates[i]->refcnt, 1, __ATOMIC_RELAXED) + 1; if (ret <= 1) { @@ -6634,6 +6639,66 @@ flow_hw_prepend_item(const struct rte_flow_item *items, return copied_items; } +static inline bool +flow_hw_item_compare_field_supported(enum rte_flow_field_id field) +{ + switch (field) { + case RTE_FLOW_FIELD_TAG: + case RTE_FLOW_FIELD_META: + case RTE_FLOW_FIELD_VALUE: + return true; + default: + break; + } + return false; +} + +static int +flow_hw_validate_item_compare(const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + const struct rte_flow_item_compare *comp_m = item->mask; + const struct rte_flow_item_compare *comp_v = item->spec; + + if (unlikely(!comp_m)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item mask is missing"); + if (comp_m->width != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item only support full mask"); + if (!flow_hw_item_compare_field_supported(comp_m->a.field) || + !flow_hw_item_compare_field_supported(comp_m->b.field)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item field not support"); + if (comp_m->a.field == RTE_FLOW_FIELD_VALUE && + comp_m->b.field == RTE_FLOW_FIELD_VALUE) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare between value is not valid"); + if (comp_v) { + if (comp_v->operation != comp_m->operation || + comp_v->a.field != comp_m->a.field || + comp_v->b.field != comp_m->b.field) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item spec/mask not matching"); + if ((comp_v->width & comp_m->width) != 32) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item only support full mask"); + } + return 0; +} + static int flow_hw_pattern_validate(struct rte_eth_dev *dev, const struct rte_flow_pattern_template_attr *attr, @@ -6644,6 +6709,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, int i, tag_idx; bool items_end = false; uint32_t tag_bitmap = 0; + int ret; if (!attr->ingress && !attr->egress && !attr->transfer) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ATTR, NULL, @@ -6781,6 +6847,13 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, " attribute"); break; } + case RTE_FLOW_ITEM_TYPE_COMPARE: + { + ret = flow_hw_validate_item_compare(&items[i], error); + if (ret) + return ret; + break; + } case RTE_FLOW_ITEM_TYPE_VOID: case RTE_FLOW_ITEM_TYPE_ETH: case RTE_FLOW_ITEM_TYPE_VLAN: