From patchwork Sun Oct 29 18:22:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 133612 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 BC56C43239; Sun, 29 Oct 2023 19:24:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D57542686; Sun, 29 Oct 2023 19:23:57 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by mails.dpdk.org (Postfix) with ESMTP id 4E60041144 for ; Sun, 29 Oct 2023 19:23:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=INlQX3qk8Uxf19PkAnfbyU46cSWXXjaQ8enDVK8R2dDk3CqU22IgVbabod5zLXoAkIurJ9R1yzv6PrXdaTherdp66WFqYkqUOG1I21Gkm53oyi4hfXFuhepNjmm6WWlWoZAWIo2CwgpWIsXbdgfhsZ3RBbr1TXCGs1HgpahZdCw+POYCgnb49GU0tAWbd3dpI5MZLKbottxYzzkPyVZaTJUOpGdSZHph1hW/u9N0fX+D5Da1BnAnpVlFjdD5murygwY4uhSYhkgVFqVydcw2Z6ZE8orh9TDYwwMl9vFGPg2qqC9Gc13qoB13KRg7XhYaFLkf6vwAaedSiewwN/x3BA== 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=PnY0nJbXqauS8FJd11MM5ttJqB4ilkyKQTXou3uHmlM=; b=PwVOBA5NUMZy68wJ1XNh6kt9543KRAWMONjrQJ/z+mODJ1JkUSqj3vUZblxHl5hHiFj15hL2gAyWOAYPuZU/eLa1Ok2lFRu/TTYlJ1aeN1Yb1AhOq0qfYXo7842PGBXUf2j3M0WMDRuTt21zV5/jN0NDkLM82Xyx+8ykUryVBaxkYPtsqEa+UdXLh4YMRQvs2vD37VuvfnSsrxvAsVVyWZuLR75i1pkNeDlDN94VBRD6R4MFfkyUmO8Splr5ynun61nXOA45Ftg34eU7hRaioQhk7OXPgoQwYNiPGo5ju9LYtFu25roxhzAQEPL8NtrWpmUo0SuSrQom2WY1AuqMLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=PnY0nJbXqauS8FJd11MM5ttJqB4ilkyKQTXou3uHmlM=; b=JWqgVyIZRonYoEm4XbP0x2emiQyBXOmSWZ0mpyB+doozIFrNzzmJiTKyCEwVYERHxCoJkqTIhbEmSYydDO9XOUDdDghKPmY8nGo1ZIDKW458fO2lH9o/iLYUymKXbUZb8JNG0HMjDIVH1VZBS14dKY2qwJ/7Nd4q26fFbKzCxzd60hhKShrr44Mr2FlYjoOxWR0pX2kdtqT/H35wMlPYE0DtSP5PvfiBY/2XUA6NiCswrxgZduOyVJj3cwiaQNzaf3AKk1OXcgaG+1xWoRaIlDkAPYQ4iUJK4jemGEOiF7uprnrvg5xRH7LgOqUa/qeu4zg6RbPWuVqxT5Nx3uMzXA== Received: from BYAPR05CA0063.namprd05.prod.outlook.com (2603:10b6:a03:74::40) by LV3PR12MB9268.namprd12.prod.outlook.com (2603:10b6:408:216::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.27; Sun, 29 Oct 2023 18:23:53 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:a03:74:cafe::35) by BYAPR05CA0063.outlook.office365.com (2603:10b6:a03:74::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.11 via Frontend Transport; Sun, 29 Oct 2023 18:23:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 29 Oct 2023 18:23:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 29 Oct 2023 11:23:45 -0700 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; Sun, 29 Oct 2023 11:23:42 -0700 From: Gregory Etelson To: CC: , , , "Ori Kam" , Matan Azrad , Viacheslav Ovsiienko , Suanming Mou Subject: [PATCH 09/13] net/mlx5: add support for calc hash Date: Sun, 29 Oct 2023 20:22:56 +0200 Message-ID: <20231029182300.227879-10-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029182300.227879-1-getelson@nvidia.com> References: <20231029182300.227879-1-getelson@nvidia.com> MIME-Version: 1.0 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: CO1PEPF000044EF:EE_|LV3PR12MB9268:EE_ X-MS-Office365-Filtering-Correlation-Id: 55a03d45-2855-4f07-1c0c-08dbd8ac34c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sSVWZcDZo7UN9tMYRfE84DnNhFLw9CaJDQ6gffbLmq+Xu0sZDVw6Ldh9pF4HKqVPvL8BB46tkCiNMT63Hz5GN8dpdLahli0RHnfJ0PhvE21OEwxCzhdPsDBt8ONeE6Fa9HWuBlSEUE9cbtJWR9pBGfGbYcj9OcxxZjwVTndPh1GloUA31D0c1tGTXdNomVHV6bBzpYTyTRO6cmo30d6bH5Y4DN+cFZNDNkybIbtpRKKNq3VvYqLgaIlafBLbkBVjtXyRp3wMbI/j8TqRD05R9goSvsq+ludJBmwkRuiCfp7cEezpaZup/GxbvbNkTN2YCcy5lcIrQSsfHBgHdxEqf7L6UURZ8N4nV95Z0ZdEMPdbyCF18SAt7g2Ds/GIWJmWOrOdOlhUAfGsUj+aqHzbHNeoMc9ATYitBrr0+XjBZoLe8y3T3QtV4/h2gL3z2GpgcKEdAaQ0av22yCLhkKHxtElHb36vPHqnCZjKAerxoqf0bdmQ728j8r17WqYjUE2AmaHLNQumpOdmPmA/i4JVcxRJ6/6zoj1Nvq2j0Ojui8ZPwe9QiRlqQdDMle5KLKE8LV1nrbNQGsNXKF/ffsocs8CbYS4T4cspieaB1jiBFqmLogYv+BX9OAQartyUxMMwak/dxXWyWxmd4qXr5qyVuPbcJFIMeDDeMwkKSZbR6RGWS1ouwwl0KcEK9JLuybnfu8QhTB/R505JWfyroS7SWYHVfMzunAro+d1T9G6LtDg= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(39860400002)(376002)(396003)(346002)(230922051799003)(82310400011)(451199024)(1800799009)(64100799003)(186009)(36840700001)(46966006)(40470700004)(16526019)(26005)(6286002)(1076003)(2616005)(107886003)(478600001)(7696005)(6666004)(47076005)(36860700001)(426003)(83380400001)(5660300002)(2906002)(336012)(41300700001)(70586007)(70206006)(4326008)(8676002)(8936002)(6916009)(54906003)(316002)(40460700003)(356005)(7636003)(82740400003)(36756003)(86362001)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2023 18:23:53.2474 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55a03d45-2855-4f07-1c0c-08dbd8ac34c0 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9268 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 From: Ori Kam This commit adds calculate hash function support for mlx5 PMD. Signed-off-by: Ori Kam Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow.c | 32 ++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 8 ++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index ad9a2f2273..819831cff8 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1178,6 +1178,13 @@ mlx5_flow_async_action_list_handle_query_update(struct rte_eth_dev *dev, enum rte_flow_query_update_mode mode, void *user_data, struct rte_flow_error *error); +static int +mlx5_flow_calc_table_hash(struct rte_eth_dev *dev, + const struct rte_flow_template_table *table, + const struct rte_flow_item pattern[], + uint8_t pattern_template_index, + uint32_t *hash, struct rte_flow_error *error); + static const struct rte_flow_ops mlx5_flow_ops = { .validate = mlx5_flow_validate, .create = mlx5_flow_create, @@ -1231,6 +1238,7 @@ static const struct rte_flow_ops mlx5_flow_ops = { mlx5_flow_action_list_handle_query_update, .async_action_list_handle_query_update = mlx5_flow_async_action_list_handle_query_update, + .flow_calc_table_hash = mlx5_flow_calc_table_hash, }; /* Tunnel information. */ @@ -11058,6 +11066,30 @@ mlx5_flow_async_action_list_handle_query_update(struct rte_eth_dev *dev, } +static int +mlx5_flow_calc_table_hash(struct rte_eth_dev *dev, + const struct rte_flow_template_table *table, + const struct rte_flow_item pattern[], + uint8_t pattern_template_index, + uint32_t *hash, struct rte_flow_error *error) +{ + struct rte_flow_attr attr = { .transfer = 0 }; + enum mlx5_flow_drv_type drv_type = flow_get_drv_type(dev, &attr); + const struct mlx5_flow_driver_ops *fops; + + if (drv_type == MLX5_FLOW_TYPE_MIN || drv_type == MLX5_FLOW_TYPE_MAX) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "invalid driver type"); + fops = flow_get_drv_ops(drv_type); + if (!fops || !fops->action_query_update) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, "no query_update handler"); + return fops->flow_calc_table_hash(dev, table, pattern, pattern_template_index, + hash, error); +} + /** * Destroy all indirect actions (shared RSS). * diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 81ec8fd7f1..db6f3ba6f5 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -2062,6 +2062,13 @@ typedef int const void **update, void **query, enum rte_flow_query_update_mode mode, void *user_data, struct rte_flow_error *error); +typedef int +(*mlx5_flow_calc_table_hash_t) + (struct rte_eth_dev *dev, + const struct rte_flow_template_table *table, + const struct rte_flow_item pattern[], + uint8_t pattern_template_index, + uint32_t *hash, struct rte_flow_error *error); struct mlx5_flow_driver_ops { mlx5_flow_validate_t validate; @@ -2133,6 +2140,7 @@ struct mlx5_flow_driver_ops { action_list_handle_query_update; mlx5_flow_async_action_list_handle_query_update_t async_action_list_handle_query_update; + mlx5_flow_calc_table_hash_t flow_calc_table_hash; }; /* mlx5_flow.c */ diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index cccf7de13f..ea43ebb78b 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -2773,7 +2773,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, static const struct rte_flow_item * flow_hw_get_rule_items(struct rte_eth_dev *dev, - struct rte_flow_template_table *table, + const struct rte_flow_template_table *table, const struct rte_flow_item items[], uint8_t pattern_template_index, struct mlx5_hw_q_job *job) @@ -10144,6 +10144,34 @@ flow_hw_action_list_handle_query_update(struct rte_eth_dev *dev, update, query, mode, NULL, error); } +static int +flow_hw_calc_table_hash(struct rte_eth_dev *dev, + const struct rte_flow_template_table *table, + const struct rte_flow_item pattern[], + uint8_t pattern_template_index, + uint32_t *hash, struct rte_flow_error *error) +{ + const struct rte_flow_item *items; + /* Temp job to allow adding missing items */ + static struct rte_flow_item tmp_items[MLX5_HW_MAX_ITEMS]; + static struct mlx5_hw_q_job job = {.items = tmp_items}; + int res; + + items = flow_hw_get_rule_items(dev, table, pattern, + pattern_template_index, + &job); + res = mlx5dr_rule_hash_calculate(table->matcher, items, + pattern_template_index, + MLX5DR_RULE_HASH_CALC_MODE_RAW, + hash); + if (res) + return rte_flow_error_set(error, res, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "hash could not be calculated"); + return 0; +} + const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = { .info_get = flow_hw_info_get, .configure = flow_hw_configure, @@ -10187,6 +10215,7 @@ const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = { .get_q_aged_flows = flow_hw_get_q_aged_flows, .item_create = flow_dv_item_create, .item_release = flow_dv_item_release, + .flow_calc_table_hash = flow_hw_calc_table_hash, }; /**