From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1C8AA4373B;
Tue, 19 Dec 2023 02:34:40 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id B404D42DC9;
Tue, 19 Dec 2023 02:34:34 +0100 (CET)
Received: from NAM10-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam10on2074.outbound.protection.outlook.com [40.107.93.74])
by mails.dpdk.org (Postfix) with ESMTP id 0997642DC1
for <dev@dpdk.org>; Tue, 19 Dec 2023 02:34:33 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=jZnIj9hztXaI8smXvvew9CIxctZ+9Vfri5BcijRgVV+NaNZxqwguNQpeHJ85rgKOzyL4Gwiv4rKAntvMIPVH1HM4AlsM1d9OxDodAVCNaBMKBknAWaz+u81d3tTobzk+9QcenLsfr9Rermmn4vTI3exhV7Cm6qQqNYMIY+AhYT3aX8HMJARTzPDw4heVsg6e1xX6x1Hu0daNC04WHUj/rq7m2wqzk1jkLFfYublPkNNUmjgnjbf1sLMfmQCHt+29xB+mLSu72zktXM1x0YuZxzqTRjc2etAqlg+AMr384hLNbsFlBGi940igwyp2q9Ao8C0G0rImJM5683Yxe2ZpYg==
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=a8QhVzxOrMYq0inl8sA52OA8i3IFo0TCYb6ztuZC+8I=;
b=OC8l8vhh04vbDKQ69iiEcMzyY5dCgJIQzXoMj8vkEqU1+gIKdiHeQZTZYaWHfoSjVgAYFQKMF6eKtjBJBFR1o5tvb0UOVS70Du5mdJJgCrCSGes3R+nfbtsJ1XZZ4zMKrBveeWEdL0ALEi6RNYGH5+4NXptXH2UCycDLp4fFjUDFPLvCSmgo54wjck3lGKSp/ly0CsejOqcPDgfXX/VHRRsuP9bN90rCiBc8r70ik5MCkl6xBGwnkZD2lyO902PMgpuZgat395vR7LS+BB2W7LEXKx+ODM6KklTRGG/j+lDxk92YAWE+oD7qMU2ISFDpWwzMnjIWtT/3w4KdNyEtnw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.117.160) smtp.rcpttodomain=dpdk.org 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=a8QhVzxOrMYq0inl8sA52OA8i3IFo0TCYb6ztuZC+8I=;
b=c4RfMbFGfKRKZlua5O8hml0LqTKD8YQrlUWgzsb7UgZCdkh//V+5AhZTbFnHKCjpSySb+jNUFMUnJPRT1ROuyD/nGT4VhrdzA5vVr09IkUK4kqbckfVmbSp5xTU58Afdv1D0CFr8cieI/lDj/4fGYEH0lyu9odQZpe7I+8EnJs/UYR+c6krO2Afn54k7qfNsTQ27BKsd2sVXfX/6hGz7BYLNSsITlCx21O4gngwpSkW10x0E8L9N24enjJQKIPetXvuO2Plj4nE+xGFaqMKdIkVtjfQF3PdzYqSweUFkfPnIzYlUQFsD80r7OltYaSKZm0NOi4lLJz0lRu5j/2Uxtg==
Received: from CH0PR03CA0334.namprd03.prod.outlook.com (2603:10b6:610:11a::25)
by SJ1PR12MB6243.namprd12.prod.outlook.com (2603:10b6:a03:456::13)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.37; Tue, 19 Dec
2023 01:34:30 +0000
Received: from DS3PEPF000099DF.namprd04.prod.outlook.com
(2603:10b6:610:11a:cafe::49) by CH0PR03CA0334.outlook.office365.com
(2603:10b6:610:11a::25) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.38 via Frontend
Transport; Tue, 19 Dec 2023 01:34:29 +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
DS3PEPF000099DF.mail.protection.outlook.com (10.167.17.202) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7113.14 via Frontend Transport; Tue, 19 Dec 2023 01:34:29 +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, 18 Dec
2023 17:34:18 -0800
Received: from nvidia.com (10.126.231.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.986.41; Mon, 18 Dec
2023 17:34:15 -0800
From: Suanming Mou <suanmingm@nvidia.com>
To: Dariusz Sosnowski <dsosnowski@nvidia.com>, Viacheslav Ovsiienko
<viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>, Matan Azrad
<matan@nvidia.com>
CC: <dev@dpdk.org>
Subject: [PATCH v2 3/3] net/mlx5: add compare item support
Date: Tue, 19 Dec 2023 09:33:37 +0800
Message-ID: <20231219013337.531548-4-suanmingm@nvidia.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20231219013337.531548-1-suanmingm@nvidia.com>
References: <20231214031227.363911-1-suanmingm@nvidia.com>
<20231219013337.531548-1-suanmingm@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [10.126.231.35]
X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To
rnnvmail201.nvidia.com (10.129.68.8)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DS3PEPF000099DF:EE_|SJ1PR12MB6243:EE_
X-MS-Office365-Filtering-Correlation-Id: d00fdd12-b831-4403-cab2-08dc0032a51b
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: kklkZy2S1IwBR5/IYwy7O5BLqTlCKPF8bFXNh2gdtRnbdnF2b/xF0RwUXD/Ww7fE/6R1thu0VtI+OMQBE6Ck63CL3LHIVSry0rZtYXRZQMREzmAbVGuWg6E92jqIlbReyQsMDz7p84m8SHxyontD34HxiifxiKApQ/IahmJqM4rSMa/cK175owMT1kPb1lAVSo8DRmNzrFw7IWkVM2LBswlfL7g2/uThRgJjpcUKUO5Y7PCGQ3AgwS00FW/lBdC4cQSYq/tofG4KNrx7lllMC4DKLsmz7MOgwcqdhhjCS3JBAhohD5gxL89mbUfqDhduF/GgO54eX4lhYNJIIVe1d9kP21cCQA2YpM34DNpjIpgrW/HeaMJq1baZKYRZplIsYby0bYRec63Ze4tXv1WZlQm9k08SEhiUBopHJ/SO4XoUwz3fnkijbHJ+R1HgC1Gg3RCvZ8k/yYXCy1UO0HSLx/lFseCwu5EzWEzi/qzFAZ3wBUT5HLWDN4I7017wRBwPd9SVcWDgdxcgJ6aXrtJA2dy2qEjIliBrRTaZq4FLJl0dWeK37PWFyxvcPgFBH+GJqXDlOn1y2kbRrY/HavGl4eGIgynohhtWzkTCmcDthpvF/VRUE13P4Ki76BnD+Yg1SjSXBU9SHxmJk4iqSjPA3vFWFwi5QvGbkggJiqjUPRyJJYb/epPlC2B2EScFlVJAtE79x4cNqgmZlNpucLU0kx+RNyJVIqjM3Co7/gRGNNmKy0N9ugS5LtgL4AW3MkWA
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)(396003)(136003)(376002)(39860400002)(346002)(230922051799003)(82310400011)(186009)(64100799003)(451199024)(1800799012)(40470700004)(36840700001)(46966006)(55016003)(40480700001)(40460700003)(70586007)(70206006)(6636002)(82740400003)(7636003)(356005)(36756003)(86362001)(1076003)(36860700001)(336012)(426003)(83380400001)(26005)(6286002)(16526019)(2616005)(7696005)(6666004)(8936002)(110136005)(316002)(478600001)(8676002)(47076005)(4326008)(2906002)(5660300002)(41300700001);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2023 01:34:29.6788 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: d00fdd12-b831-4403-cab2-08dc0032a51b
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: DS3PEPF000099DF.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6243
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <suanmingm@nvidia.com>
---
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, 85 insertions(+), 1 deletion(-)
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 71ebd67dbd..5693ea4628 100644
--- a/doc/guides/rel_notes/release_24_03.rst
+++ b/doc/guides/rel_notes/release_24_03.rst
@@ -63,7 +63,7 @@ New Features
* **Updated NVIDIA mlx5 driver.**
* Added support for accumulating from src field to dst field.
-
+ * 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 8e2034473c..6698de2a3e 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 c4a90a3690..82d7fa006f 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;
}
@@ -4390,6 +4393,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) {
@@ -6670,6 +6675,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,
@@ -6680,6 +6745,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,
@@ -6817,6 +6883,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:
--
2.34.1