From patchwork Sun Dec 3 11:25:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 134766 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 939174365F; Sun, 3 Dec 2023 12:28:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7207B4069D; Sun, 3 Dec 2023 12:27:01 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2051.outbound.protection.outlook.com [40.107.244.51]) by mails.dpdk.org (Postfix) with ESMTP id 643A340648 for ; Sun, 3 Dec 2023 12:26:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XEsAYhsiY3XKQ2/RoKPgLIAQW09A7PyCRohTtLnTvIZfPHfEdYkUdG2BjQi0p0GaB8vKNwEg5tCBDkmb+mliYOsj1PgidLAaaA1QCvh7LPnvnmfPI3Xkm8/LO4z9Py8NM57aosNESDGL9sx9As0gD7wQoArxvQb03Khkis3P/et12viqirceiZhfx3uRyweNi5pYU9lrm0DMHYL2RPS4FFlgkdovxULOIQxnq+v6dRZqYSeM6HEQnYHMPLL/eLnCqTNKIicl0CHfL0AYxB1roQ1o/+LizG/x+JE9fp4hvcxGqXxsjkQbT6JyEGPQGjxU6KAYN1q6erTNFC10gBx6fA== 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=oz+CEA34dJNh8ORA+SYwWXkTD50y9YpZt/zLKN/sc04=; b=HY2VGRkUuDrJJbNegQ5OGBWvQQQ/uLTdMteHsc7DCkUCVnea3v8ocAlqhqlD6VE9iDEGWMDbKOS2KgMKGFdKcvhb7qEn2o+DKN6jeOOzNjdgv3rsU6+w693D/zuT3EWMbvCHKf0ixQ41QaeVOZRhGN85crvMm+QWNkKbrN7KzNtcEyj3RnK9jsr8GiKVnU4CAcPz5RQai09nUPWiRyRJMUWy0Q/gqk6kbnq7cJN2MLGhtAiEwSSmXQNsf7x/H+bwMZfMZKEr6Bf29pXTaGLi+I/I+FukiYfaP6MwPEQvMYoBgfUOYwQpDzXGBK88UsljTaDlc9Erhzk3dBt3NxoDaw== 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=oz+CEA34dJNh8ORA+SYwWXkTD50y9YpZt/zLKN/sc04=; b=TLrUDWeIQswnZPSkgX3im9o0Xv6e9jrnSsWF3A28sKjouI4iYuY4jpMjTFMQOvUw4sGNsO8tMyuYf3YOiXNhYxCZokh/sLg58pC7Y/dBsoKF4z+mcWNILb2sceDR2OIDdOLOwUBOqD12nJcrob8wkUl/ppsLouAHpt+kM9QuAJCl6fVmIYJ98j7MXG+a/K0QySsYXScw2+N+FWU7JNEyGut+9adTQvFbwOEP2Q+SmCHMzZqEziagNmBIi2dEw9bJl0Nm76SU1C6xl4MNIeO73xbsJ9nWkje+evm5/jKAg/pyQnvd9B/lDN08jghry0R1v6gLHISupqTP9WNfrsXRrQ== Received: from MW4PR04CA0247.namprd04.prod.outlook.com (2603:10b6:303:88::12) by PH7PR12MB8596.namprd12.prod.outlook.com (2603:10b6:510:1b7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.32; Sun, 3 Dec 2023 11:26:57 +0000 Received: from CO1PEPF000042A8.namprd03.prod.outlook.com (2603:10b6:303:88:cafe::77) by MW4PR04CA0247.outlook.office365.com (2603:10b6:303:88::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.32 via Frontend Transport; Sun, 3 Dec 2023 11:26:57 +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 CO1PEPF000042A8.mail.protection.outlook.com (10.167.243.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.20 via Frontend Transport; Sun, 3 Dec 2023 11:26:56 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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; Sun, 3 Dec 2023 03:26:41 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 3 Dec 2023 03:26:41 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Sun, 3 Dec 2023 03:26:39 -0800 From: Michael Baum To: CC: Matan Azrad , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 21/23] net/mlx5: add GENEVE option support for group 0 Date: Sun, 3 Dec 2023 13:25:41 +0200 Message-ID: <20231203112543.844014-22-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231203112543.844014-1-michaelba@nvidia.com> References: <20231203112543.844014-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A8:EE_|PH7PR12MB8596:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e50d837-e835-4e62-cfd3-08dbf3f2c240 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +jhqz3Zc586XjpQGPPHo/m9A9hYJ6dCst1i3KdBCnGnkRE12E87awHoFk2LiRViYzzpsef3i6gpI5lWCHcPEkzhJ/yrJjGNiwFeGq3vekgjDP4YbKsdZLlgKdivJJI/Qyd5cSOhsns4xPH/zN79MPjfx1mDk6FVOeqO/MVjbNg6Z50mS1S3OVxFqIkVXE6NHbpBZmx7GmyYr/XxEFHYfQhrLrH2DdnG7HXG3oMKEJwwVtL9g4WJMEUZMRMnY37o3LPQJN0OKfhrdCt8bkiwOruoeODp++OOLSn2LJOcCEbePbVgAElm8pYLYpAZgI2lyr3KKm4vK7TosAmkBRPu1Uy2AHNecBEO9jJHqWEtNkp4/kmyGKcV6V6VyM2AQQjDHqJ01rpVUW0ck6NxiBqqpuQ6Z4jYJXQdSriKV7Kpfr2XZ9s1/gV1+okkv8XfCxjxxgPd1LfpkiSJ/FUHpRQ7zz5PLpiUpDAvs8fowyTd9I4SxCAF+oKPPxz80mBXBqrcgkWsqjK+/jgM4Dq2fmjzG8hy/sCvUirw3vfB60zXSOHZasJGU7XQGDNsd59UcjjbuE4uLs++D3rcF7xJUbl8Gb95T5moIxt7A6V/RvnFM+AaTpiFuqWrWoVpobDds5/TKwZBn313ecd3k3eMvpsXTVK0nA2tezSnYsKUZb7Ejxne+suTL9XopZH8JR0TQd+9WR09tFsDPCY/ztIe/AQkly8H3QOo3+Z2ZHA1Oho1gEO4CtRcXo6LZOI4o66D+aSR+ 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)(346002)(376002)(396003)(39860400002)(136003)(230922051799003)(64100799003)(1800799012)(186009)(82310400011)(451199024)(36840700001)(40470700004)(46966006)(40480700001)(55016003)(40460700003)(36860700001)(356005)(47076005)(7636003)(2906002)(5660300002)(82740400003)(83380400001)(336012)(426003)(1076003)(7696005)(107886003)(6666004)(2616005)(26005)(6286002)(478600001)(36756003)(41300700001)(70206006)(54906003)(6916009)(316002)(4326008)(8676002)(8936002)(70586007)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2023 11:26:56.8157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e50d837-e835-4e62-cfd3-08dbf3f2c240 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: CO1PEPF000042A8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8596 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 for HWS GENEVE options for flex parser profile 0 and group 0. This patch avoids parser creation during matcher/flow preparation for HW steering (MLX5_SET_MATCHER_HS) and removes some logic done in "flow_dev_geneve_tlv_option_resource_*()" functions when dv_flow_en=2. After this change, those functions became static and they were removed from header file. Signed-off-by: Michael Baum --- drivers/net/mlx5/mlx5.c | 8 +------- drivers/net/mlx5/mlx5_flow.h | 4 ---- drivers/net/mlx5/mlx5_flow_dv.c | 24 +++++++++++------------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 5f8af31aea..881c42a97a 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2049,13 +2049,7 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh) } while (++i <= sh->bond.n_port); if (sh->td) claim_zero(mlx5_devx_cmd_destroy(sh->td)); -#ifdef HAVE_MLX5_HWS_SUPPORT - /* HWS manages geneve_tlv_option resource as global. */ - if (sh->config.dv_flow_en == 2) - flow_dev_geneve_tlv_option_resource_release(sh); - else -#endif - MLX5_ASSERT(sh->geneve_tlv_option_resource == NULL); + MLX5_ASSERT(sh->geneve_tlv_option_resource == NULL); pthread_mutex_destroy(&sh->txpp.mutex); mlx5_lwm_unset(sh); mlx5_physical_device_destroy(sh->phdev); diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 04a2eb0b0c..808f364c6c 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -2825,10 +2825,6 @@ void flow_hw_grp_clone_free_cb(void *tool_ctx, struct mlx5_list_entry *entry); struct mlx5_aso_age_action *flow_aso_age_get_by_idx(struct rte_eth_dev *dev, uint32_t age_idx); -int flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev, - const struct rte_flow_item *item, - struct rte_flow_error *error); -void flow_dev_geneve_tlv_option_resource_release(struct mlx5_dev_ctx_shared *sh); void flow_release_workspace(void *data); int mlx5_flow_os_init_workspace_once(void); diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8894f51f4c..72e0d82e7b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9880,7 +9880,7 @@ flow_dv_translate_item_geneve(void *key, const struct rte_flow_item *item, /** * Create Geneve TLV option resource. * - * @param dev[in, out] + * @param[in, out] dev * Pointer to rte_eth_dev structure. * @param[in] item * Flow pattern to translate. @@ -9890,8 +9890,7 @@ flow_dv_translate_item_geneve(void *key, const struct rte_flow_item *item, * @return * 0 on success otherwise -errno and errno is set. */ - -int +static int flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev, const struct rte_flow_item *item, struct rte_flow_error *error) @@ -9904,6 +9903,7 @@ flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev, const struct rte_flow_item_geneve_opt *geneve_opt_v = item->spec; int ret = 0; + MLX5_ASSERT(sh->config.dv_flow_en == 1); if (!geneve_opt_v) return -1; rte_spinlock_lock(&sh->geneve_tlv_opt_sl); @@ -9914,13 +9914,8 @@ flow_dev_geneve_tlv_option_resource_register(struct rte_eth_dev *dev, geneve_opt_v->option_type && geneve_opt_resource->length == geneve_opt_v->option_len) { - /* - * We already have GENEVE TLV option obj allocated. - * Increasing refcnt only in SWS. HWS uses it as global. - */ - if (priv->sh->config.dv_flow_en == 1) - __atomic_fetch_add(&geneve_opt_resource->refcnt, 1, - __ATOMIC_RELAXED); + __atomic_fetch_add(&geneve_opt_resource->refcnt, 1, + __ATOMIC_RELAXED); } else { ret = rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, @@ -9999,8 +9994,11 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, return -1; MLX5_ITEM_UPDATE(item, key_type, geneve_opt_v, geneve_opt_m, &rte_flow_item_geneve_opt_mask); - /* Register resource requires item spec. */ - if (key_type & MLX5_SET_MATCHER_V) { + /* + * Register resource requires item spec for SW steering, + * for HW steering resources is registered explicitly by user. + */ + if (key_type & MLX5_SET_MATCHER_SW_V) { ret = flow_dev_geneve_tlv_option_resource_register(dev, item, error); if (ret) { @@ -15777,7 +15775,7 @@ flow_dv_dest_array_resource_release(struct rte_eth_dev *dev, &resource->entry); } -void +static void flow_dev_geneve_tlv_option_resource_release(struct mlx5_dev_ctx_shared *sh) { struct mlx5_geneve_tlv_option_resource *geneve_opt_resource =