From patchwork Mon Jan 29 13:44:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136199 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 AD2CB439FE; Mon, 29 Jan 2024 14:44:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AE45410D3; Mon, 29 Jan 2024 14:44:49 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by mails.dpdk.org (Postfix) with ESMTP id EFCF940EDC for ; Mon, 29 Jan 2024 14:44:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hsuKZfXsiNR6IFh5iXNzA4o+atLmSRCgufYciU/p7vdPfgxiX1pHYJRB6v2r/tnpNQT/k38TPqVGeLWh5s8WnEyFR1NwwlDlv60RL7KbE4+p8E+AAokeBo2ATL9igb90u+rfx7rZaaNx8dHNrjA0vSzcmkCCaXcqtHkSkaSWXnzR2bsVIG7ahkPhvT3oC2CmWmykH3/YwgYaAwY2P1gpDrF11NIb+vhYzetHV7vHo02LdC2aEecatm4JGfJw02QWo6EOl6sgs9hgqF3EgyHSWaqIuC9Hd+OSOWNshSocJA7OQ3QqSAoPPU8qY5+tVk1sEEXxq6YMGHp8E2e5RwfhMQ== 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=R147IJIdQtk2X50/LTbphrBTzYLcqFsbOlUoJKtqHeY=; b=feoDRCG+5ZeMEww6DTNLwQ4nheUxWG0rfQSrpHL6lFD19N0TY8fFdHMW76zfRQqnv38D0P8NK7W4C9dngCwio1WhmULaVO96ZwVNMjt+AKDNfSjmrWwFnyGOidhbIjyTjFwrhU8cxQDLmNoX4fxJw//akw2VNMIIne/gAn5aHjM00HvkQkSsNidPsNtaiOD7z8I7pfmCnIk4/DVJvX77HwsZmF5RoHveQV3hFaup1by/hxLfPGc3jogZA+Uf8ertVChI1T1dcu8BGH0VvUxzYZvAbdf/O6X0+GtEikXbr46/0cMeyqKrpL47e1vEWGCPcLOLGa/ir1V+HiVECcRd3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=R147IJIdQtk2X50/LTbphrBTzYLcqFsbOlUoJKtqHeY=; b=iUY+KGNqTCti3YwlVfKOuc6XDX4ZcG/8GISDTCVpbuPuXPHKnazOSXiBMTFuw/+02mnDzSDXKE38V8vou/q2seuKKE/M33buWo1nfUPfcG4HzETxB3Mt9GGSQoAAAR0igtaE6g/beNDm6TXl7xblTgSbztvp/y6wErUzVQDKepBm2ih5CpJWYDja690T9+CuJjHodZomtEnzO7CiQDYKen6cYFcAyJXJW0n2fXecy6E0ZTmGathSC+cdtNGkGD6IguJuChpGPfdi9D/bJ9igWnWKtTTfsOSx02GtmYJgzimzrVOUgUMEVi4Cx0oesEXiBXEG37E0BD6vQRa91spl8w== Received: from DS7PR03CA0328.namprd03.prod.outlook.com (2603:10b6:8:2b::30) by MN2PR12MB4256.namprd12.prod.outlook.com (2603:10b6:208:1d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Mon, 29 Jan 2024 13:44:44 +0000 Received: from CY4PEPF0000FCBF.namprd03.prod.outlook.com (2603:10b6:8:2b:cafe::28) by DS7PR03CA0328.outlook.office365.com (2603:10b6:8:2b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34 via Frontend Transport; Mon, 29 Jan 2024 13:44:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CY4PEPF0000FCBF.mail.protection.outlook.com (10.167.242.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.14 via Frontend Transport; Mon, 29 Jan 2024 13:44:44 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 29 Jan 2024 05:44:30 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 29 Jan 2024 05:44:30 -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, 29 Jan 2024 05:44:28 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 2/2] net/mlx5: add support to compare random value Date: Mon, 29 Jan 2024 15:44:10 +0200 Message-ID: <20240129134410.885145-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240129134410.885145-1-michaelba@nvidia.com> References: <20240128102234.776861-1-michaelba@nvidia.com> <20240129134410.885145-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCBF:EE_|MN2PR12MB4256:EE_ X-MS-Office365-Filtering-Correlation-Id: e2212ae5-c7c7-4521-7535-08dc20d0736e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zllnu4dFH54+4rA+klDfTa9hb7yA3MjHaVOMFWzfWWLbFfJSZrJXUZHyPXpfyWN9UtxkJyS1GvTx+54bT2+z25eupofCe/n9+BkjjJGKFNtK2ynt5CUV7ZV3HZw3yEQZ8rpa0Gty9VuDsN9qqxl7mWbWbhwDnZKEppvg6Pe5CBuSMiF7oF3I+2uF2pIT9So7oOXDWco/BcpE1wF3aQ0YuZr9s0b3H+r5DJULUnYQF620bGKdGD0KeBNEnBJ1i9cZd8ucriwXK81mJ2qEstjt7gNJ/9lhJxURWUOucBkYMk4IOTLoFfkKb31n6a6dNABvw4QBbJq2WdjdyUXIL+1HDGevE/VHupRZxRlxSxhnOvk3yn/9aCpFRdtKVKkoIt/YgaBvD0SDIda8BNMfMtiSYfq3Wd+3htpid1q0+rncVW9LPsQVMtTv+0L+Dt0Yx6xwRgGis3zwxnXp//2kBTuYscuNqJm7jZ+AGfIJvQBf3PFhYbqsOLZPyt9wE4KhlSCmW0Xc7y1v8ECtwVed8+nUOhm3U7goIRxFyRORRFQGWTBrVGoh7DQFo958RnawNMegP9Tckcs9FrIqa4hHGm0xdd6iCcbO6M7VBI4q9exeOMZIC13zIONQ/6eI5wb2BTE0NKYjEDrZpy65JpmaIx+wYQOfM/GnV3rE7BeLGDDYOu1XKlSE4ooMfxmxWbL/HGcjTId6VJyCKVukm6Rt6GkST9mqxKlHt16zF0AQM4XXV9OI6BHnOg0jBwiQ+ekO0Oi8 X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(39860400002)(396003)(136003)(346002)(230922051799003)(1800799012)(82310400011)(186009)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(6916009)(316002)(83380400001)(47076005)(54906003)(70586007)(70206006)(86362001)(478600001)(40460700003)(40480700001)(6666004)(82740400003)(36860700001)(6286002)(7636003)(7696005)(1076003)(426003)(336012)(2616005)(107886003)(55016003)(26005)(8676002)(8936002)(356005)(4326008)(5660300002)(2906002)(41300700001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 13:44:44.0422 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2212ae5-c7c7-4521-7535-08dc20d0736e 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.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000FCBF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4256 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 08e211a5b8..63e76c86b1 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -6717,18 +6717,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 @@ -6737,6 +6774,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, @@ -6748,19 +6786,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) @@ -6768,7 +6800,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,