From patchwork Tue Jan 31 09:33:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vesker X-Patchwork-Id: 122731 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 E246141B8D; Tue, 31 Jan 2023 10:35:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3AC6642D73; Tue, 31 Jan 2023 10:34:50 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2050.outbound.protection.outlook.com [40.107.223.50]) by mails.dpdk.org (Postfix) with ESMTP id A662D42DAB for ; Tue, 31 Jan 2023 10:34:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AXLxzGSzpFQZbs5LtXn/z4ZD2vL1qNJTjegPESn2wIi17lkwLuSMsCVHeKvJWssYVN+OVR+vBOfPFaG5GAQKIYJRhyrbTTVVpSR/hoLoj+QLGaDkiCLePGY9Xnj6YmE5hnIsC1iiTbShse4CT7z+jXCRZcQR56ElKQuUzBL5FWcEKIIiQjeYEhgYGaNSpSZ6NzAZTP9UO93Z1iQCsgNetyg+qeWItUn1V+EczBjEFhdRLcCZQw2d5KDAeb2vCkJ9sBbZHUCQ1fiWkd/wAZ9N2+9SQ3mQhp9HoH3mVt61YCXyybHrRC/lnu81rS2mM2EekKphLa0j2wRvi3Hvmx2/vA== 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=TCDV5Ui73QzKroI3t+qqdn7PkJQdCRdHqk39oA78wKNTsr9/OdMvz+8LquSrk+KI899UUY2CP5ULqLkzz0Np6BZSx6/PNIq3W+lKBtkjbDZqC7UnAos2Zk+3ks6RXWJVvp50XDouSITF1xxSG2Nwxq39TVGxIyZQqkVFFRE1ZianelDcgGsvcbNynQavcKr4DiERSnfJ628U7GvvSjaJZxTEUdxSq3RPQLIOYJlQuRKbEFKeG120kHVlrQIhjomOaXZ8nPDcU93g7UHL47Dax1TyDRlorrk+xKhiUKH5FYbflGZdT3upOOfzktRuEPkF1oo5qEbNW9i5AvRbq8wEXg== 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=NQkkGi18OjAVT52RgZgvvbDV29lD/uQ+cUmd01vQNg3E+o+lUAa+4z/2+9pM4Zg3YXlWc/5UCFt+tVz4d+g9pW5pSuJlgfVReL7o9aaXZbGT+dwmQhIVzc5oeHsTCQHSVpkR2epESgrlgPCl0X0bmN8uWoeP2rTRUcSFClziI2YGnLVNcWiYxojjFH2QWGKjv9D85vMY0dCEFxIUirXgHYCKXvOva/t0p0Ooj3CF3L8s1EwyIJ8AT8cdBOpbwy9i0US/KO+Q0xkA9qvifcBIEjofJURhwr0vv2goy/4OD3GowoBlKIW15m8ld7CDV9XpV4fxHo/cdaGbcbHyqG5obw== Received: from MW2PR2101CA0011.namprd21.prod.outlook.com (2603:10b6:302:1::24) by MN2PR12MB4125.namprd12.prod.outlook.com (2603:10b6:208:1d9::9) 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:46 +0000 Received: from CO1NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:302:1:cafe::37) by MW2PR2101CA0011.outlook.office365.com (2603:10b6:302:1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.4 via Frontend Transport; Tue, 31 Jan 2023 09:34:46 +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 CO1NAM11FT023.mail.protection.outlook.com (10.13.175.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.21 via Frontend Transport; Tue, 31 Jan 2023 09:34:46 +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:23 -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:21 -0800 From: Alex Vesker To: , , , "Matan Azrad" CC: , Subject: [v1 08/16] net/mlx5/hws: move matcher size check to function Date: Tue, 31 Jan 2023 11:33:37 +0200 Message-ID: <20230131093346.1261066-9-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: CO1NAM11FT023:EE_|MN2PR12MB4125:EE_ X-MS-Office365-Filtering-Correlation-Id: 981961ae-02d3-48d8-0307-08db036e6434 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: EDT24U0LanzLlO108hyw43q7vJbLXvbn+l6PJop+OwUzvkf/uUiV4fOH0Axa/k4emxC/YgKYmpku8cvZcggh8HJP98Id046BiOb1u+XoIe7KlyyCchWQ0E/kr8wItwIvWG8IVdjvWWueyUwmNQQePgs1IC12KPTNibC7RSzoW1VMLTLcASQ2+fouWH6GsnnoWqgziENRitJSybVJpYvJ/duTbm9bKWcrxMw4XTdVWD7tv+ZgdCXYeusCgf85ls926oq2EWwf2mNRG1/L6kC0FT8rkFRS8EQgTtGoGJ8v4sdCGtsvcmQsIQ7WI9u8r3MIXagmAbHWsU34LLaNpzg28pX7qFTKnwh+noiplTipJMfabxnHaKtNEvkNN2HoqaNSXYWQhGN5inb0QIrG6wp2BTPrQ6S2RbIebwbKoqdkA5OMrxIQn2J3baBXHBNzdbZ6Ods3WkdOvbJSTvM8gL8Y4T6NVGjDLRJuz7Gi+1mokyRbowSOqAEsrN6YZgoXRHqlhtOhKFmhqzUAacmZO8HTBRpzCVNnmkTym7+0bkNHEUJRWG3WXv4sUAP4d9H24kpD3/RgB5dv8tjT4+/AaBXUhx+py9j6oZpMNWZZ8O2rw/6VuVNa5Dzff8lC2b25r64tUtdGrJvitxG2C22f+UKGbWJ2BmSg1Y79QeQ1TIqkTV8V6i53bFaPUHd0KU3/LlVrr7WsesSeOuUGtYfERaFihA== 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)(136003)(39860400002)(396003)(346002)(451199018)(36840700001)(46966006)(40470700004)(70206006)(426003)(336012)(82310400005)(83380400001)(47076005)(40460700003)(86362001)(36756003)(70586007)(8676002)(82740400003)(36860700001)(4326008)(356005)(40480700001)(55016003)(2906002)(41300700001)(7636003)(7696005)(478600001)(110136005)(54906003)(6636002)(6666004)(1076003)(316002)(107886003)(8936002)(5660300002)(2616005)(26005)(6286002)(16526019)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 09:34:46.3910 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 981961ae-02d3-48d8-0307-08db036e6434 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: CO1NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4125 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;