From patchwork Tue Jan 31 09:33:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vesker X-Patchwork-Id: 122727 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 E257F41B8D; Tue, 31 Jan 2023 10:35:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA24D42D53; Tue, 31 Jan 2023 10:34:43 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2060.outbound.protection.outlook.com [40.107.220.60]) by mails.dpdk.org (Postfix) with ESMTP id 2D2EF42D2C for ; Tue, 31 Jan 2023 10:34:39 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m69W/lOJg1PRSU0FlwB/fKhDbt6opTnkzj7L9FqOwH3M6LBlFWuGiHAuC1ReZ47dYXu+yXweaytONYy8Oh9soPXF+ZOKdaVLB5A6tASpaXNEcuXPQm+FnM+tmUPbdbmXf6GqOQztKFz1WECllWhn94v+g6Nnl+NDcDQc5aqqdD2EH0r8H6FO0U85OR8908f+K/V69OMOG2CXWEEOHfMbmAj0oll/vg6VSsCBXEe2F559zQoV/1zXU4DUZqjBbYZAA9u1yU8sBIqSz+nEqEvdqB5PJjo7K7Cnlf+YCr+0afnYYl3WiEnMEv9jPLvgBeq/0UZB8/Myb7rBjUehxS3b4A== 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=iU1+7ngSiW7pco8HxulNG8vgueNU0j9Z/8l3ZtZJl44=; b=EyyNe8lBDpeDQwmyQQbIGByxk1ZyGUwK5MN1ZgNMKhEvg7DpMDZrB1LnZUnKLRWx4UyAxouNObQl1gfqK+eakrS6N9FLtNnlanFJECYleh03v49OX2MLH/aq9I2apvb+mZTHMO86dFhOJ8h8BHeYzlfXRbA2i8XqkbwSo1VFneQk5FP5aURP34lfnBh6H9Qr3vYBqNsuedCTZYGIckJh2qo4BkhktQG2j4Y0n8k1TDdMnfeBJps5LZbCFOqdIYu2KvyDaGthUhkpr/9rciKB0fQXAA16sBGdDY6KKwT1iBEsZrMyUeDgEid/xPx7PAtGqbL0cU6MBUPuIEs6DUaUZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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 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=iU1+7ngSiW7pco8HxulNG8vgueNU0j9Z/8l3ZtZJl44=; b=axyQe17A9kUGnkvCGjmP66WOGXO5RailJKOBFi8EwoDlTBX0wfjKoWzwXbCMSZL+YHYzN6q4h3kof0vTPEL5sg7dPNnqtAIEGDFM54GN2ER6S+tZdfDF0CYc6ACkDLdkNdkkwArBsrZJPA3iZt5YaMrtyr7RGRLhixMEc7KJbBQ5e5Trv9NUg4UHXwHH17n20gzDj0zjJrFrm8+/u/nL//1GorHhUBclgyYCKqoe0nV8Lwcf8oIFPSSJbUA3RGsfn96Ejab69VO+uMQw3Id42AO6PcmqL4S95Ir2MKrf8GyX0rA2vufLEad4HixwG6N+ZxkeqmYEHo1nyWRA8W5Dbw== Received: from MW4PR04CA0329.namprd04.prod.outlook.com (2603:10b6:303:82::34) by CY5PR12MB6600.namprd12.prod.outlook.com (2603:10b6:930:40::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38; Tue, 31 Jan 2023 09:34:36 +0000 Received: from CO1NAM11FT093.eop-nam11.prod.protection.outlook.com (2603:10b6:303:82:cafe::a9) by MW4PR04CA0329.outlook.office365.com (2603:10b6:303:82::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.38 via Frontend Transport; Tue, 31 Jan 2023 09:34:36 +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 CO1NAM11FT093.mail.protection.outlook.com (10.13.175.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.25 via Frontend Transport; Tue, 31 Jan 2023 09:34:35 +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.36; Tue, 31 Jan 2023 01:34:09 -0800 Received: from nvidia.com (10.126.231.37) 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.36; Tue, 31 Jan 2023 01:34:07 -0800 From: Alex Vesker To: , , , "Matan Azrad" CC: , Subject: [v1 02/16] net/mlx5/hws: matcher remove AT and MT limitation Date: Tue, 31 Jan 2023 11:33:31 +0200 Message-ID: <20230131093346.1261066-3-valex@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230131093346.1261066-1-valex@nvidia.com> References: <20230131093346.1261066-1-valex@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT093:EE_|CY5PR12MB6600:EE_ X-MS-Office365-Filtering-Correlation-Id: 727508cf-3b52-4f9b-dbe6-08db036e5df7 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eldpyb1cZIAo35fkgNj1MCcK7TDB47zvWK1JNPJHbZQ0QtfCANM0zwEipzv4qw2ruH6y8zO4X5HuZn4OEv8edu5GqfqEBIqrleWtamYVJNXkZ9PD0uWo7Z567dIU67LzTXtZ14zMAUWeGh+JhwpCY/+VBGBnnvgD/gVzYsM6LTASDZpqfUnY+Rqpmxf23lZF3rNN9dAf8IO1JXjl9B0rDf+FmEJ5U5PtQaZ5Osy5c/FiK1VaB7n+XgrOdQKtY9Oc/0W9HnNODgBw8YA9NTv2saIHfKVIaNFi88VXxfefAsr3UUmQGuJmv54A/pDOr0ffc02QOOtkMzD/2hKevngfzxQ/p0JxXAtnPgmH+5mTsbWiDGy0cQKELpYF5kRnsENdLIn+dCCMaoK08wFw6E0yBJCDDca8QI1iZtjZslQmcpGZ3we/9P/YZGQ+60ujkWDp/DRvXcGNg9aXawM+nlE0r5LO4DMuvG9hqzpHIh9k1zw7nRk6nvlRiiOrO/3GqIPzwDL80gKjg5B1wljraFZhm6a+hC17ArcUkW2v9ljP/sdNQSAUO2cIYcT90JnkyWhH5xy/jTxuceeXG8uOwwFhWNwVRCDNzzBkzbrszuUadzo6MR8SnwNNzEtjZjn5ViSBnkyVwO6bycmGwDqKw1OKMp/Tw/czTdvZmZV5tkMsZqA5DjN/7u27ULXj7MzSU6ramBZ6jLU99KiroLj0tNWD+g== 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:(13230025)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199018)(36840700001)(46966006)(40470700004)(6666004)(107886003)(1076003)(26005)(186003)(478600001)(4326008)(6286002)(16526019)(8676002)(70206006)(70586007)(7696005)(7636003)(336012)(2616005)(47076005)(41300700001)(426003)(83380400001)(2906002)(82740400003)(40460700003)(86362001)(8936002)(36860700001)(82310400005)(36756003)(30864003)(40480700001)(356005)(55016003)(5660300002)(110136005)(316002)(6636002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 09:34:35.9305 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 727508cf-3b52-4f9b-dbe6-08db036e5df7 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: CO1NAM11FT093.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6600 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 The action and match templates were stored on the matcher in a fixed size array to reduce cache misses and reuse template calculations. This approuch introduced two issues: -limitation of fixed array -definer is bindind to match template and cannot be used with union definer since the layout is fixed Signed-off-by: Alex Vesker --- drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +- drivers/net/mlx5/hws/mlx5dr_matcher.c | 109 ++++++++++++++++---------- drivers/net/mlx5/hws/mlx5dr_matcher.h | 8 +- drivers/net/mlx5/hws/mlx5dr_rule.c | 15 ++-- 4 files changed, 78 insertions(+), 58 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_debug.c b/drivers/net/mlx5/hws/mlx5dr_debug.c index 0815327b18..9199ec16e0 100644 --- a/drivers/net/mlx5/hws/mlx5dr_debug.c +++ b/drivers/net/mlx5/hws/mlx5dr_debug.c @@ -92,7 +92,7 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher int i, ret; for (i = 0; i < matcher->num_of_mt; i++) { - struct mlx5dr_match_template *mt = matcher->mt[i]; + struct mlx5dr_match_template *mt = &matcher->mt[i]; ret = fprintf(f, "%d,0x%" PRIx64 ",0x%" PRIx64 ",%d,%d\n", MLX5DR_DEBUG_RES_TYPE_MATCHER_MATCH_TEMPLATE, @@ -123,7 +123,7 @@ mlx5dr_debug_dump_matcher_action_template(FILE *f, struct mlx5dr_matcher *matche int i, j, ret; for (i = 0; i < matcher->num_of_at; i++) { - struct mlx5dr_action_template *at = matcher->at[i]; + struct mlx5dr_action_template *at = &matcher->at[i]; ret = fprintf(f, "%d,0x%" PRIx64 ",0x%" PRIx64 ",%d,%d,%d", MLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE, diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c b/drivers/net/mlx5/hws/mlx5dr_matcher.c index d509a2f0e1..913bb9d447 100644 --- a/drivers/net/mlx5/hws/mlx5dr_matcher.c +++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c @@ -430,8 +430,8 @@ static int mlx5dr_matcher_create_rtc(struct mlx5dr_matcher *matcher, /* The usual Hash Table */ rtc_attr.update_index_mode = MLX5_IFC_RTC_STE_UPDATE_MODE_BY_HASH; /* The first match template is used since all share the same definer */ - rtc_attr.definer_id = mlx5dr_definer_get_id(matcher->mt[0]->definer); - rtc_attr.is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt[0]->definer); + rtc_attr.definer_id = mlx5dr_definer_get_id(matcher->mt->definer); + rtc_attr.is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt->definer); } else if (attr->insert_mode == MLX5DR_MATCHER_INSERT_BY_INDEX) { rtc_attr.update_index_mode = MLX5_IFC_RTC_STE_UPDATE_MODE_BY_OFFSET; rtc_attr.num_hash_definer = 1; @@ -439,10 +439,8 @@ static int mlx5dr_matcher_create_rtc(struct mlx5dr_matcher *matcher, if (attr->distribute_mode == MLX5DR_MATCHER_DISTRIBUTE_BY_HASH) { /* Hash Split Table */ rtc_attr.access_index_mode = MLX5_IFC_RTC_STE_ACCESS_MODE_BY_HASH; - rtc_attr.definer_id = - mlx5dr_definer_get_id(matcher->mt[0]->definer); - rtc_attr.is_jumbo = - mlx5dr_definer_is_jumbo(matcher->mt[0]->definer); + rtc_attr.definer_id = mlx5dr_definer_get_id(matcher->mt->definer); + rtc_attr.is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt->definer); } else if (attr->distribute_mode == MLX5DR_MATCHER_DISTRIBUTE_BY_LINEAR) { /* Linear Lookup Table */ rtc_attr.access_index_mode = MLX5_IFC_RTC_STE_ACCESS_MODE_LINEAR; @@ -579,7 +577,7 @@ static void mlx5dr_matcher_set_pool_attr(struct mlx5dr_pool_attr *attr, static int mlx5dr_matcher_bind_at(struct mlx5dr_matcher *matcher) { - bool is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt[0]->definer); + bool is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt->definer); struct mlx5dr_cmd_stc_modify_attr stc_attr = {0}; struct mlx5dr_table *tbl = matcher->tbl; struct mlx5dr_pool_attr pool_attr = {0}; @@ -589,7 +587,7 @@ static int mlx5dr_matcher_bind_at(struct mlx5dr_matcher *matcher) bool valid; for (i = 0; i < matcher->num_of_at; i++) { - struct mlx5dr_action_template *at = matcher->at[i]; + struct mlx5dr_action_template *at = &matcher->at[i]; /* Check if action combinabtion is valid */ valid = mlx5dr_action_check_combo(at->action_type_arr, matcher->tbl->type); @@ -679,7 +677,7 @@ static int mlx5dr_matcher_bind_mt(struct mlx5dr_matcher *matcher) for (i = 0; i < matcher->num_of_mt; i++) { /* Get a definer for each match template */ - ret = mlx5dr_definer_get(ctx, matcher->mt[i]); + ret = mlx5dr_definer_get(ctx, &matcher->mt[i]); if (ret) goto definer_put; @@ -689,8 +687,8 @@ static int mlx5dr_matcher_bind_mt(struct mlx5dr_matcher *matcher) if (i == 0) continue; - ret = mlx5dr_definer_compare(matcher->mt[i]->definer, - matcher->mt[i - 1]->definer); + ret = mlx5dr_definer_compare(matcher->mt[i].definer, + matcher->mt[i - 1].definer); if (ret) { DR_LOG(ERR, "Match templates cannot be used on the same matcher"); rte_errno = ENOTSUP; @@ -716,7 +714,7 @@ static int mlx5dr_matcher_bind_mt(struct mlx5dr_matcher *matcher) definer_put: while (created--) - mlx5dr_definer_put(matcher->mt[created]); + mlx5dr_definer_put(&matcher->mt[created]); return ret; } @@ -726,7 +724,7 @@ static void mlx5dr_matcher_unbind_mt(struct mlx5dr_matcher *matcher) int i; for (i = 0; i < matcher->num_of_mt; i++) - mlx5dr_definer_put(matcher->mt[i]); + mlx5dr_definer_put(&matcher->mt[i]); mlx5dr_pool_destroy(matcher->match_ste.pool); } @@ -939,11 +937,10 @@ mlx5dr_matcher_create_col_matcher(struct mlx5dr_matcher *matcher) } col_matcher->tbl = matcher->tbl; - col_matcher->num_of_mt = matcher->num_of_mt; - memcpy(col_matcher->mt, matcher->mt, matcher->num_of_mt * sizeof(*matcher->mt)); + col_matcher->mt = matcher->mt; + col_matcher->at = matcher->at; col_matcher->num_of_at = matcher->num_of_at; - memcpy(col_matcher->at, matcher->at, matcher->num_of_at * sizeof(*matcher->at)); - + col_matcher->num_of_mt = matcher->num_of_mt; col_matcher->attr.priority = matcher->attr.priority; col_matcher->attr.mode = MLX5DR_MATCHER_RESOURCE_MODE_HTABLE; col_matcher->attr.optimize_flow_src = matcher->attr.optimize_flow_src; @@ -1069,7 +1066,7 @@ static int mlx5dr_matcher_init_root(struct mlx5dr_matcher *matcher) flow_attr.tbl_type = type; /* On root table matcher, only a single match template is supported */ - ret = flow_dv_translate_items_hws(matcher->mt[0]->items, + ret = flow_dv_translate_items_hws(matcher->mt[0].items, &flow_attr, mask->match_buf, MLX5_SET_MATCHER_HS_M, NULL, &match_criteria, @@ -1126,36 +1123,64 @@ static int mlx5dr_matcher_uninit_root(struct mlx5dr_matcher *matcher) } static int -mlx5dr_matcher_check_template(uint8_t num_of_mt, uint8_t num_of_at, bool is_root) +mlx5dr_matcher_set_templates(struct mlx5dr_matcher *matcher, + struct mlx5dr_match_template *mt[], + uint8_t num_of_mt, + struct mlx5dr_action_template *at[], + uint8_t num_of_at) { - uint8_t max_num_of_mt; - - max_num_of_mt = is_root ? - MLX5DR_MATCHER_MAX_MT_ROOT : - MLX5DR_MATCHER_MAX_MT; + bool is_root = mlx5dr_table_is_root(matcher->tbl); + int i; if (!num_of_mt || !num_of_at) { DR_LOG(ERR, "Number of action/match template cannot be zero"); - goto out_not_sup; + rte_errno = ENOTSUP; + return rte_errno; + } + + if (is_root && num_of_mt > MLX5DR_MATCHER_MAX_MT_ROOT) { + DR_LOG(ERR, "Number of match templates exceeds limit"); + rte_errno = ENOTSUP; + return rte_errno; } - if (num_of_at > MLX5DR_MATCHER_MAX_AT) { - DR_LOG(ERR, "Number of action templates exceeds limit"); - goto out_not_sup; + matcher->mt = simple_calloc(num_of_mt, sizeof(*matcher->mt)); + if (!matcher->mt) { + DR_LOG(ERR, "Failed to allocate match template array"); + rte_errno = ENOMEM; + return rte_errno; } - if (num_of_mt > max_num_of_mt) { - DR_LOG(ERR, "Number of match templates exceeds limit"); - goto out_not_sup; + matcher->at = simple_calloc(num_of_at, sizeof(*matcher->at)); + if (!matcher->at) { + DR_LOG(ERR, "Failed to allocate action template array"); + rte_errno = ENOMEM; + goto free_mt; } + for (i = 0; i < num_of_mt; i++) + matcher->mt[i] = *mt[i]; + + for (i = 0; i < num_of_at; i++) + matcher->at[i] = *at[i]; + + matcher->num_of_mt = num_of_mt; + matcher->num_of_at = num_of_at; + return 0; -out_not_sup: - rte_errno = ENOTSUP; +free_mt: + simple_free(matcher->mt); return rte_errno; } +static void +mlx5dr_matcher_unset_templates(struct mlx5dr_matcher *matcher) +{ + simple_free(matcher->at); + simple_free(matcher->mt); +} + struct mlx5dr_matcher * mlx5dr_matcher_create(struct mlx5dr_table *tbl, struct mlx5dr_match_template *mt[], @@ -1168,10 +1193,6 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl, struct mlx5dr_matcher *matcher; int ret; - ret = mlx5dr_matcher_check_template(num_of_mt, num_of_at, is_root); - if (ret) - return NULL; - matcher = simple_calloc(1, sizeof(*matcher)); if (!matcher) { rte_errno = ENOMEM; @@ -1180,15 +1201,15 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl, matcher->tbl = tbl; matcher->attr = *attr; - matcher->num_of_mt = num_of_mt; - memcpy(matcher->mt, mt, num_of_mt * sizeof(*mt)); - matcher->num_of_at = num_of_at; - memcpy(matcher->at, at, num_of_at * sizeof(*at)); ret = mlx5dr_matcher_process_attr(tbl->ctx->caps, matcher, is_root); if (ret) goto free_matcher; + ret = mlx5dr_matcher_set_templates(matcher, mt, num_of_mt, at, num_of_at); + if (ret) + goto free_matcher; + if (is_root) ret = mlx5dr_matcher_init_root(matcher); else @@ -1196,11 +1217,13 @@ mlx5dr_matcher_create(struct mlx5dr_table *tbl, if (ret) { DR_LOG(ERR, "Failed to initialise matcher: %d", ret); - goto free_matcher; + goto unset_templates; } return matcher; +unset_templates: + mlx5dr_matcher_unset_templates(matcher); free_matcher: simple_free(matcher); return NULL; @@ -1213,6 +1236,7 @@ int mlx5dr_matcher_destroy(struct mlx5dr_matcher *matcher) else mlx5dr_matcher_uninit(matcher); + mlx5dr_matcher_unset_templates(matcher); simple_free(matcher); return 0; } @@ -1272,7 +1296,6 @@ mlx5dr_match_template_create(const struct rte_flow_item items[], int mlx5dr_match_template_destroy(struct mlx5dr_match_template *mt) { - assert(!mt->refcount); simple_free(mt->items); simple_free(mt); return 0; diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.h b/drivers/net/mlx5/hws/mlx5dr_matcher.h index 2bebc4bcce..b957f5ea4b 100644 --- a/drivers/net/mlx5/hws/mlx5dr_matcher.h +++ b/drivers/net/mlx5/hws/mlx5dr_matcher.h @@ -6,12 +6,8 @@ #define MLX5DR_MATCHER_H_ /* Max supported match template */ -#define MLX5DR_MATCHER_MAX_MT 2 #define MLX5DR_MATCHER_MAX_MT_ROOT 1 -/* Max supported action template */ -#define MLX5DR_MATCHER_MAX_AT 4 - /* We calculated that concatenating a collision table to the main table with * 3% of the main table rows will be enough resources for high insertion * success probability. @@ -59,9 +55,9 @@ struct mlx5dr_matcher { struct mlx5dr_table *tbl; struct mlx5dr_matcher_attr attr; struct mlx5dv_flow_matcher *dv_matcher; - struct mlx5dr_match_template *mt[MLX5DR_MATCHER_MAX_MT]; + struct mlx5dr_match_template *mt; uint8_t num_of_mt; - struct mlx5dr_action_template *at[MLX5DR_MATCHER_MAX_AT]; + struct mlx5dr_action_template *at; uint8_t num_of_at; struct mlx5dr_devx_obj *end_ft; struct mlx5dr_matcher *col_matcher; diff --git a/drivers/net/mlx5/hws/mlx5dr_rule.c b/drivers/net/mlx5/hws/mlx5dr_rule.c index 60a82c022f..f5a0c46315 100644 --- a/drivers/net/mlx5/hws/mlx5dr_rule.c +++ b/drivers/net/mlx5/hws/mlx5dr_rule.c @@ -5,10 +5,10 @@ #include "mlx5dr_internal.h" static void mlx5dr_rule_skip(struct mlx5dr_matcher *matcher, + struct mlx5dr_match_template *mt, const struct rte_flow_item *items, bool *skip_rx, bool *skip_tx) { - struct mlx5dr_match_template *mt = matcher->mt[0]; const struct flow_hw_port_info *vport; const struct rte_flow_item_ethdev *v; @@ -43,6 +43,7 @@ static void mlx5dr_rule_skip(struct mlx5dr_matcher *matcher, static void mlx5dr_rule_init_dep_wqe(struct mlx5dr_send_ring_dep_wqe *dep_wqe, struct mlx5dr_rule *rule, const struct rte_flow_item *items, + struct mlx5dr_match_template *mt, void *user_data) { struct mlx5dr_matcher *matcher = rule->matcher; @@ -63,7 +64,7 @@ static void mlx5dr_rule_init_dep_wqe(struct mlx5dr_send_ring_dep_wqe *dep_wqe, break; case MLX5DR_TABLE_TYPE_FDB: - mlx5dr_rule_skip(matcher, items, &skip_rx, &skip_tx); + mlx5dr_rule_skip(matcher, mt, items, &skip_rx, &skip_tx); if (!skip_rx) { dep_wqe->rtc_0 = matcher->match_ste.rtc_0->id; @@ -186,8 +187,8 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule, uint8_t at_idx, struct mlx5dr_rule_action rule_actions[]) { - struct mlx5dr_action_template *at = rule->matcher->at[at_idx]; - struct mlx5dr_match_template *mt = rule->matcher->mt[mt_idx]; + struct mlx5dr_action_template *at = &rule->matcher->at[at_idx]; + struct mlx5dr_match_template *mt = &rule->matcher->mt[mt_idx]; bool is_jumbo = mlx5dr_definer_is_jumbo(mt->definer); struct mlx5dr_matcher *matcher = rule->matcher; struct mlx5dr_context *ctx = matcher->tbl->ctx; @@ -212,7 +213,7 @@ static int mlx5dr_rule_create_hws(struct mlx5dr_rule *rule, * dep_wqe buffers (ctrl, data) are also reused for all STE writes. */ dep_wqe = mlx5dr_send_add_new_dep_wqe(queue); - mlx5dr_rule_init_dep_wqe(dep_wqe, rule, items, attr->user_data); + mlx5dr_rule_init_dep_wqe(dep_wqe, rule, items, mt, attr->user_data); ste_attr.wqe_ctrl = &dep_wqe->wqe_ctrl; ste_attr.wqe_data = &dep_wqe->wqe_data; @@ -371,7 +372,7 @@ static int mlx5dr_rule_destroy_hws(struct mlx5dr_rule *rule, ste_attr.used_id_rtc_1 = &rule->rtc_1; ste_attr.wqe_ctrl = &wqe_ctrl; ste_attr.wqe_tag = &rule->tag; - ste_attr.wqe_tag_is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt[0]->definer); + ste_attr.wqe_tag_is_jumbo = mlx5dr_definer_is_jumbo(matcher->mt->definer); ste_attr.gta_opcode = MLX5DR_WQE_GTA_OP_DEACTIVATE; if (unlikely(mlx5dr_matcher_is_insert_by_idx(matcher))) ste_attr.direct_index = attr->rule_idx; @@ -388,7 +389,7 @@ static int mlx5dr_rule_create_root(struct mlx5dr_rule *rule, struct mlx5dr_rule_action rule_actions[]) { struct mlx5dv_flow_matcher *dv_matcher = rule->matcher->dv_matcher; - uint8_t num_actions = rule->matcher->at[at_idx]->num_actions; + uint8_t num_actions = rule->matcher->at[at_idx].num_actions; struct mlx5dr_context *ctx = rule->matcher->tbl->ctx; struct mlx5dv_flow_match_parameters *value; struct mlx5_flow_attr flow_attr = {0};