From patchwork Wed Feb 1 07:28:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vesker X-Patchwork-Id: 122786 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 5ED1C41B9B; Wed, 1 Feb 2023 08:29:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15A5C42D51; Wed, 1 Feb 2023 08:29:13 +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 BECAB42D51 for ; Wed, 1 Feb 2023 08:29:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h+tZSX7T5b3SCaQetAgBIzm0HbTpicsLTQMWRDHACskYoGFtG/dsAMxBctz55mlrKRmbsAXhcy+QAWRnqDTiaIT8tyb27SlbB2YoCGEU8v+HGKav/VQUIQRHIiCY4zmth8QWvzuhQv0ZSilEEIAAVzAbis1DfoPJHfYoWCCpOz3selWsrtJ5/4tWdrW6mw/6iBELcNM4c5SUuxET2BAOxPmEduEVE2kkqQ07POmEpJtaqnHSXI48T94O0W2twnxR8JmSuznJ1t623wZceIgmUE0/GliYSM8tMq1cQC3+y3MMaY88yLKjFL41VaiiTplxmWr17IibMuhBCUHaZgUEKg== 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=JAE/ahSL7xyMq43+KlfqHwd93u9ZkOZTHempeQxZ/q4=; b=DlkdhSp1kENzZJ0s5Zt+DPbCtejIKMl/lRfDhfgDFckIkPGDN2innGheoaqFlCfavMSJGQPcRzudBWpcNvaF3xXAxOOZgcWaiT0iBoGDIUeymsSIxpUL96iMNALIrod+++qDEV/x26oQtVd7P4GlGkS7sh9BpBqCNzDSNtao8s7htsnYGtINDAnvh+kvjToHBwGlqUHaKWI7Rf/V7j0IzfwdUkxttsyJLOahmEPU9vLxJWoO0xWN2MtBVLEaHc2NY2YVFhmst3+/Hzk8e7BLXQyJfn/fm+HMCJzEFtVwt/+2nEi+kn9UUQSNOjZwqEJ3sl+/YieAzQ4UrD/ojkRZ+Q== 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=JAE/ahSL7xyMq43+KlfqHwd93u9ZkOZTHempeQxZ/q4=; b=XzxmS3GsbGhXjzVhybTEtSNHqQT+F6/5bbmx4AEOFNBvaBFjgkyiyeJ+SFtH4n04WKDi7k7IrtTT6cWCKJXNXDOr53EL9lmS1ZYhXK/9effkXdZrpxPJTijqZ6KBTPtAq/d9/r1HdutZm+aFII7TbHhwt/BbPUZDzVXGcpxwOduUqDdPh303h8bHE02drHaAPF2jeqOTwBGVdhKXhdtnK5FQe4yrBYZvzATPz2szgs5tpj7KEmn7i1Zjin3Gf6lixTCizQXXlLNemOrQrL+1ML/tytTsIr6bOQA+SIgiBXjTDF7q9E+opM4/wkVBGLOzYc2fc1bLKkRb5QlJCCSggA== Received: from BN9PR03CA0515.namprd03.prod.outlook.com (2603:10b6:408:131::10) by MN0PR12MB5787.namprd12.prod.outlook.com (2603:10b6:208:376::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Wed, 1 Feb 2023 07:29:10 +0000 Received: from BN8NAM11FT109.eop-nam11.prod.protection.outlook.com (2603:10b6:408:131:cafe::ac) by BN9PR03CA0515.outlook.office365.com (2603:10b6:408:131::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.25 via Frontend Transport; Wed, 1 Feb 2023 07:29:10 +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 BN8NAM11FT109.mail.protection.outlook.com (10.13.176.221) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.24 via Frontend Transport; Wed, 1 Feb 2023 07:29:09 +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 23:28:56 -0800 Received: from nvidia.com (10.126.230.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 23:28:54 -0800 From: Alex Vesker To: , , , "Matan Azrad" CC: , Subject: [v2 08/16] net/mlx5/hws: move matcher size check to function Date: Wed, 1 Feb 2023 09:28:07 +0200 Message-ID: <20230201072815.1329101-9-valex@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230201072815.1329101-1-valex@nvidia.com> References: <20230131093346.1261066-1-valex@nvidia.com> <20230201072815.1329101-1-valex@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] 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: BN8NAM11FT109:EE_|MN0PR12MB5787:EE_ X-MS-Office365-Filtering-Correlation-Id: d321cf1f-07ea-4789-b21c-08db04260255 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: gG7vd0H/lfgcPVQXVC09wa8itsSc85I5fdIs10rYqpYZMm4V2+RdHi999+SAiPyR0O6hO7JLaRcDIYMQrxFUiZgLiHIpLDCl3OqJMRbDLvoNZxIfdcqC9WwPCld4H6OVlbz9o3hs2tJH3KXTvvnvR7G/WkFqOVhDDOadYNOW+k1gE9tH7yvJbR8TfwlM/acpWVbyLht0J4RSafj0ZLxQ4Y6kD5whTwNmSV8KZBQNBxa73av6R2tnoJGlL52/1Vnd4pP1fK1rAuVKLZYyFNd97hi8tulQ9/we6LfUkzuVCjYTwIWD3+VxvjulxUJhGY7HF5aMLUkPumKB3upeeRmngTNGOsGQIU6oV+E72ZPRmO61R9ct42Hpkik9oHJwKDRJk0EStxeEaxUdDUUi+XjopsZfRq2jlKNtqHj7lYedrSBd5ubM7fX1jE+nYWn9RTOTNcxwA4eJT1zrsfOWuvhlJIGGYXaru/ZM42Syvf1UyvjGlWDfIuLxr41srny0PSRrVI8W4ZhiOl9SWh1V34YdUbSg98IrP7+tIcSWXhKoLmIJz4VP8pEolpE9PZa7z9U55pVY2STkUmJC9ug5BeY9ZSVlgYjV7CXeSqJSW6Hl77m2dy9abvBE6B0Mr3i6Gfo/M2fPUQyFc1iM2bUbmH2Bzln3X/QJsj9YUFoxF0H7GbWt9R9RIewAfhtr3/Lhyt4W3EqjNIelHZuo2aUKRs1Q+w== 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)(376002)(346002)(396003)(136003)(39860400002)(451199018)(40470700004)(46966006)(36840700001)(47076005)(7696005)(70206006)(8676002)(41300700001)(70586007)(8936002)(36860700001)(83380400001)(336012)(4326008)(426003)(478600001)(86362001)(2906002)(7636003)(316002)(6666004)(82740400003)(40480700001)(107886003)(55016003)(6636002)(82310400005)(16526019)(5660300002)(356005)(6286002)(186003)(26005)(1076003)(40460700003)(110136005)(36756003)(54906003)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 07:29:09.5621 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d321cf1f-07ea-4789-b21c-08db04260255 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: BN8NAM11FT109.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5787 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 This check can be later on reused for other places, it will look better in a function Signed-off-by: Alex Vesker --- drivers/net/mlx5/hws/mlx5dr_matcher.c | 43 +++++++++++++++++---------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c b/drivers/net/mlx5/hws/mlx5dr_matcher.c index 101a12d361..b8db0a27ae 100644 --- a/drivers/net/mlx5/hws/mlx5dr_matcher.c +++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c @@ -565,6 +565,32 @@ static void mlx5dr_matcher_destroy_rtc(struct mlx5dr_matcher *matcher, mlx5dr_pool_chunk_free(ste_pool, ste); } +static int +mlx5dr_matcher_check_attr_sz(struct mlx5dr_cmd_query_caps *caps, + struct mlx5dr_matcher_attr *attr) +{ + if (attr->table.sz_col_log > caps->rtc_log_depth_max) { + DR_LOG(ERR, "Matcher depth exceeds limit %d", caps->rtc_log_depth_max); + goto not_supported; + } + + if (attr->table.sz_col_log + attr->table.sz_row_log > caps->ste_alloc_log_max) { + DR_LOG(ERR, "Total matcher size exceeds limit %d", caps->ste_alloc_log_max); + goto not_supported; + } + + if (attr->table.sz_col_log + attr->table.sz_row_log < caps->ste_alloc_log_gran) { + DR_LOG(ERR, "Total matcher size below limit %d", caps->ste_alloc_log_gran); + goto not_supported; + } + + return 0; + +not_supported: + rte_errno = EOPNOTSUPP; + return rte_errno; +} + static void mlx5dr_matcher_set_pool_attr(struct mlx5dr_pool_attr *attr, struct mlx5dr_matcher *matcher) { @@ -840,22 +866,7 @@ mlx5dr_matcher_process_attr(struct mlx5dr_cmd_query_caps *caps, attr->insert_mode == MLX5DR_MATCHER_INSERT_BY_HASH) attr->table.sz_col_log = mlx5dr_matcher_rules_to_tbl_depth(attr->rule.num_log); - if (attr->table.sz_col_log > caps->rtc_log_depth_max) { - DR_LOG(ERR, "Matcher depth exceeds limit %d", caps->rtc_log_depth_max); - goto not_supported; - } - - if (attr->table.sz_col_log + attr->table.sz_row_log > caps->ste_alloc_log_max) { - DR_LOG(ERR, "Total matcher size exceeds limit %d", caps->ste_alloc_log_max); - goto not_supported; - } - - if (attr->table.sz_col_log + attr->table.sz_row_log < caps->ste_alloc_log_gran) { - DR_LOG(ERR, "Total matcher size below limit %d", caps->ste_alloc_log_gran); - goto not_supported; - } - - return 0; + return mlx5dr_matcher_check_attr_sz(caps, attr); not_supported: rte_errno = EOPNOTSUPP;