From patchwork Thu Jan 26 23:40:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 122595 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 22BC442498; Fri, 27 Jan 2023 00:41:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E46042D4C; Fri, 27 Jan 2023 00:41:25 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2040.outbound.protection.outlook.com [40.107.212.40]) by mails.dpdk.org (Postfix) with ESMTP id 3858840A7A for ; Fri, 27 Jan 2023 00:41:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NWAuGMnGuPwNsC0s9AtqAvoIClfz7VMWY3WcShJE7y0MAQ5psv5CA0WtVeMF/1cPUNmnU4ehNLCGzWTq0bZVy625N4JJSEg9XtWcqbWtmMqaoofdGqq5mWtTd0uvmCnXEfxhSB8ixtLgv4IDUCKL6cQJHQLIWUL8ldz5dBAe521iPaweDV6pfiX6I110a2vCAdOaZ9ja2JsxcwrebfwyoMGcUuFGFK+wqUMgc5Qo4QHudlfWaNNJCL193eWyA6O4br0z2wFjZ0h/9g6pf6m0He4WlQF1B3hH8y5bKTUV9g84dy5FaX5gAoR2iCmPRMEampEHdQeF2jvgJ+HZqso5+w== 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=aScVNORYfjH28BKrmN3YKQWTDtgNwov62De+vksFYuU=; b=Ign88/yljZG5FYWki1Xtc+v6KCLqf7RSdoVkcw93+kmqc5OjbJu71H9OO+4TNEhw5oUb7N1C1FQH5D57zJAUgoyZSk3xWwO+pJsrKUAs8SnPzpOtpprJA9JxdqqG64QewluYhq+qFLIXGvEfnmsDsQM0bCpr13X61zyq87f2Cwy2ndJT9TB9hRoHGEQyjBSz3t6zK+JkObM2o4d65NUSztOLaEMIMk/VNwvC8aHjS8s0wAPyf3rZnKd01vTa9AiYpKyFkuVTmqfhmhDB1YhPSRZIRhxSZCkhMNnNl/q2bpQzY9AQ7ISI2E60kzht1GZqpCNSAzMNA+wbvda83Il6QA== 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 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=aScVNORYfjH28BKrmN3YKQWTDtgNwov62De+vksFYuU=; b=OfwdcoWHkoLDYEE+FjRqydHG683IHLnuVNF4CZb+RB/hkRMlxJZfhn8Iqh5rE36ciTgEr5VbK/IR+kp+az4EwsRBAg8bghLEz0grUSpxeoS6Y2LJ7JcemfMYOWC7xH9atIYWp13gvWRv79LmnKTtc/vUeedsI5Zcgt1xQGCO1QG7oSpQ9ozzgPF3AkkITlFqehR0RCGwtX/MPi5z9+GuJdSue1CGLz0oi2T7X6jxQR9CN3ulFiknuvFT60r7Sn0ulj/qD390KUDmFbe6rPrBrjQAUW/lXGuAzZQRS+bDINHDFpWsHqgOF+DqZ6gM/tX58ZfwUqt7dmsb+G5I0Ut4RQ== Received: from MW4PR03CA0227.namprd03.prod.outlook.com (2603:10b6:303:b9::22) by DM4PR12MB5264.namprd12.prod.outlook.com (2603:10b6:5:39c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Thu, 26 Jan 2023 23:41:21 +0000 Received: from CO1NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b9:cafe::79) by MW4PR03CA0227.outlook.office365.com (2603:10b6:303:b9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22 via Frontend Transport; Thu, 26 Jan 2023 23:41:21 +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 CO1NAM11FT024.mail.protection.outlook.com (10.13.174.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.21 via Frontend Transport; Thu, 26 Jan 2023 23:41:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.36; Thu, 26 Jan 2023 15:41:14 -0800 Received: from pegasus01.mtr.labs.mlnx (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; Thu, 26 Jan 2023 15:41:11 -0800 From: Alexander Kozyrev To: CC: , , , , Subject: [PATCH 1/4] net/mlx5: add table insertion type and hash function Date: Fri, 27 Jan 2023 01:40:51 +0200 Message-ID: <20230126234054.3960463-2-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20230126234054.3960463-1-akozyrev@nvidia.com> References: <20230126234054.3960463-1-akozyrev@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT024:EE_|DM4PR12MB5264:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d80639e-b3f7-4c0e-2554-08dafff6d44d 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: Yw8mflE5cyeDyK4OIsEGGX5nmn8iITOvLAcvkajBBoEjwoo962NU9I33xbnQDIrl0CUs1HCeKB96VMr7EdLmkkof1jBRqnp5gKOUMHQ7ESQDeLOM19NIlZjrAycQXaZOgchHnr9NFQUfX3NaTe8LGYY8tdtvM+IuEclytRLy6LeUuOUoXi7ItqdMeePPOAwFLVtdxC7oBSg7AChOd/tQqRX4MRfooXJwXo9Z2dhC+jFgDiowRe20Tm7DHZC7AC1gI/wSG87fl4FoFQf48APEFAzfzI6VPF+Sk3WMqpC3zX2mvrg6Vtq0NiMt/9xrXYlZjyK4yE9UpAuc0AFOJA35AyVL3oQuMJ1AejxhNxESYHXgT4NgDb2DLNn+I7Pu2rA5qom596DoPxAN6V6K9+G1wAkK4ct++dF+bZN+Z6H8El1qhRdFENIoPigCcMsM3YZWwqukxywyPd6NRrHBVQUV3TEMJ2od1ANVRbzWtfDDX0jiPpPPgcaETN4OE+hefiBITHA+pKc9edQoHOjrEGjbgOkjTidIdKPjwnRNktUB/Kw9KHQ49SLxXrziPSZmCXX8Qub2qcCi5FzJLEsD8mxbb4DEFEBAthYqvh4ldcFFrSYT8YWlFOfsVmpOnDqoDGPK0BiDBkkxDSKI9g52J02J3h2ZnYXSiTZlT9+i/VDEzgSs+cpz8V2Y9yDjGIXPoFpW6PA2QR/30FaOg7phl/30ngk2aXZBHO1AfUjCVDiIB7I= 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:(13230025)(4636009)(39860400002)(346002)(136003)(376002)(396003)(451199018)(40470700004)(46966006)(36840700001)(40460700003)(7636003)(2906002)(356005)(36860700001)(1076003)(2616005)(107886003)(186003)(26005)(16526019)(6666004)(426003)(86362001)(83380400001)(40480700001)(336012)(4326008)(6916009)(70586007)(47076005)(5660300002)(8676002)(36756003)(70206006)(41300700001)(316002)(54906003)(82740400003)(8936002)(478600001)(82310400005)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2023 23:41:21.4272 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d80639e-b3f7-4c0e-2554-08dafff6d44d 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: CO1NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5264 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 Pass the insertion type and hash calculation function of a table to the mlx5 PMD driver. Create appropriate table as requested. Note that 16-bit checksum hash calculation is not supported yet. Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_hw.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 20c71ff7f0..8002c88e4a 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -154,6 +154,23 @@ static const struct rte_flow_item_eth ctrl_rx_eth_bcast_spec = { .src.addr_bytes = "\x00\x00\x00\x00\x00\x00", .type = 0, }; +static inline enum mlx5dr_matcher_insert_mode +flow_hw_matcher_insert_mode_get(enum rte_flow_table_insertion_type insert_type) +{ + if (insert_type == RTE_FLOW_TABLE_INSERTION_TYPE_PATTERN) + return MLX5DR_MATCHER_INSERT_BY_HASH; + else + return MLX5DR_MATCHER_INSERT_BY_INDEX; +} + +static inline enum mlx5dr_matcher_distribute_mode +flow_hw_matcher_distribute_mode_get(enum rte_flow_table_hash_func hash_func) +{ + if (hash_func == RTE_FLOW_TABLE_HASH_FUNC_LINEAR) + return MLX5DR_MATCHER_DISTRIBUTE_BY_LINEAR; + else + return MLX5DR_MATCHER_DISTRIBUTE_BY_HASH; +} /** * Set the hash fields according to the @p rss_desc information. @@ -3052,7 +3069,7 @@ flow_hw_table_create(struct rte_eth_dev *dev, .type = "mlx5_hw_table_flow", }; struct mlx5_list_entry *ge; - uint32_t i, max_tpl = MLX5_HW_TBL_MAX_ITEM_TEMPLATE; + uint32_t i = 0, max_tpl = MLX5_HW_TBL_MAX_ITEM_TEMPLATE; uint32_t nb_flows = rte_align32pow2(attr->nb_flows); bool port_started = !!dev->data->dev_started; int err; @@ -3093,6 +3110,13 @@ flow_hw_table_create(struct rte_eth_dev *dev, matcher_attr.priority = attr->flow_attr.priority; matcher_attr.optimize_using_rule_idx = true; matcher_attr.mode = MLX5DR_MATCHER_RESOURCE_MODE_RULE; + matcher_attr.insert_mode = flow_hw_matcher_insert_mode_get(attr->insertion_type); + if (attr->hash_func == RTE_FLOW_TABLE_HASH_FUNC_CRC16) { + DRV_LOG(ERR, "16-bit checksum hash type is not supported"); + rte_errno = ENOTSUP; + goto it_error; + } + matcher_attr.distribute_mode = flow_hw_matcher_distribute_mode_get(attr->hash_func); matcher_attr.rule.num_log = rte_log2_u32(nb_flows); /* Build the item template. */ for (i = 0; i < nb_item_templates; i++) {