From patchwork Mon Dec 25 10:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 135554 X-Patchwork-Delegate: rasland@nvidia.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 5C3DA43787; Mon, 25 Dec 2023 11:45:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E08CD402C7; Mon, 25 Dec 2023 11:45:54 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2082.outbound.protection.outlook.com [40.107.101.82]) by mails.dpdk.org (Postfix) with ESMTP id 89A8A402C6 for ; Mon, 25 Dec 2023 11:45:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=au9APppzy/W+26uYzkz2/CsdsdGwGXm+PaAqWOpm10aXggyNMNg/JLHzvyeDHmUdCFd5F6++PEY5kU1/g2RNlr3MVgIgClG+mdFoktlEx25XtkcwfmjN2bhmnOw05nyhE29ezT+GvbfLxm+FvIUw7aG5u+xP7De9S6RHs4VtTGtw+JewUpLV6sk+ql2wz/IdQXLG7L92xZtyt8apELONI2AKrHIDI3DMD3jh9LBeB52JQ4TlZ1CdwNQAR4hV0c+Cz2O06xrk3NFlpKZw6IKU4AQDMA2PWN3m5j7o5M4JFOzvRDE7g68JwovJ3LY0ivGm51Ua3GzuSlf4TEIw3KAmwQ== 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=MqwByF1vjrFnMiscQzTOP992OtSb4BWggGZXj7AMTmE=; b=Zd+5LEWzzsk5UTRVb/JyegKBTzrAUcvYzUp8n6mHmM5JRvxvShP29Rj8lo3jtg6fco7TAJaVf8khHHhwKXKJBygHYqHtnhi6Smn7w4YuwhFL8qB6Mpaas6UE0qMKM1a1e81yOWs37JhnA6RDMqO3a3mQQ5g3GlkJuifKnt3Yg9W8VjVIXq8ZomMm++uPDexHzHouNd7m+NiunS+EJ6nCjz3NWCzl+BjCOp79N0wK/gH/2tCObdCON7joJ6jVc+1dhSzGrVPZB7p2aEaw5NERx+wro9VVXo7tAqQ5ZqMGLahHZubMdcyzFIdEut0PeEROkh/qlO7A/pDsa4n1bvCLwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=MqwByF1vjrFnMiscQzTOP992OtSb4BWggGZXj7AMTmE=; b=KXdI+Qu1KXQP8zfaVxUmtw64c4tCotrDKw/ab1nnjaTTZdRjoh0jN61u/IBJtaa7PTELYW2FxUn/dCf2RqhYH1daA8Qi7oThhPKQIsfT1hK7xjFq5TzQfvx2ZUDlRBfZcWrgpI69vOdAxAxk+aoimynhZTlz5S4KWaSQm8ktjqdv7dk9QLJ3kU8Wc9QIvxLypiy6I1+hYSWFkCGZn5Xacham4fWgHy8Qiqnb1I27sZVFTx/c0VnHmBuVAjvATppsNzowCiPLi6+lAv9xFcI3ccNsd/4XBaF/2glOsuGFRkpGfhYPU7QhCMjHpFs1epFDJSUaL86uNKpBn3HW3vBepw== Received: from PH0PR07CA0004.namprd07.prod.outlook.com (2603:10b6:510:5::9) by MN2PR12MB4238.namprd12.prod.outlook.com (2603:10b6:208:199::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.26; Mon, 25 Dec 2023 10:45:49 +0000 Received: from SN1PEPF0002BA52.namprd03.prod.outlook.com (2603:10b6:510:5:cafe::e2) by PH0PR07CA0004.outlook.office365.com (2603:10b6:510:5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.27 via Frontend Transport; Mon, 25 Dec 2023 10:45:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by SN1PEPF0002BA52.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.14 via Frontend Transport; Mon, 25 Dec 2023 10:45:48 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 25 Dec 2023 02:45:48 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 25 Dec 2023 02:45:47 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Mon, 25 Dec 2023 02:45:46 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 2/2] net/mlx5: add support to compare random value Date: Mon, 25 Dec 2023 12:45:34 +0200 Message-ID: <20231225104534.2420737-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231225104534.2420737-1-michaelba@nvidia.com> References: <20231225104534.2420737-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA52:EE_|MN2PR12MB4238:EE_ X-MS-Office365-Filtering-Correlation-Id: 14baf33c-a283-4b07-a657-08dc0536a842 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rsKVMV0ZxzVeVJXnuzVaD13m9IaDvRX9/5CssTrkGAbe9FuI2tufl+1loJFVJ4tvUFiPCMOIBgbykTaIhSaxQWD95ksYVIgZ0eYUUKYP3N3VlCG/Ch+t3UDhrwth13Urvmo2C1tHPx2ADZGNWJLM4MjKinjTcgtAHbHZuY8fsTaYDOC+wLjxTL34vBOW8zueXKuKW0R4bvmGJytbXNvi7a8AYvpczdpa0AxnnMRfH+mdyuZNoTJWdW3KmEddrGQiNBaJQy9uZ9RgSLIQG6QXKGukSh1sxknMETYREn3w0r03lwVqIggJgAEq/zx8TSjLl59h45zvOLYuX4cEUn2Z64wb4TzocjxhExJJecBOWklpynteUEsTVajmX//pW41MFFkIWFtQ+roKdGI6tPM7GaUW7bhIsvykn30NwfK3dz+/jUxyLdDph6xNGSWUpfa7CjweKLv8eM1PpvZdY9erF6N7F7w52kYAJofKHcvFPKOMHCUOTEg9+zbtskbwQDxB9sEq0Fl7xZrJLoTJOdGzIcsxS10H5lzoGbeOzAN7/sDW4owGxXLx90MEnchoROywgMAOq8rfRfw7Q0VGEGKCkgPG7yNanPIJE5UgQiDnY5laRKPzQfc+ls4+iv2eiTII8q69byxIu1SruA4tPFovlX4Be6pm9CiiUIIIRyuRjCaZq6rEAieum5sYGh0dgG9qdHqZ2C4ModAGoj2ZP9rfZ3dkXLdLE8emscqa2Ybc4I/qjwkhmLR/36NodUK3cSuc X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(136003)(346002)(376002)(39860400002)(230922051799003)(1800799012)(186009)(82310400011)(64100799003)(451199024)(46966006)(36840700001)(40470700004)(478600001)(7636003)(8936002)(8676002)(4326008)(6666004)(55016003)(47076005)(82740400003)(2616005)(107886003)(1076003)(7696005)(26005)(6286002)(86362001)(40480700001)(54906003)(6916009)(316002)(70586007)(70206006)(83380400001)(426003)(336012)(5660300002)(2906002)(41300700001)(36756003)(356005)(36860700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2023 10:45:48.7831 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14baf33c-a283-4b07-a657-08dc0536a842 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA52.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4238 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 Add support to use "RTE_FLOW_ITEM_TYPE_COMPARE" with "RTE_FLOW_FIELD_RAMDOM" as an argument. The random field is supported only when base is an immediate value, random field cannot be compared with enother field. Signed-off-by: Michael Baum --- drivers/net/mlx5/mlx5_flow_hw.c | 70 ++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 18 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index a944a9b5b0..d472f83909 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -6643,18 +6643,55 @@ 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) +static int +flow_hw_item_compare_field_validate(enum rte_flow_field_id arg_field, + enum rte_flow_field_id base_field, + struct rte_flow_error *error) { - switch (field) { + switch (arg_field) { + case RTE_FLOW_FIELD_TAG: + case RTE_FLOW_FIELD_META: + break; + case RTE_FLOW_FIELD_RANDOM: + if (base_field == RTE_FLOW_FIELD_VALUE) + return 0; + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare random is supported only with immediate value"); + default: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item argument field is not supported"); + } + switch (base_field) { case RTE_FLOW_FIELD_TAG: case RTE_FLOW_FIELD_META: case RTE_FLOW_FIELD_VALUE: - return true; + break; + default: + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item base field is not supported"); + } + return 0; +} + +static inline uint32_t +flow_hw_item_compare_width_supported(enum rte_flow_field_id field) +{ + switch (field) { + case RTE_FLOW_FIELD_TAG: + case RTE_FLOW_FIELD_META: + return 32; + case RTE_FLOW_FIELD_RANDOM: + return 16; default: break; } - return false; + return 0; } static int @@ -6663,6 +6700,7 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, { const struct rte_flow_item_compare *comp_m = item->mask; const struct rte_flow_item_compare *comp_v = item->spec; + int ret; if (unlikely(!comp_m)) return rte_flow_error_set(error, EINVAL, @@ -6674,19 +6712,13 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, 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"); + ret = flow_hw_item_compare_field_validate(comp_m->a.field, + comp_m->b.field, error); + if (ret < 0) + return ret; if (comp_v) { + uint32_t width; + if (comp_v->operation != comp_m->operation || comp_v->a.field != comp_m->a.field || comp_v->b.field != comp_m->b.field) @@ -6694,7 +6726,9 @@ flow_hw_validate_item_compare(const struct rte_flow_item *item, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "compare item spec/mask not matching"); - if ((comp_v->width & comp_m->width) != 32) + width = flow_hw_item_compare_width_supported(comp_v->a.field); + MLX5_ASSERT(width > 0); + if ((comp_v->width & comp_m->width) != width) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,