From patchwork Thu Feb 23 07:06:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124438 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 9ED2641D49; Thu, 23 Feb 2023 08:07:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EA1F4303B; Thu, 23 Feb 2023 08:07:06 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2047.outbound.protection.outlook.com [40.107.223.47]) by mails.dpdk.org (Postfix) with ESMTP id 0A2A04021F for ; Thu, 23 Feb 2023 08:07:05 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LJzzEI3fhcGhxUfwk9LHjAV57Xz0rmaRCcJlnatpmJcJ/DET6ZfDmg+TcsxMaCAXycAJ08jDLX2WsQ3cqeVceBbJ880r766uPItHCwz+wrUFaJ9HRePVAQa0IFkUgdvIMqNoeN/HdkSJwI15hpDbOCx705geVH8eukOp2td+vVxBDeU+HyNl/30A/qrKeho3M1mqMCtgbUkr0fSx81CzSYVXZKc1A9p7o40v/8JtKaLmjAplIdOqDVHbX5JpJSGg4PcseoccQmo0ryzGbMFzV7RIcdHzWH8Nfxv8KEe/CvF9NDVtgRjQxKFsdIrzfUOXASCR2lLZAoQ7Vs+PWDxN9A== 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=NkMIb8+I0/9K5DCQyjCjiDhYovm5r1KvsWyraP74MCo=; b=Qgv0SB4924EgH6FBxUjhepyARcKGt5svwMOhjH+97lXtY6aQWOdbFhMi93psxm0zM+TXzZFyX9QmQ8g4/R0EbCBd2fLRjEEwECA/NNMIsw556+sNygoeKcg/+Ec51rpd+HdX4hRKWDyvUEBVWpYPjZnIfONRMN6uJ2QpHRY+d6QAxyse6nRcBqfGGZc4tDcyQDlhm5GAG65HLSNWcXxCVmExrIt0nUbws/ZfEDYfFxjNFAQiDo7BYoDW+rYGrMBVbSb357cFKDZThVeoqaz1J6GPMdr1P6EnrhLEpSJhAbjax0zjNm93acD5tPyxMJ4lHBbpluqgBVVVCeWpdtOKCw== 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 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=NkMIb8+I0/9K5DCQyjCjiDhYovm5r1KvsWyraP74MCo=; b=dJdIjQ/XT4DeVJmlZoFMPBGP49ToPXn3pvk6b85maUdssxQnLkkUoVGDBlrPbDqf4tMcxJtlNIbhLMH3uTbPsc8XAK6rmZ67ixhlMylstz20nzZuvokigS7lPxSwQa5MFFLhtdMlmxAVm8cMsrWjxO0Xuts4mHr0BtQC7UuNwSUo7037+++i107Ox/VfH5V2mAowZawiUX8h03F/8MRGe3a2Wkty7Z/i71F8e33sgCVXaCmO/8v6PfR8/9Qt3gj9ZuDV5VfzjTMWyM6ycV7kexzhXaIL0P6ezPFOFlhLrUczjw+Nu9byeHRHTBFdIlKC8TCt1MhngeWfOLfWZdFkeA== Received: from DS7PR06CA0038.namprd06.prod.outlook.com (2603:10b6:8:54::19) by MN2PR12MB4221.namprd12.prod.outlook.com (2603:10b6:208:1d2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Thu, 23 Feb 2023 07:07:03 +0000 Received: from CY4PEPF0000C976.namprd02.prod.outlook.com (2603:10b6:8:54:cafe::94) by DS7PR06CA0038.outlook.office365.com (2603:10b6:8:54::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:03 +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 CY4PEPF0000C976.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.14 via Frontend Transport; Thu, 23 Feb 2023 07:07:03 +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; Wed, 22 Feb 2023 23:06:50 -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; Wed, 22 Feb 2023 23:06:48 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v3 1/7] net/mlx5: enable hws flex item create Date: Thu, 23 Feb 2023 09:06:27 +0200 Message-ID: <20230223070633.946328-2-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: CY4PEPF0000C976:EE_|MN2PR12MB4221:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b430919-8af1-46b1-6dc0-08db156c90b7 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: cIlqfphWf8GbRCef1f9VzZP37wIA3lb0wH+210EA1vkJBVa/Fs/FjDH1hCmTPzs8DupaIXlj9SqJPlZ4u4aKatRo76DkzVGJUHDBUql15yl5awiI7Q+kk7L5A3q0ZJMfeAZID92UTYChZ3k0If7rdl7fhNRwReZKZC8noaTdgs4jzo7imdzSoGs0zQaf3zZpyzreH2R/5nWVwDJpaOagZlaMEgs4za1bxmJPNn+MP1jOHQ3jmvIJc3Jx3aOJy7ccMeTZ7Fcij2g+H6sNuSWOM57LW2U74U7/qnyZr0bl4O/2yJsvpiACd6gElKimVesHXov03mSo3N+2xRSFlz9ibO8YBi0tCOZWtSH2ZcOEOf/ED22oWCbvkwnM8uM8UetZzvJfV4tSy25BF9kEMTzd0oW6CROQwcboPSiWWm6aL2dExvwmseZs17oJnVyc/FuhhjIu7QlPdJ0o/mVucTbiJQ7BykuXZ5D7EzCdqVExrs91Mr3UBPeC2BxXuZ70wvE/IwT5DPFZMWt+HBKOlrRdYEMuEbwRnx+PvCiWW5ZjhNY0nNjkJ7XwScgTzpyI0PBBEnrfb4VFiQ48qa3GjSqc7koBNfM2F8qKqT1MIejeVLOJJm4tJ9OOoq9YVwRb0BE60iCsKMPtcDy4WgF8wjleDo6mJ80yl6X8uABj6eId38RoKzoZab3Os9WuFrLQ7zhjOloTP9x7mMGK7cUftl63rw== 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)(136003)(346002)(376002)(39860400002)(396003)(451199018)(40470700004)(36840700001)(46966006)(36756003)(82310400005)(47076005)(83380400001)(110136005)(426003)(336012)(316002)(6666004)(107886003)(7696005)(70586007)(478600001)(5660300002)(41300700001)(2616005)(1076003)(6286002)(26005)(16526019)(186003)(40460700003)(356005)(40480700001)(2906002)(86362001)(8936002)(4326008)(82740400003)(36860700001)(55016003)(70206006)(8676002)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:03.0242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b430919-8af1-46b1-6dc0-08db156c90b7 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: CY4PEPF0000C976.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4221 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 Enable flex item create and destroy with dv_flow_en=2 Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 27 +++++++++++++++------------ drivers/net/mlx5/mlx5_flow_hw.c | 2 ++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index a71474c90a..f5b3edea99 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -474,10 +474,20 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv) err = mlx5_alloc_table_hash_list(priv); if (err) goto error; - if (priv->sh->config.dv_flow_en == 2) - return 0; /* The resources below are only valid with DV support. */ #ifdef HAVE_IBV_FLOW_DV_SUPPORT + /* Init shared flex parsers list, no need lcore_share */ + snprintf(s, sizeof(s), "%s_flex_parsers_list", sh->ibdev_name); + sh->flex_parsers_dv = mlx5_list_create(s, sh, false, + mlx5_flex_parser_create_cb, + mlx5_flex_parser_match_cb, + mlx5_flex_parser_remove_cb, + mlx5_flex_parser_clone_cb, + mlx5_flex_parser_clone_free_cb); + if (!sh->flex_parsers_dv) + goto error; + if (priv->sh->config.dv_flow_en == 2) + return 0; /* Init port id action list. */ snprintf(s, sizeof(s), "%s_port_id_action_list", sh->ibdev_name); sh->port_id_action_list = mlx5_list_create(s, sh, true, @@ -518,16 +528,9 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv) flow_dv_dest_array_clone_free_cb); if (!sh->dest_array_list) goto error; - /* Init shared flex parsers list, no need lcore_share */ - snprintf(s, sizeof(s), "%s_flex_parsers_list", sh->ibdev_name); - sh->flex_parsers_dv = mlx5_list_create(s, sh, false, - mlx5_flex_parser_create_cb, - mlx5_flex_parser_match_cb, - mlx5_flex_parser_remove_cb, - mlx5_flex_parser_clone_cb, - mlx5_flex_parser_clone_free_cb); - if (!sh->flex_parsers_dv) - goto error; +#else + if (priv->sh->config.dv_flow_en == 2) + return 0; #endif #ifdef HAVE_MLX5DV_DR void *domain; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 7457187b19..9e1912ec69 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -8436,6 +8436,8 @@ const struct mlx5_flow_driver_ops mlx5_flow_hw_drv_ops = { .query = flow_hw_query, .get_aged_flows = flow_hw_get_aged_flows, .get_q_aged_flows = flow_hw_get_q_aged_flows, + .item_create = flow_dv_item_create, + .item_release = flow_dv_item_release, }; /** From patchwork Thu Feb 23 07:06:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124440 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 4B3E641D49; Thu, 23 Feb 2023 08:07:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBA9643050; Thu, 23 Feb 2023 08:07:11 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 71D4A43004 for ; Thu, 23 Feb 2023 08:07:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f79Pn2WC2tfArEoTTa6DrkabDP2ZYd0ve/OyIUM/PsE5PJkJAiPwXmlAnc0OGhQefr6sjTnLFvX7dXKNvVY+wu+5sDX8VBOAA69y1oMIl5BoDo2A0pWv7PXzMjLf6SpdAG7LIA60K1Zr8IdJmiYkrAax3Nl2gUTw1eBaTjR3uZRWjON/XdShalP+M7C1G5XWAtJapmWz+CCQN6XLOhQr7+Jy5aHFuf/rw4BiIYUS6h45azCMTmqPRO+cze0/3iKYKAcsxgRNhoyWH5rPcFLZqbfm2JHaQ9SImRaFqFG+4Ye6Dj0VGk0/BO8zYtrNpwO5XGJcWLbePfyRB3a9bGlXJQ== 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=Zp3vqGI3qVcCsPxn+zscWx8Gns2dOgYkyVLKY2jsXw8=; b=DkqQ3Lojtmb4T+SgNGDiNfSNmFQDX3dkiRLuTrWv0TVbBGDjJvhf04iTNLfzBdOr86qxJVSc2ubkOnX3JDC+3Htmc0bKU9SdB4g6jEenjOR/kGk1e+BHaUA9Qfab2ndeSSEJuTLQvApVaBFsw3KlA+Lbb3mgqzGewcaNUwBWCt1KplBepWMF3I+H/Vs4EqKWvVlQ7m+joAgtaM6WtI7cSsw7I5ns8GjAIx23WBRSL55vXg4zIo6olgPZ6D8pmsMyJxwTKlxEUrD8f7secNgNgH5ejx/QCD2pK/06tkzACuTAk2LQkbQeZsmhSIsWtIH/Bo426F2sxsRWsBwCOneTWw== 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=Zp3vqGI3qVcCsPxn+zscWx8Gns2dOgYkyVLKY2jsXw8=; b=rMlZQhfbgG+mj6qBJ4bwpAlQZJ66O9Mv8JZj09hJFFAyJGGE3cfDO1kAngCo4KoaL1Hm6vg2ajiefcn4Rf8IZ1thEeyD8TKY8krjdCZjk/Hyej7wUMDXT89KABbTtp9i4mEaxGTuTm81403un/KeozA3yCjuwM5McDhl1rAr/TkTj/VruGrxRsOn7J3rb/iE6vlTZXLmZWdkZO8aXWb0nINxGG689k0p5btbItsMksNd1zmpkA4QbdM+iaDUrMGmMOGT01/lfbgNgtfebSgsiNpevgAiWhOoSyIQAKO7WZ3tiF4jHfee2z+JX4Z//64vPpqDfrsG9ZgRntdxuk7b4A== Received: from BN0PR04CA0202.namprd04.prod.outlook.com (2603:10b6:408:e9::27) by CH2PR12MB4953.namprd12.prod.outlook.com (2603:10b6:610:36::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Thu, 23 Feb 2023 07:07:06 +0000 Received: from BN8NAM11FT074.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e9:cafe::a9) by BN0PR04CA0202.outlook.office365.com (2603:10b6:408:e9::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:06 +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 BN8NAM11FT074.mail.protection.outlook.com (10.13.176.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:06 +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; Wed, 22 Feb 2023 23:06:53 -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; Wed, 22 Feb 2023 23:06:51 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v3 2/7] net/mlx5: add IPv6 protocol as flex item input Date: Thu, 23 Feb 2023 09:06:28 +0200 Message-ID: <20230223070633.946328-3-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: BN8NAM11FT074:EE_|CH2PR12MB4953:EE_ X-MS-Office365-Filtering-Correlation-Id: dc64e072-4cb4-4969-0e6a-08db156c92ab 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: vl/73O2IqNG2iDjLjkg6quhS66ovWdh3lItJ1aZ5t+vRuhVOs1bP2OFG+WaKcohuUG6GNd4/VDU/BMJAuniE3P+zGad+sGS5Xl6NeXTb6cAPhCeLTcOLJ818LVMxC2xkvbIM1XX8OlPnb8qtZ6lwiIvuwhKrv2YBuHsCoAuaF8KVkUud/aLYUVdMgKTVJtHuFNzAvCMoqGKjdTqvskShl3n+wAVZKngMOS4Qb/8t0to3e4lEw5PAuH0X/Mpjzvl7W6wQpnrM8ZxM/Zrdm1x9YAGvUVvQr20gKiVv0wJCRFpnXvWq0+3Q5SfXu14ENuWRImGv74MzE26cbmViIR71MkLi/+Gdupcbqh9fQSa6043Pvx1rgyr/RbSTteWEUokvoHJBL+1fPCREj+/n3r/maHYgo4V75dtgAC3VjaWDZqDrFxbHSmxHCXBRtURHVEyuSvf8L7te0gCtLKVTlAf4R+uQw2/abIsvvqPdht3dWuPuHobTThPUJlUKWAIcIsuJ1qbm8pht7kZtAlfAbuzPd4l8sIeEm09SBVp8Mk1SB0QqFWO8sVWYk5nJNanxc3OKRV6CX04Q23rv8llI9+pljRUE8LVusJQ1IDDV8NWtNO+btZOdwbgmZObrImfMgeUiuCEtxV72PxeicVe7R0c+UGJ6eyCR2LnDT0lAiJZ/KxYFBJyGyn7fGYhL3HZ1zf5OUk8lNNhYpMgj9G6oXu8KXGwBQ1k4NPGhHBRKSa/MxG8= 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)(396003)(346002)(39860400002)(376002)(136003)(451199018)(36840700001)(40470700004)(46966006)(316002)(110136005)(47076005)(478600001)(426003)(7636003)(36756003)(82740400003)(2906002)(82310400005)(86362001)(356005)(40460700003)(70206006)(70586007)(4326008)(8676002)(55016003)(8936002)(41300700001)(40480700001)(5660300002)(34020700004)(36860700001)(2616005)(26005)(7696005)(186003)(1076003)(6666004)(107886003)(16526019)(336012)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:06.2361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc64e072-4cb4-4969-0e6a-08db156c92ab 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: BN8NAM11FT074.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4953 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 Support IPv6 protocol as new flex item input link. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_flex.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index 35f2a9923d..24b7226ee6 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -1050,6 +1050,22 @@ mlx5_flex_arc_in_udp(const struct rte_flow_item *item, return rte_be_to_cpu_16(spec->hdr.dst_port); } +static int +mlx5_flex_arc_in_ipv6(const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + const struct rte_flow_item_ipv6 *spec = item->spec; + const struct rte_flow_item_ipv6 *mask = item->mask; + struct rte_flow_item_ipv6 ip = { .hdr.proto = 0xff }; + + if (memcmp(mask, &ip, sizeof(struct rte_flow_item_ipv6))) { + return rte_flow_error_set + (error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM, item, + "invalid ipv6 item mask, full mask is desired"); + } + return spec->hdr.proto; +} + static int mlx5_flex_translate_arc_in(struct mlx5_hca_flex_attr *attr, const struct rte_flow_item_flex_conf *conf, @@ -1096,6 +1112,9 @@ mlx5_flex_translate_arc_in(struct mlx5_hca_flex_attr *attr, case RTE_FLOW_ITEM_TYPE_UDP: ret = mlx5_flex_arc_in_udp(rte_item, error); break; + case RTE_FLOW_ITEM_TYPE_IPV6: + ret = mlx5_flex_arc_in_ipv6(rte_item, error); + break; default: MLX5_ASSERT(false); return rte_flow_error_set From patchwork Thu Feb 23 07:06:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124441 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 439CD41D49; Thu, 23 Feb 2023 08:07:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7AFC43084; Thu, 23 Feb 2023 08:07:12 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2053.outbound.protection.outlook.com [40.107.244.53]) by mails.dpdk.org (Postfix) with ESMTP id CFB7543004 for ; Thu, 23 Feb 2023 08:07:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UyuXX2XNwIur8Y1KI8AFaK9zkHR5k3h/hIgGmQJt2sPy/l+S2w7iygfvPa0IqjCkWUberKCINncj6JnuLpnJlAnPCN2fGmayUqnqLdQsKrl/rXfmB11gRRM65V+mPzvYhgDQoCZ+RPkfCyAGawdB/wSliNWO4NxkUjlXWcMz2LsXprsQvTzgjEieBQz3WiHRSdj+sApS6049JUUEyfZpwNd6daRZnRNTyqqwD6UTXsCyPYCN1rgkTc2qm0HwQQ65sEG4K8lVoi5SIE+12zeY7YD3KeULDNbJvHzM1zEfmkY+1G7o9oZe2uD3nOIFZwNOkR6WZjvC8C1QxNOIX0CgvA== 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=WDN5I8ZMXYdLhKQ/5b8m2i3K+gwB6S7IMcrhuw7730w=; b=mNwQ+4etbc682aOUcMIolpKCBAAjLx7ekDHsYgUDr4c54kSQlqXgHTXUZnCm9q6CAiYzvfvTRwKkAHp+8ySwAYRi3gB44so/TKlhGYXNVkuna43eC3Djj9AS8gz3dEozNYKNPaWxU05wIUx8d7JSJ+b4OCoDphtL5XCBBjGOyF6s1cEbJmpXx1XAgEyR/hFmHna2taXPgxLZwoJrKvaS6ulxvsV2VCqlPPGwQR9GryGyiIAABW3/duW4UBmMZGUuy6xGdPbGLol77yxNSBKXUEkt6UzvbRmn+f6n2DNgo77w7IQx/6wNfb95K2VS260jJWchtDsXT8S26q0zh0w1AA== 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 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=WDN5I8ZMXYdLhKQ/5b8m2i3K+gwB6S7IMcrhuw7730w=; b=WURT3Q9oe6Pc0ibbEXXwiObzG3m7NPCA5s5XBTDYXT60M1Q62/lvt0RPBfjl4r8VO+AKFJ36/A5ZaVmlL8u8Kpzdni0qZRUp9CGIihEvjXXwDuXHBai0QGNlnQnC9QD6Pq5cjim2C4IGZpYOcMOaOm+30iEkCwT5FWlkPnDoz/9xVPEKGcoSjZFnhw7u+PTu7Vt/JFeVIZkrVmaUBqEoWwqvb0gXMQAkzwrvDbSgpLMXaMaI/Bw7d54kjeqHI6YAIEbdWoDzluqCaFlkwZBiF8lLLROssqXpq22qMxVtmcIYFHaP+AOFhu4JiOWk0ANK/fAZtcSEWaRyp2regmhSeg== Received: from DS7PR06CA0040.namprd06.prod.outlook.com (2603:10b6:8:54::28) by BL1PR12MB5945.namprd12.prod.outlook.com (2603:10b6:208:398::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21; Thu, 23 Feb 2023 07:07:07 +0000 Received: from CY4PEPF0000C976.namprd02.prod.outlook.com (2603:10b6:8:54:cafe::ab) by DS7PR06CA0040.outlook.office365.com (2603:10b6:8:54::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:07 +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 CY4PEPF0000C976.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.14 via Frontend Transport; Thu, 23 Feb 2023 07:07:07 +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; Wed, 22 Feb 2023 23:06:55 -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; Wed, 22 Feb 2023 23:06:53 -0800 From: Rongwei Liu To: , , , , CC: , Alex Vesker Subject: [PATCH v3 3/7] net/mlx5/hws: add hws flex item matching support Date: Thu, 23 Feb 2023 09:06:29 +0200 Message-ID: <20230223070633.946328-4-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: CY4PEPF0000C976:EE_|BL1PR12MB5945:EE_ X-MS-Office365-Filtering-Correlation-Id: c9c17efd-c34d-40f2-b65c-08db156c9325 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: +h64S8pnHUyfm9rW4XvWecWNbdRL1Q67ZrXbzpch9gHs5MSlzwd/y1VgBFKhZdDoZFzVMfJF+VrAmNVC7tEOIyuwDuKMuUj4bBhp5gb2Phj/j4ZurBE0yQLYrpp1V3BnxkH3UHeZU3O/tq6wcp8UIBIZYXkiZROOgVLg2sbf8wVtXMFE151KR552P113g+8VgaFPfHdiSFLoE5NjKtcBhK7/8yzNurNccX3xCe6l7eF7oDuLAEJ+rwGq3DzJzk2NQdY3V0zLStHlDOxHF0Vz5Ng5ZLHdE8ZB1xbc8Dw/wTX+1xOSFIkRzA9Dq68bHxNsSmqgijT9j98vLo77Z0AdbIbLfUcJGfFaNoe7FY8Vxfi5oJU9KQIPaQsiCCF0RMbMzf8sy0hmsylFBwIQaROSmJHp+Gd57/eNg5bOHpCI1ZJ77/ZY0s8OHRDZvcWOzy6QThaInEZCFsbSHRca3hfcYRI+4z0sUKb+VBymqRkxuGq0wy8ctPaVvWD/lZauBY2y2gAne7ZK6Vzl4WaA3X2eqhsvwI9vlbVrpHpTF6esBILmCVaGzupeUc39F+jxlwZ5Ky+TFmN/1ayFK2URExwHM9sQ2Dr8LmMuVAjZDblGdXZDtlu0bR55ZSpwfR40ApgFcLES8RhTwSbBtXdUmoqDGBXAYzRiP2+nFyscRIDVXAH6AZ2iuDcQKq6dPsby/oCGg+dvhaGSBpUNBuYt275ong== 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)(136003)(396003)(346002)(376002)(39860400002)(451199018)(46966006)(40470700004)(36840700001)(356005)(47076005)(82740400003)(336012)(426003)(2616005)(7636003)(82310400005)(36860700001)(83380400001)(36756003)(40460700003)(110136005)(7696005)(54906003)(55016003)(2906002)(316002)(26005)(186003)(1076003)(6286002)(6666004)(16526019)(107886003)(478600001)(40480700001)(86362001)(8936002)(41300700001)(5660300002)(8676002)(70206006)(70586007)(4326008)(30864003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:07.0868 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9c17efd-c34d-40f2-b65c-08db156c9325 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: CY4PEPF0000C976.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5945 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 Support flex item matching in hws and syntax follows sws exactly. Flex item should be created in advance and follow current json mapping logic. Signed-off-by: Rongwei Liu Reviewed-by: Alex Vesker Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/hws/mlx5dr_definer.c | 83 ++++++++++++++++++ drivers/net/mlx5/mlx5.c | 2 +- drivers/net/mlx5/mlx5.h | 6 ++ drivers/net/mlx5/mlx5_flow.h | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 2 +- drivers/net/mlx5/mlx5_flow_flex.c | 116 ++++++++++++++++++++++---- drivers/net/mlx5/mlx5_flow_hw.c | 48 ++++++++++- 7 files changed, 239 insertions(+), 19 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 6374f9df33..5b78092843 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -311,6 +311,43 @@ mlx5dr_definer_ipv6_routing_ext_set(struct mlx5dr_definer_fc *fc, DR_SET(tag, val, fc->byte_off, 0, fc->bit_mask); } +static void +mlx5dr_definer_flex_parser_set(struct mlx5dr_definer_fc *fc, + const void *item, + uint8_t *tag, bool is_inner) +{ + const struct rte_flow_item_flex *flex = item; + uint32_t byte_off, val, idx; + int ret; + + val = 0; + byte_off = MLX5_BYTE_OFF(definer_hl, flex_parser.flex_parser_0); + idx = fc->fname - MLX5DR_DEFINER_FNAME_FLEX_PARSER_0; + byte_off -= idx * sizeof(uint32_t); + ret = mlx5_flex_get_parser_value_per_byte_off(flex, flex->handle, byte_off, + false, is_inner, &val); + if (ret == -1 || !val) + return; + + DR_SET(tag, val, fc->byte_off, 0, fc->bit_mask); +} + +static void +mlx5dr_definer_flex_parser_inner_set(struct mlx5dr_definer_fc *fc, + const void *item, + uint8_t *tag) +{ + mlx5dr_definer_flex_parser_set(fc, item, tag, true); +} + +static void +mlx5dr_definer_flex_parser_outer_set(struct mlx5dr_definer_fc *fc, + const void *item, + uint8_t *tag) +{ + mlx5dr_definer_flex_parser_set(fc, item, tag, false); +} + static void mlx5dr_definer_gre_key_set(struct mlx5dr_definer_fc *fc, const void *item_spec, @@ -1782,6 +1819,47 @@ mlx5dr_definer_conv_item_esp(struct mlx5dr_definer_conv_data *cd, return 0; } +static int +mlx5dr_definer_conv_item_flex_parser(struct mlx5dr_definer_conv_data *cd, + struct rte_flow_item *item, + int item_idx) +{ + uint32_t base_off = MLX5_BYTE_OFF(definer_hl, flex_parser.flex_parser_0); + const struct rte_flow_item_flex *v, *m; + enum mlx5dr_definer_fname fname; + struct mlx5dr_definer_fc *fc; + uint32_t i, mask, byte_off; + bool is_inner = cd->tunnel; + int ret; + + m = item->mask; + v = item->spec; + mask = 0; + for (i = 0; i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) { + byte_off = base_off - i * sizeof(uint32_t); + ret = mlx5_flex_get_parser_value_per_byte_off(m, v->handle, byte_off, + true, is_inner, &mask); + if (ret == -1) { + rte_errno = EINVAL; + return rte_errno; + } + + if (!mask) + continue; + + fname = MLX5DR_DEFINER_FNAME_FLEX_PARSER_0; + fname += (enum mlx5dr_definer_fname)i; + fc = &cd->fc[fname]; + fc->byte_off = byte_off; + fc->item_idx = item_idx; + fc->tag_set = cd->tunnel ? &mlx5dr_definer_flex_parser_inner_set : + &mlx5dr_definer_flex_parser_outer_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + fc->bit_mask = mask; + } + return 0; +} + static int mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, struct mlx5dr_match_template *mt, @@ -1913,6 +1991,11 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, ret = mlx5dr_definer_conv_item_esp(&cd, items, i); item_flags |= MLX5_FLOW_ITEM_ESP; break; + case RTE_FLOW_ITEM_TYPE_FLEX: + ret = mlx5dr_definer_conv_item_flex_parser(&cd, items, i); + item_flags |= cd.tunnel ? MLX5_FLOW_ITEM_INNER_FLEX : + MLX5_FLOW_ITEM_OUTER_FLEX; + break; default: DR_LOG(ERR, "Unsupported item type %d", items->type); rte_errno = ENOTSUP; diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index cfc4609448..9b9ece7ad0 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1033,7 +1033,7 @@ static void mlx5_flex_parser_ecpri_release(struct rte_eth_dev *dev) { struct mlx5_priv *priv = dev->data->dev_private; - struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser; + struct mlx5_ecpri_parser_profile *prf = &priv->sh->ecpri_parser; if (prf->obj) mlx5_devx_cmd_destroy(prf->obj); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index a766fb408e..af6380bc80 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -2257,6 +2257,12 @@ void mlx5_flex_item_port_cleanup(struct rte_eth_dev *dev); void mlx5_flex_flow_translate_item(struct rte_eth_dev *dev, void *matcher, void *key, const struct rte_flow_item *item, bool is_inner); +int mlx5_flex_get_sample_id(const struct mlx5_flex_item *tp, + uint32_t idx, uint32_t *pos, + bool is_inner, uint32_t *def); +int mlx5_flex_get_parser_value_per_byte_off(const struct rte_flow_item_flex *item, + void *flex, uint32_t byte_off, + bool is_mask, bool tunnel, uint32_t *value); int mlx5_flex_acquire_index(struct rte_eth_dev *dev, struct rte_flow_item_flex_handle *handle, bool acquire); diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 4bef2296b8..ae2fc0aabe 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1229,6 +1229,7 @@ struct rte_flow_pattern_template { * tag pattern item for representor matching. */ bool implicit_tag; + uint8_t flex_item; /* flex item index. */ }; /* Flow action template struct. */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f93dd4073c..9e7ab08b32 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -10668,7 +10668,7 @@ flow_dv_translate_item_flex(struct rte_eth_dev *dev, void *matcher, void *key, (const struct rte_flow_item_flex *)item->spec; int index = mlx5_flex_acquire_index(dev, spec->handle, false); - MLX5_ASSERT(index >= 0 && index <= (int)(sizeof(uint32_t) * CHAR_BIT)); + MLX5_ASSERT(index >= 0 && index < (int)(sizeof(uint32_t) * CHAR_BIT)); if (index < 0) return; if (!(dev_flow->handle->flex_item & RTE_BIT32(index))) { diff --git a/drivers/net/mlx5/mlx5_flow_flex.c b/drivers/net/mlx5/mlx5_flow_flex.c index 24b7226ee6..aa317fc958 100644 --- a/drivers/net/mlx5/mlx5_flow_flex.c +++ b/drivers/net/mlx5/mlx5_flow_flex.c @@ -198,6 +198,99 @@ mlx5_flex_set_match_sample(void *misc4_m, void *misc4_v, } #undef SET_FP_MATCH_SAMPLE_ID } + +/** + * Get the flex parser sample id and corresponding mask + * per shift and width information. + * + * @param[in] tp + * Mlx5 flex item sample mapping handle. + * @param[in] idx + * Mapping index. + * @param[in, out] pos + * Where to search the value and mask. + * @param[in] is_inner + * For inner matching or not. + * @param[in, def] def + * Mask generated by mapping shift and width. + * + * @return + * 0 on success, -1 to ignore. + */ +int +mlx5_flex_get_sample_id(const struct mlx5_flex_item *tp, + uint32_t idx, uint32_t *pos, + bool is_inner, uint32_t *def) +{ + const struct mlx5_flex_pattern_field *map = tp->map + idx; + uint32_t id = map->reg_id; + + *def = (RTE_BIT64(map->width) - 1) << map->shift; + /* Skip placeholders for DUMMY fields. */ + if (id == MLX5_INVALID_SAMPLE_REG_ID) { + *pos += map->width; + return -1; + } + MLX5_ASSERT(map->width); + MLX5_ASSERT(id < tp->devx_fp->num_samples); + if (tp->tunnel_mode == FLEX_TUNNEL_MODE_MULTI && is_inner) { + uint32_t num_samples = tp->devx_fp->num_samples / 2; + + MLX5_ASSERT(tp->devx_fp->num_samples % 2 == 0); + MLX5_ASSERT(id < num_samples); + id += num_samples; + } + return id; +} + +/** + * Get the flex parser mapping value per definer format_select_dw. + * + * @param[in] item + * Rte flex item pointer. + * @param[in] flex + * Mlx5 flex item sample mapping handle. + * @param[in] byte_off + * Mlx5 flex item format_select_dw. + * @param[in] is_mask + * Spec or mask. + * @param[in] tunnel + * Tunnel mode or not. + * @param[in, def] value + * Value calculated for this flex parser, either spec or mask. + * + * @return + * 0 on success, -1 for error. + */ +int +mlx5_flex_get_parser_value_per_byte_off(const struct rte_flow_item_flex *item, + void *flex, uint32_t byte_off, + bool is_mask, bool tunnel, uint32_t *value) +{ + struct mlx5_flex_pattern_field *map; + struct mlx5_flex_item *tp = flex; + uint32_t def, i, pos, val; + int id; + + *value = 0; + for (i = 0, pos = 0; i < tp->mapnum && pos < item->length * CHAR_BIT; i++) { + map = tp->map + i; + id = mlx5_flex_get_sample_id(tp, i, &pos, tunnel, &def); + if (id == -1) + continue; + if (id >= (int)tp->devx_fp->num_samples || id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return -1; + if (byte_off == tp->devx_fp->sample_ids[id].format_select_dw * sizeof(uint32_t)) { + val = mlx5_flex_get_bitfield(item, pos, map->width, map->shift); + if (is_mask) + val &= RTE_BE32(def); + *value |= val; + } + pos += map->width; + } + return 0; +} + /** * Translate item pattern into matcher fields according to translation * array. @@ -240,26 +333,17 @@ mlx5_flex_flow_translate_item(struct rte_eth_dev *dev, MLX5_ASSERT(mlx5_flex_index(priv, tp) >= 0); for (i = 0; i < tp->mapnum; i++) { struct mlx5_flex_pattern_field *map = tp->map + i; - uint32_t id = map->reg_id; - uint32_t def = (RTE_BIT64(map->width) - 1) << map->shift; - uint32_t val, msk; + uint32_t val, msk, def; + int id = mlx5_flex_get_sample_id(tp, i, &pos, is_inner, &def); - /* Skip placeholders for DUMMY fields. */ - if (id == MLX5_INVALID_SAMPLE_REG_ID) { - pos += map->width; + if (id == -1) continue; - } + MLX5_ASSERT(id < (int)tp->devx_fp->num_samples); + if (id >= (int)tp->devx_fp->num_samples || + id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return; val = mlx5_flex_get_bitfield(spec, pos, map->width, map->shift); msk = mlx5_flex_get_bitfield(mask, pos, map->width, map->shift); - MLX5_ASSERT(map->width); - MLX5_ASSERT(id < tp->devx_fp->num_samples); - if (tp->tunnel_mode == FLEX_TUNNEL_MODE_MULTI && is_inner) { - uint32_t num_samples = tp->devx_fp->num_samples / 2; - - MLX5_ASSERT(tp->devx_fp->num_samples % 2 == 0); - MLX5_ASSERT(id < num_samples); - id += num_samples; - } if (attr->ext_sample_id) sample_id = tp->devx_fp->sample_ids[id].sample_id; else diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 9e1912ec69..1066829ca5 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4343,6 +4343,36 @@ flow_hw_set_vlan_vid_construct(struct rte_eth_dev *dev, &modify_action); } +static int +flow_hw_flex_item_acquire(struct rte_eth_dev *dev, + struct rte_flow_item_flex_handle *handle, + uint8_t *flex_item) +{ + int index = mlx5_flex_acquire_index(dev, handle, false); + + MLX5_ASSERT(index >= 0 && index < (int)(sizeof(uint32_t) * CHAR_BIT)); + if (index < 0) + return -1; + if (!(*flex_item & RTE_BIT32(index))) { + /* Don't count same flex item again. */ + if (mlx5_flex_acquire_index(dev, handle, true) != index) + MLX5_ASSERT(false); + *flex_item |= (uint8_t)RTE_BIT32(index); + } + return 0; +} + +static void +flow_hw_flex_item_release(struct rte_eth_dev *dev, uint8_t *flex_item) +{ + while (*flex_item) { + int index = rte_bsf32(*flex_item); + + mlx5_flex_release_index(dev, index); + *flex_item &= ~(uint8_t)RTE_BIT32(index); + } +} + /** * Create flow action template. * @@ -4748,6 +4778,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, case RTE_FLOW_ITEM_TYPE_CONNTRACK: case RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT: case RTE_FLOW_ITEM_TYPE_ESP: + case RTE_FLOW_ITEM_TYPE_FLEX: break; case RTE_FLOW_ITEM_TYPE_INTEGRITY: /* @@ -4825,6 +4856,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, .mask = &tag_m, .last = NULL }; + unsigned int i = 0; if (flow_hw_pattern_validate(dev, attr, items, error)) return NULL; @@ -4895,6 +4927,19 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, return NULL; } } + for (i = 0; items[i].type != RTE_FLOW_ITEM_TYPE_END; ++i) { + if (items[i].type == RTE_FLOW_ITEM_TYPE_FLEX) { + const struct rte_flow_item_flex *spec = + (const struct rte_flow_item_flex *)items[i].spec; + struct rte_flow_item_flex_handle *handle = spec->handle; + + if (flow_hw_flex_item_acquire(dev, handle, &it->flex_item)) { + claim_zero(mlx5dr_match_template_destroy(it->mt)); + mlx5_free(it); + return NULL; + } + } + } __atomic_fetch_add(&it->refcnt, 1, __ATOMIC_RELAXED); LIST_INSERT_HEAD(&priv->flow_hw_itt, it, next); return it; @@ -4914,7 +4959,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -flow_hw_pattern_template_destroy(struct rte_eth_dev *dev __rte_unused, +flow_hw_pattern_template_destroy(struct rte_eth_dev *dev, struct rte_flow_pattern_template *template, struct rte_flow_error *error __rte_unused) { @@ -4930,6 +4975,7 @@ flow_hw_pattern_template_destroy(struct rte_eth_dev *dev __rte_unused, MLX5_FLOW_ITEM_INNER_IPV6_ROUTING_EXT)) mlx5_free_srh_flex_parser(dev); LIST_REMOVE(template, next); + flow_hw_flex_item_release(dev, &template->flex_item); claim_zero(mlx5dr_match_template_destroy(template->mt)); mlx5_free(template); return 0; From patchwork Thu Feb 23 07:06:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124442 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 1EEEF41D49; Thu, 23 Feb 2023 08:07:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96C50430B5; Thu, 23 Feb 2023 08:07:16 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2040.outbound.protection.outlook.com [40.107.93.40]) by mails.dpdk.org (Postfix) with ESMTP id 1D6D443079 for ; Thu, 23 Feb 2023 08:07:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mK9uu/NJ1l8BuIZYoRoZuZkSyLe/HG2XXKLVYEYkZcXZhnOWaE1KfVBzYl4bzAERELqCsxL7gNFIIxRc8rqHpmPehxc/YQJeA86tSCkRVV4coJiyhVKbI5hyb0oZ0jxFv8Mh9YYfeyxKl+L5xdvH5VMYYNcD2Vuer+EdMduQSzrYB7Bqys1VGl19Y6eOFboP1wHvrAnGUZasU8gfVRr8gc/iM3xbZORhtVq9kbv98UmAYx6j4cNlDoPwE4sNTxGvxYk8r1emnUfzpOAaO4HKdVI8ns8uoqh0QjQB2zubJguPJf8+43W5gvDGIOA/Fi9Y25DpGyHU9k0qobiOWHMlIQ== 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=TMubX+jqkkqPBn2spDiOmVBQo9+I4bda2Y+3gg51E9A=; b=KO8+M3d5vC3YFu7qnYvAWwPpwwjBaNwg5R2NZzSzLmhVcO1+18TELr3y8+J4ZUkbakEM5fogpkvjwzunpDYc2T6+wn2tX2Rpnhr4+tv+ACHAW7DJqkML9maVfKEj0Yw2d/F5pANRHz+yEwGHRmmLIv7dxM7TtXJh7pDUy+2uJB4vj+hK6KXJwLVBLJxGyp24qChLjyjfdDlsUEJlCYvLm0t4mfB3/ucGhs71bvkJ458jJ6gGu/jFY5SPGDoZaBfHuI75rFFMeEhIg78pYQWN7IKsfi9EuQiG0KNPL50bZDfjt5DEv+OkgnsavS3dGVpOGnQmssWCDavJ7xHG2T71Ww== 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 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=TMubX+jqkkqPBn2spDiOmVBQo9+I4bda2Y+3gg51E9A=; b=kjy92jw9OG1uXwGAe/p+nzI88PjB4EwWvaZMk05SwDzYAO2xrF31Lbg0Z+JP2kr4SNKy+yTK5OuX0VBwlvH1GqO19s93LL9f8XHjZBhYb8DVsfQD8cwO84OLdsdsgH5LxlGZycp9gwx/KWVkifzzBOX8jyi7pBDRVhn1IvrcFqNE1k9452pzM7Zg9ZbMxGhsGReQQrA0+CwxPTJLJ+iNGjUJhfdPVcP/Rng8p3/4+ofJ3MsF0HZFH097dNsqh/zu6ySsrUmKQcGQPME3bfK0T4uqkbECIvoTHqfhVqp4E2S+Wqyxp708oiBkEXb0Pn4nLpHxo8EOJ0d9W8qlw1zVbA== Received: from CY5PR15CA0243.namprd15.prod.outlook.com (2603:10b6:930:66::14) by IA0PR12MB7578.namprd12.prod.outlook.com (2603:10b6:208:43d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Thu, 23 Feb 2023 07:07:10 +0000 Received: from CY4PEPF0000C97C.namprd02.prod.outlook.com (2603:10b6:930:66:cafe::2f) by CY5PR15CA0243.outlook.office365.com (2603:10b6:930:66::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:09 +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 CY4PEPF0000C97C.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.14 via Frontend Transport; Thu, 23 Feb 2023 07:07: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; Wed, 22 Feb 2023 23:06:58 -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; Wed, 22 Feb 2023 23:06:55 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v3 4/7] net/mlx5: add flex item modify field implementation Date: Thu, 23 Feb 2023 09:06:30 +0200 Message-ID: <20230223070633.946328-5-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: CY4PEPF0000C97C:EE_|IA0PR12MB7578:EE_ X-MS-Office365-Filtering-Correlation-Id: eca37f9b-d9db-486e-473d-08db156c9470 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: Sltu5NWn0WtKNJmjafC3oEukCovL3GAe56RNf9caWHiobYpgcmdWyFGhxLt949+sfODoV3KEma23/39w25mbhvpITuy3w8uFz17/I00PIhoSuhn089FadsMRpncBptaIK7G6oZAX0kXvLWc/bXuo03y5w8TEzyBKAwhIiN2wpwAm8kCWE2ACj5yf8PJOP1mZ2d1GT5eCmwzloOxYZB36TPTHshq+c/wc4XIMf+iChUAgauaG5JLUHnYs5S5w2fHhHWyN+XvAjCY0x+56DkvuwFwN8VSx83lfxPxDN1UZKuQnIXRN1K2S3mmieLSyWh7FZcWRPWxKnUMXh+2R2jyTwlGZC0x4TRmqDoZeeP+fN6BuaGk5PvB49BhOEoCqogcu7w8/qfKQKzfRh5Pkl+pZJlWnCAJY6IjY1UDRkpyIe2mwDhevGcEDDRP75DpqgehSf/ZP4WffXChqkB1q0JzX4N+r99IX0UlW12yTfQ1glJLxzmITZ1saxAIZCTlU3+xp+pGihSqh45h517oVC8sM6CHHcwVHlc3A5mw7ARBQufgEyT0qh9kSrL4y6QMsFC/ND/Nf9ar2GWXVhNxYS7Je8Ur1B75TBc7zUSsjQJPCRW8n7/2i1s4HQq3fZAW6FPGrkduyXLU6h5yqlytu6IVYj6w6WVuKKzvUWFekPJKc+P/kB4EvsqQ3yidfaPZlDeHsRfSAeRDhDhldJfIddWpgMA== 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)(136003)(396003)(376002)(39860400002)(346002)(451199018)(46966006)(40470700004)(36840700001)(40460700003)(356005)(86362001)(82310400005)(36756003)(55016003)(40480700001)(316002)(336012)(83380400001)(47076005)(426003)(478600001)(110136005)(1076003)(16526019)(107886003)(6666004)(26005)(6286002)(186003)(2616005)(7696005)(8936002)(5660300002)(2906002)(36860700001)(82740400003)(70206006)(8676002)(70586007)(41300700001)(4326008)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:09.2688 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eca37f9b-d9db-486e-473d-08db156c9470 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: CY4PEPF0000C97C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7578 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 Add flex item modify field HWS implementation. The minimum modify boundary is one byte. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/mlx5_prm.h | 1 + drivers/net/mlx5/mlx5_flow.h | 3 + drivers/net/mlx5/mlx5_flow_dv.c | 165 +++++++++++++++++++++++++++++--- drivers/net/mlx5/mlx5_flow_hw.c | 14 ++- 4 files changed, 170 insertions(+), 13 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 613cc6face..74c5e2e371 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -761,6 +761,7 @@ enum mlx5_modification_field { MLX5_MODI_GTPU_FIRST_EXT_DW_0 = 0x76, MLX5_MODI_HASH_RESULT = 0x81, MLX5_MODI_OUT_IPV6_NEXT_HDR = 0x4A, + MLX5_MODI_INVALID = INT_MAX, }; /* Total number of metadata reg_c's. */ diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index ae2fc0aabe..d6831d849d 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1084,6 +1084,8 @@ struct field_modify_info { uint32_t size; /* Size of field in protocol header, in bytes. */ uint32_t offset; /* Offset of field in protocol header, in bytes. */ enum mlx5_modification_field id; + uint32_t shift; + uint8_t is_flex; /* Temporary indicator for flex item modify filed WA. */ }; /* HW steering flow attributes. */ @@ -1248,6 +1250,7 @@ struct rte_flow_actions_template { uint16_t mhdr_off; /* Offset of DR modify header action. */ uint32_t refcnt; /* Reference counter. */ uint16_t rx_cpy_pos; /* Action position of Rx metadata to be copied. */ + uint8_t flex_item; /* flex item index. */ }; /* Jump action struct. */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 9e7ab08b32..8355249ce5 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -414,10 +414,15 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, ++field; continue; } - /* Deduce actual data width in bits from mask value. */ - off_b = rte_bsf32(mask) + carry_b; - size_b = sizeof(uint32_t) * CHAR_BIT - - off_b - __builtin_clz(mask); + if (type == MLX5_MODIFICATION_TYPE_COPY && field->is_flex) { + off_b = 32 - field->shift + carry_b - field->size * CHAR_BIT; + size_b = field->size * CHAR_BIT - carry_b; + } else { + /* Deduce actual data width in bits from mask value. */ + off_b = rte_bsf32(mask) + carry_b; + size_b = sizeof(uint32_t) * CHAR_BIT - + off_b - __builtin_clz(mask); + } MLX5_ASSERT(size_b); actions[i] = (struct mlx5_modification_cmd) { .action_type = type, @@ -437,40 +442,46 @@ flow_dv_convert_modify_action(struct rte_flow_item *item, * Destination field overflow. Copy leftovers of * a source field to the next destination field. */ - carry_b = 0; if ((size_b > dcopy->size * CHAR_BIT - dcopy->offset) && dcopy->size != 0) { actions[i].length = dcopy->size * CHAR_BIT - dcopy->offset; - carry_b = actions[i].length; + carry_b += actions[i].length; next_field = false; + } else { + carry_b = 0; } /* * Not enough bits in a source filed to fill a * destination field. Switch to the next source. */ if ((size_b < dcopy->size * CHAR_BIT - dcopy->offset) && - (size_b == field->size * CHAR_BIT - off_b)) { - actions[i].length = - field->size * CHAR_BIT - off_b; + ((size_b == field->size * CHAR_BIT - off_b) || + field->is_flex)) { + actions[i].length = size_b; dcopy->offset += actions[i].length; next_dcopy = false; } - if (next_dcopy) - ++dcopy; } else { MLX5_ASSERT(item->spec); data = flow_dv_fetch_field((const uint8_t *)item->spec + field->offset, field->size); /* Shift out the trailing masked bits from data. */ data = (data & mask) >> off_b; + if (field->is_flex) + actions[i].offset = 32 - field->shift - field->size * CHAR_BIT; actions[i].data1 = rte_cpu_to_be_32(data); } /* Convert entire record to expected big-endian format. */ actions[i].data0 = rte_cpu_to_be_32(actions[i].data0); + if ((type != MLX5_MODIFICATION_TYPE_COPY || + dcopy->id != (enum mlx5_modification_field)UINT32_MAX) && + field->id != (enum mlx5_modification_field)UINT32_MAX) + ++i; + if (next_dcopy && type == MLX5_MODIFICATION_TYPE_COPY) + ++dcopy; if (next_field) ++field; - ++i; } while (field->size); if (resource->actions_num == i) return rte_flow_error_set(error, EINVAL, @@ -1422,6 +1433,131 @@ flow_modify_info_mask_32_masked(uint32_t length, uint32_t off, uint32_t post_mas return rte_cpu_to_be_32(mask & post_mask); } +static void +mlx5_modify_flex_item(const struct rte_eth_dev *dev, + const struct mlx5_flex_item *flex, + const struct rte_flow_action_modify_data *data, + struct field_modify_info *info, + uint32_t *mask, uint32_t width) +{ + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_hca_flex_attr *attr = &priv->sh->cdev->config.hca_attr.flex; + uint32_t i, j; + int id = 0; + uint32_t pos = 0; + const struct mlx5_flex_pattern_field *map; + uint32_t offset = data->offset; + uint32_t width_left = width; + uint32_t def; + uint32_t cur_width = 0; + uint32_t tmp_ofs; + uint32_t idx = 0; + struct field_modify_info tmp; + int tmp_id; + + if (!attr->ext_sample_id) { + DRV_LOG(ERR, "FW doesn't support modify field with flex item."); + return; + } + /* + * search for the mapping instance until Accumulated width is no + * less than data->offset. + */ + for (i = 0; i < flex->mapnum; i++) { + if (flex->map[i].width + pos > data->offset) + break; + pos += flex->map[i].width; + } + if (i >= flex->mapnum) + return; + tmp_ofs = pos < data->offset ? data->offset - pos : 0; + for (j = i; i < flex->mapnum && width_left > 0; ) { + map = flex->map + i; + id = mlx5_flex_get_sample_id(flex, i, &pos, false, &def); + if (id == -1) { + i++; + /* All left length is dummy */ + if (pos >= data->offset + width) + return; + cur_width = map->width; + /* One mapping instance covers the whole width. */ + } else if (pos + map->width >= (data->offset + width)) { + cur_width = width_left; + } else { + cur_width = cur_width + map->width - tmp_ofs; + pos += map->width; + /* + * Continue to search next until: + * 1. Another flex parser ID. + * 2. Width has been covered. + */ + for (j = i + 1; j < flex->mapnum; j++) { + tmp_id = mlx5_flex_get_sample_id(flex, j, &pos, false, &def); + if (tmp_id == -1) { + i = j; + pos -= flex->map[j].width; + break; + } + if (id >= (int)flex->devx_fp->num_samples || + id >= MLX5_GRAPH_NODE_SAMPLE_NUM || + tmp_id >= (int)flex->devx_fp->num_samples || + tmp_id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return; + if (flex->devx_fp->sample_ids[id].id != + flex->devx_fp->sample_ids[tmp_id].id || + flex->map[j].shift != flex->map[j - 1].width + + flex->map[j - 1].shift) { + i = j; + break; + } + if ((pos + flex->map[j].width) >= (data->offset + width)) { + cur_width = width_left; + break; + } + pos += flex->map[j].width; + cur_width += flex->map[j].width; + } + } + if (cur_width > width_left) + cur_width = width_left; + else if (cur_width < width_left && (j == flex->mapnum || i == flex->mapnum)) + return; + + MLX5_ASSERT(id < (int)flex->devx_fp->num_samples); + if (id >= (int)flex->devx_fp->num_samples || id >= MLX5_GRAPH_NODE_SAMPLE_NUM) + return; + /* Use invalid entry as placeholder for DUMMY mapping. */ + info[idx] = (struct field_modify_info){cur_width / CHAR_BIT, offset / CHAR_BIT, + id == -1 ? MLX5_MODI_INVALID : + (enum mlx5_modification_field) + flex->devx_fp->sample_ids[id].modify_field_id, + map->shift + tmp_ofs, 1}; + offset += cur_width; + width_left -= cur_width; + if (!mask) { + info[idx].offset = (32 - cur_width - map->shift - tmp_ofs); + info[idx].size = cur_width / CHAR_BIT + info[idx].offset / CHAR_BIT; + } + cur_width = 0; + tmp_ofs = 0; + idx++; + } + if (unlikely(width_left > 0)) { + MLX5_ASSERT(false); + return; + } + if (mask) + memset(mask, 0xff, data->offset / CHAR_BIT + width / CHAR_BIT); + /* Re-order the info to follow IPv6 address. */ + for (i = 0; i < idx / 2; i++) { + tmp = info[i]; + MLX5_ASSERT(info[i].id); + MLX5_ASSERT(info[idx - 1 - i].id); + info[i] = info[idx - 1 - i]; + info[idx - 1 - i] = tmp; + } +} + void mlx5_flow_field_id_to_modify_info (const struct rte_flow_action_modify_data *data, @@ -1893,6 +2029,11 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_FLEX_ITEM: + MLX5_ASSERT(data->flex_handle != NULL && !(data->offset & 0x7)); + mlx5_modify_flex_item(dev, (const struct mlx5_flex_item *)data->flex_handle, + data, info, mask, width); + break; case RTE_FLOW_FIELD_POINTER: case RTE_FLOW_FIELD_VALUE: default: diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 1066829ca5..907aab8bf3 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4562,6 +4562,17 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, at->actions[i].conf = actions->conf; at->masks[i].conf = masks->conf; } + if (actions->type == RTE_FLOW_ACTION_TYPE_MODIFY_FIELD) { + const struct rte_flow_action_modify_field *info = actions->conf; + + if ((info->dst.field == RTE_FLOW_FIELD_FLEX_ITEM && + flow_hw_flex_item_acquire(dev, info->dst.flex_handle, + &at->flex_item)) || + (info->src.field == RTE_FLOW_FIELD_FLEX_ITEM && + flow_hw_flex_item_acquire(dev, info->src.flex_handle, + &at->flex_item))) + goto error; + } } at->tmpl = flow_hw_dr_actions_template_create(at); if (!at->tmpl) @@ -4593,7 +4604,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, * 0 on success, a negative errno value otherwise and rte_errno is set. */ static int -flow_hw_actions_template_destroy(struct rte_eth_dev *dev __rte_unused, +flow_hw_actions_template_destroy(struct rte_eth_dev *dev, struct rte_flow_actions_template *template, struct rte_flow_error *error __rte_unused) { @@ -4606,6 +4617,7 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev __rte_unused, "action template in using"); } LIST_REMOVE(template, next); + flow_hw_flex_item_release(dev, &template->flex_item); if (template->tmpl) mlx5dr_action_template_destroy(template->tmpl); mlx5_free(template); From patchwork Thu Feb 23 07:06:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124443 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 8F0C041D49; Thu, 23 Feb 2023 08:07:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C578D430C7; Thu, 23 Feb 2023 08:07:17 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2078.outbound.protection.outlook.com [40.107.101.78]) by mails.dpdk.org (Postfix) with ESMTP id 39186430B5 for ; Thu, 23 Feb 2023 08:07:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/1nsYBvVFOyc36WWGpE6jZdTJ/X5AHwiuzwLs+lmlVKswoKeQ3KGa/P+BSF8NjKGGMLo/DNaGH7BpGZiCDBEIvOItlK1zoKLNiVL/OSAzackY0Xp2/6ErmjcNPKij2AhTjcHSJ0ScCs6eASqgpSrD2cf+UP/nV8QJO14KJAvUeENMOA0YnDPSERkQ5UApysgmLmq7xU5LF27XO6bNLcHNI1uwXYws7LL2Grn+aj3Hxyr1Yh2L5KhBzx0/PqUBbzhHknnlx3B1bfLimLBYHSFYbi9plUCTXWIA+SqUsC6E49q9oNF/pNLlPLY/le2LjDpUibajYIM0mv9EMpbjDfSw== 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=js7ihsfYz7j12vixQqllburVrCTRyOwZM4/3toabbZ8=; b=ImUr2PJd1xtnPZ/FXvDbf/EQidh6Jg1eLYhW9g1RVUuCOIdIJtdwaLzGePam+KsfjsKdFTz+JCv+CaRsZsdFYkig8nfiF9iWLkILN03M22b89O8YZRVVwVy5UOiHS6jxKx5iTBN6rrwu4NHgGSCR2ycYZDsUtUVSYcJtc7oIC1PowVzuSoLxwvzNi4JOMo1jdf/lK48GU0PJG/CJrjq0GcTe12qRsgEW7mFm/9Ng50Sdmew7w7z6A6z/7R5Rl4Rvk9tlAHghjbXeML7HcWHXJOwuFcvF2CoAkBT6ShKa8rUWNxpr3opcJ8lyDNSSOV4P79guY8UsKaxNTUuXfZpK6w== 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=js7ihsfYz7j12vixQqllburVrCTRyOwZM4/3toabbZ8=; b=Lr2qtN/pbNRv1rjNue/ugF4dZhfXTMtQ1Lr0INaKyDAhgil51AKhFDLSXoYMRS5R1koUvwIKqpb1CcUR+4yb1HyeUKdera1ImkOmWSl8SbLccIgdZO/rtfLpBa57o/xv/71AapoVX8oe4KoJzzRW0psPAf5ihdgtWLjWZGGd5bGNQAnEasBJjO5qfCouBbXn318FbZBUOUf1vAc3gs/tkolZcqok+t/Zowrg7bS/TCEmeP+K5nQtxe0O/0u9KBIC+SyAEp3Vzn99gyJ254nGPMzQYsN4Bn00+lZ3CQWsuiiGF680lH4aIL2q6ZGIYiYQ+RsPJid8LpG+2m+4BLoNHg== Received: from BN9P221CA0028.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::10) by MW4PR12MB5668.namprd12.prod.outlook.com (2603:10b6:303:16b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21; Thu, 23 Feb 2023 07:07:12 +0000 Received: from BN8NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10a:cafe::9d) by BN9P221CA0028.outlook.office365.com (2603:10b6:408:10a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:12 +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 BN8NAM11FT033.mail.protection.outlook.com (10.13.177.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:11 +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; Wed, 22 Feb 2023 23:07:00 -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; Wed, 22 Feb 2023 23:06:58 -0800 From: Rongwei Liu To: , , , , CC: , Dariusz Sosnowski Subject: [PATCH v3 5/7] net/mlx5: return error for sws modify field Date: Thu, 23 Feb 2023 09:06:31 +0200 Message-ID: <20230223070633.946328-6-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: BN8NAM11FT033:EE_|MW4PR12MB5668:EE_ X-MS-Office365-Filtering-Correlation-Id: 7378c1f0-c7ca-4d9c-440c-08db156c9600 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: RrjuS+ApbAf1tPvAcwrcjS0zGO23tY0TYoGDO2rvho22LlVaZP7PAqPimOqYHJ+1ZQJqfjMDmSadKs50JfCVNM8/1arG8DQGxoNxY83mhT3OZSx5eREnUUV+Lio3txeF6ulOC+cyxgJGXeJUsOSFjIRlVaiOa3pyNZS1VSmsQXkhiKaex5vBlZX/lfylHHg51W+x3Z7VfyBNs0TuZQBT5xZd6bS7UJAs3mHCcnDpFV6h1F7fdiTdBRTMT5UI03cAMnjMMajd03bO3PogBLi4i9FxlDZwYf0ncA2IXDy/zxQcarhdkMkd4mUC866UtwgAb1DiqB2LdO0YS4ewyfa7HvPaw2gc+PJyJslTs0jp/uR8h4yEbDirea/HfD5LHHlDz8l42KnZcJadIDBmBZVG0PnDjsUhWlXuy6GiA34Uw5Q90HiwdHnpFNBhG7+z4mOxynahD1ZhtgTPBtcJFctr3OKlY1x1LAskzqskFCGvk/Tbij3kjf/OjF60Yl1cU9gLghvjHIvSLsPDGUBr4hpdrvdNpWp9fB0RsreCeQTeZBgFVKRMx+0NVcinm9as1OTukcJSTZFvwdS8c2iKqYbJfkq5mbwcvhRNNV2xX+iREcr54nOM6lAXP+d27AKNe0VupWTZZK32LuMU7WuNfrWN9uHb4ILRV6fK9ZIRr2ibWprjtH+8yDP4KFyOs7vBfEj5PJ1gI9Gh8blsZ+TpHs6PMoI/ZVEj30Zn/bNpv66ERKA= 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)(346002)(136003)(396003)(376002)(39860400002)(451199018)(46966006)(36840700001)(40470700004)(40460700003)(70206006)(70586007)(83380400001)(54906003)(110136005)(316002)(8676002)(8936002)(34020700004)(5660300002)(4326008)(41300700001)(6666004)(107886003)(1076003)(2616005)(16526019)(26005)(186003)(6286002)(47076005)(426003)(478600001)(336012)(7696005)(356005)(55016003)(40480700001)(36756003)(82310400005)(86362001)(2906002)(82740400003)(36860700001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:11.8433 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7378c1f0-c7ca-4d9c-440c-08db156c9600 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: BN8NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5668 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 Return unsupported error message when application tries to modify flex item field. Validation of packet modifications actions for SW Steering checked if either source or destination field of MODIFY_FIELD action was a flex item. When DEC_TTL action is used, DEC_TTL action does not have any action configuration and dereferencing source or destination field is invalid, so validation of source and destination field types should be moved to MODIFY_FIELD specific validation function, then field types are validated if and only if action type is MODIFY_FIELD. Signed-off-by: Dariusz Sosnowski Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8355249ce5..3d760d1913 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -4838,6 +4838,7 @@ flow_dv_validate_action_modify_hdr(const uint64_t action_flags, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, "action configuration not set"); + if (action_flags & MLX5_FLOW_ACTION_ENCAP) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, @@ -5163,17 +5164,21 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev, struct mlx5_hca_attr *hca_attr = &priv->sh->cdev->config.hca_attr; const struct rte_flow_action_modify_field *action_modify_field = action->conf; - uint32_t dst_width = mlx5_flow_item_field_width(dev, - action_modify_field->dst.field, - -1, attr, error); - uint32_t src_width = mlx5_flow_item_field_width(dev, - action_modify_field->src.field, - dst_width, attr, error); + uint32_t dst_width, src_width; ret = flow_dv_validate_action_modify_hdr(action_flags, action, error); if (ret) return ret; - + if (action_modify_field->src.field == RTE_FLOW_FIELD_FLEX_ITEM || + action_modify_field->dst.field == RTE_FLOW_FIELD_FLEX_ITEM) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "flex item fields modification" + " is not supported"); + dst_width = mlx5_flow_item_field_width(dev, action_modify_field->dst.field, + -1, attr, error); + src_width = mlx5_flow_item_field_width(dev, action_modify_field->src.field, + dst_width, attr, error); if (action_modify_field->width == 0) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, From patchwork Thu Feb 23 07:06:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124444 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 6F56341D49; Thu, 23 Feb 2023 08:07:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF2E7430A3; Thu, 23 Feb 2023 08:07:21 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2073.outbound.protection.outlook.com [40.107.92.73]) by mails.dpdk.org (Postfix) with ESMTP id 32023430B5 for ; Thu, 23 Feb 2023 08:07:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpcrqpMfzjDhM4UCgqBjZ6vIgSZCkZfG8k/7ZbX+OK1rd/V42N8TF/+G38UFPURNnhp81oRo3WG6oYVcfgH43m7FO7U+YzeUh0mk46oqmsRw4N0saQ4eGtlse8JUK5mJU7ZZQb5gpLZdOhAjvcKj8OcTrdNEOu6LcdEfh+R+wDfJx5prHWmo7HeUoruKKuA391sCTif3+X1WUOXX1AV9L21x91o4lbhAOOkRR7/SUbK6dOXGhjStnrWG5qQ9IPUs1IbyAjEy1BocOs8RADpZB1O4u7rQFWjqNe8+6YSbc4zbILNrWDBa1ldMhcq3CZwHlHh4/qwBGzjg58Z362jaKg== 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=u9zS7sPgILGRvO4dsulj2LyIHNJMxbpEPjfLQl8Yqso=; b=dHY0Yb7fHrDm0/vjUcoy8HVxsINFCKkAMemG6M5Bsm0iTgOK1PJKFFxAitNvaaVXEbLhrTzPqIpJrx8lSMf9WG8+TGZUlzogP3qvpbT8YSbCI+67+C6UkT7Sr7malI4LfBbYR3Xq4zt6JdWsn4psXxfUG6/NBbfkY2g42nNDdjpTYYLtKpRvZkOmZcz1RLl+7YsKUsHRfq4ROVpUX446s7ORhhagGwh9VUIGWbdkgmmz9zn+w5IpKkXtQdHb0M7afL5Erb7mQuOn8YWrhDDgC/r0L1hXwXElj0JjoY6TkV+2ethPsNKofuf1xBcU0VsREr0S/GLVZNwxzPJ8WA/DOA== 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=u9zS7sPgILGRvO4dsulj2LyIHNJMxbpEPjfLQl8Yqso=; b=ezqIkhD2dyFZUVhmZoCkNTB52y6rMLpYMEmdLNiT9mPnMJJ575BuCOIouW8lxNFLPl/6BLCQYn/0P5X0L8DqczDPwhTbjJR2WyNMgtSQ8/8PIDg3zngSmMEr2wVdwtIrfYzf9ZmvGgVA3ontgl42rcY3QzR/tPD4gu09V+hcjfhy5DVfp2qNrQ5DuUIGX5zEVEvT/o7ogSDblzZ6JyqyVXp8xwKHnhdXHBqAfiMp5X6UjLuzOqLjqajI08ksfFPe/sJp6TVA3eVUDF+0RygPrKKxUcewykKVPe7bNbpNMZ1CJaXKwBJWhir83RlRj9gtHJS5H+IBNtxeowSUTIwoYg== Received: from BN8PR15CA0007.namprd15.prod.outlook.com (2603:10b6:408:c0::20) by SJ2PR12MB7920.namprd12.prod.outlook.com (2603:10b6:a03:4cc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21; Thu, 23 Feb 2023 07:07:14 +0000 Received: from BN8NAM11FT051.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::df) by BN8PR15CA0007.outlook.office365.com (2603:10b6:408:c0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:13 +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 BN8NAM11FT051.mail.protection.outlook.com (10.13.177.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:13 +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; Wed, 22 Feb 2023 23:07:02 -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; Wed, 22 Feb 2023 23:07:00 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v3 6/7] doc/mlx5: update mlx5 doc Date: Thu, 23 Feb 2023 09:06:32 +0200 Message-ID: <20230223070633.946328-7-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: BN8NAM11FT051:EE_|SJ2PR12MB7920:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a2d798b-c0b3-487c-ba74-08db156c96fb 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: 3e+RhZWVU+GlNwaY/I6aV33pQowfbfhZWzj0fij0UmTUA9dslczMDkvzlz9dRgCj9rEFFs2z35j6D1sP6WvDqen5C3N6g8UKofEaC4Pt4BgBbf7bnhETVTdN/nE/2eyXLvsobVvLf4KwyfzgPQO/0V8/K1ITDsI27d1eU1E81OnJ34B4kf8aYFMAJhFK/53QpUAXA5asV+6sAm0thbCRsUTIjp7GE5WfTQHJWo7WYlL4q2X4JPxRslYNZtIlRH0nheM4y5cW76D5wcINrU0DBik8jAV2AHIio0VVXoCwhPl+t+QezAODl2dNT3OkUtTl7LEHGCbsMXAoCSHZGfefetqVHGsY36L0/c9j9e+XqoOOnr+Bc7f6IlKYAKXHoUl/ZafeohIqsmR54Zb+BeUTgmd/AyEU1zyUvI6OwzK8uj8eLW8PXjyWssrwpdIQRdt1DNMfc6c/d73FCaPcfZZWLTynCcLtypQ3VXBEGM5SXp02oh/nzZhaCkB3Jd62UFbHGVV0lhFcDC2OP+uLos5bHS0hW3iJYelydJgRdTNi9PONtrK7ZDVpXYPWm8SCdRiXECYTJzieqBoGYaUOvAEC9TWs7CRRe3UvUR8sHsAM8wN+sxlxjJskg8vluDgtaczpfKrzLG0xuWWBQg7InnyQJzssUciONF/pywuxtESwSEmG9h4DXiWSyospaaiGR8VFZrjkKgSa0BJzi9bqV8tszfw5g46sIr729IDni6SpVIA= 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)(376002)(136003)(39860400002)(346002)(396003)(451199018)(36840700001)(46966006)(40470700004)(40460700003)(70206006)(70586007)(83380400001)(110136005)(316002)(8676002)(8936002)(34020700004)(5660300002)(4326008)(41300700001)(1076003)(107886003)(2616005)(6666004)(16526019)(26005)(186003)(6286002)(47076005)(426003)(478600001)(336012)(7696005)(356005)(55016003)(40480700001)(36756003)(82310400005)(86362001)(2906002)(82740400003)(36860700001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:13.4756 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a2d798b-c0b3-487c-ba74-08db156c96fb 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: BN8NAM11FT051.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7920 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 Add flex item matching and modify field feature into mlx5 documents. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- doc/guides/nics/mlx5.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index f182baa37e..09828a5cf4 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -108,6 +108,7 @@ Features - Sub-Function. - Matching on represented port. - Matching on IPv6 routing extension header. +- Modify flex item field. Limitations @@ -291,11 +292,12 @@ Limitations - Firmware supports 8 global sample fields. Each flex item allocates non-shared sample fields from that pool. - Supported flex item can have 1 input link - ``eth`` or ``udp`` - and up to 2 output links - ``ipv4`` or ``ipv6``. + and up to 3 output links - ``ipv4`` or ``ipv6``. - Flex item fields (``next_header``, ``next_protocol``, ``samples``) do not participate in RSS hash functions. - In flex item configuration, ``next_header.field_base`` value must be byte aligned (multiple of 8). + - Modify field with flex item, the offset must be byte aligned (multiple of 8). - No Tx metadata go to the E-Switch steering domain for the Flow group 0. The flows within group 0 and set metadata action are rejected by hardware. From patchwork Thu Feb 23 07:06:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 124445 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 DB39741D49; Thu, 23 Feb 2023 08:07:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A87E3430E4; Thu, 23 Feb 2023 08:07:22 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by mails.dpdk.org (Postfix) with ESMTP id C56FB430A3 for ; Thu, 23 Feb 2023 08:07:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OuDdWeVx1x4kxnlf8QoOknAjelAc5ZitnLxNYtSYv+NiIAD+4XeXVNl2CAFFt+2v69AUny06GVNOcsRcSwBaZJH75uhEOvNijlzBLTeYCsZKpgJ0Re37J9rYqngsUrOdQoYK3M8VAp/BUlgDTG/H4UAbIT6RR0BB0VkUxxNGBOTF69r4V8CBE8Cys8VjlR5KrTiDZV08qK8UrMzwMAbpFL/RKXGAahFOwH97zbaBXbv6acwxHHaT/B0GN5aNqF9cF+PtFJQcQi248b6eVLAz2JuqywIa56jjQeEseWUjlJ7IUcuQcyM04dVWQgcoXnCodVjhTq9HFoqUnI2dMADn6w== 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=wltsPlIlL4lAEqelg2EYlQWUadGtXkOAosUsar2Y4Ms=; b=dp0wpAotfqpt/NsNBEJa91ZCQvV2XJWcRdJhQ8aVz4EnmBVgl6uOJgrIq758hjEX0pBYF0DOr76/AE9PjUpirtIO8tNxafVXd+UXQQ4ijYi5oWWqbYsZ58hzPb2zlB2K9AHmkJBxi2FJznVXi7FU1bKikHDQp2TJvSlqOi4+Io0uxU3OTZVl9Tj7F5QbhNycc2mxq/auo1NGGNGNDjvG+XSXC1CK7mTs32tZMS4j9U+HzkX2U1TU6LXLZI/by/vEWDeQD3iua55BvR1HM3qNvwBnDCR/ZCvXcoMj0aUgLPC8QyTI9vxqPYP3LaWW/BjYWehOabp6b5mESOQZsQuo8A== 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 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=wltsPlIlL4lAEqelg2EYlQWUadGtXkOAosUsar2Y4Ms=; b=qz6/pSWzL81cBdz0+TvvlLMF71I8x3aLkm+uEIEbyL/DHQzooiEy8v/pZ3DflmEUmfEaR1GHttEzP8cobeOjOeFdnEVJvGRL160XVBL+BkGtdLpzGYNaT3VowTEQvswLVbe3PiHgrbFJOtH9eRCjBUDBcmkiqFyFIRK67zSrNWAeVaIeG++H1RGH0NJvYY8nW2pBDSpaqoHvg7TKvyosAbA95vSwnEoGCLXCKvpOQTN8N/DMaJmu+Us7q5+Ni05fpNHAyA3MhFqlcM3YFTvFyXPEcS3ZdxDovY/YPdctdlQtxnaAnErRfpInJTZN0/byfgoP1RPpK4oj6DcmCqPO3A== Received: from CY5PR19CA0059.namprd19.prod.outlook.com (2603:10b6:930:1a::9) by SN7PR12MB7451.namprd12.prod.outlook.com (2603:10b6:806:29b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21; Thu, 23 Feb 2023 07:07:17 +0000 Received: from CY4PEPF0000C97A.namprd02.prod.outlook.com (2603:10b6:930:1a:cafe::44) by CY5PR19CA0059.outlook.office365.com (2603:10b6:930:1a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Thu, 23 Feb 2023 07:07:16 +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 CY4PEPF0000C97A.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.16 via Frontend Transport; Thu, 23 Feb 2023 07:07:16 +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; Wed, 22 Feb 2023 23:07:04 -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; Wed, 22 Feb 2023 23:07:02 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v3 7/7] net/mlx5: add error message Date: Thu, 23 Feb 2023 09:06:33 +0200 Message-ID: <20230223070633.946328-8-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230223070633.946328-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230223070633.946328-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: CY4PEPF0000C97A:EE_|SN7PR12MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 04d3ac03-0e95-4e93-dd77-08db156c98c6 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: yH7Cndu91hM7ZiQ/5e+fHmcYMQ1Y+iO50rEedIzzLXI5a1+LyvOpI2x51vtSLIxyPcZL3zMkyEH9UmYKHt2FCvFVOWoaPRGMlAe6QPcOM6sr8DFpqDo1X5iDY4DM0/XJEIwmQOX5HDepr/60x6S/N0IR0r6sgxv+ndxdWJV43Iewe47lB1iu34fUpOUSYIQEJcbim6CE43mPfDoLv8jYu6nzepvMfFrZwT6SbrWLa18cwPObT7jUSgP5cQG7ZZU36tiT2inFdB7RXfC9C6jZsdnbMpM7PDiMZFZNww/qshikLcpypshkngu00FnaebJCkKdVeaI32TlcktHVIYgPBLFyugYimJYG/EXQIRLlJymeB/FCRenGV82SlnHUSSej1mmmF2e6I685tkBNgj5nGgzNvxQUbsCUCE9ngcJeC/kiUG0AwlhJFoljou21cvlpIPIuUSpWABMl32PHkqcNKtPlSNGQSjquQDjgNiVCm739Pcd2Y/nTyFxwqOx4WfV4caYlTKAA25f4zcouBaYyvHiejV+WyF9Q6lvwW+oywi+VzVrJ1F7cbDqeKa/Ct84nJ7aROSNVkMVSFwXw7Mnv+J/SXiRkh0+bswt/8upddPu79GbJwG5liX+P3ccouaV+9qNLXcW1b0rhC+534EZ+ltgqgyFWN+yryL3e7oKyYZpPO3pyUpB2ad6V2cLTp1LiyqNIXgx7b5t/xt/pNS/BJw== 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)(136003)(376002)(396003)(451199018)(46966006)(36840700001)(40470700004)(41300700001)(8936002)(2906002)(186003)(5660300002)(6286002)(16526019)(1076003)(6666004)(36860700001)(26005)(40480700001)(316002)(478600001)(70206006)(70586007)(7696005)(110136005)(4326008)(107886003)(8676002)(55016003)(83380400001)(40460700003)(36756003)(47076005)(426003)(2616005)(336012)(7636003)(82310400005)(86362001)(82740400003)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2023 07:07:16.5316 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04d3ac03-0e95-4e93-dd77-08db156c98c6 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: CY4PEPF0000C97A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7451 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 When pattern/action template creation fails the testpmd expects error details. The driver did not set the error structure and testpmd failed with a segmentation fault. Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_hw.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 907aab8bf3..38b9d55f3a 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4570,8 +4570,12 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, &at->flex_item)) || (info->src.field == RTE_FLOW_FIELD_FLEX_ITEM && flow_hw_flex_item_acquire(dev, info->src.flex_handle, - &at->flex_item))) + &at->flex_item))) { + rte_flow_error_set(error, rte_errno, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Failed to acquire flex item"); goto error; + } } } at->tmpl = flow_hw_dr_actions_template_create(at); @@ -4587,6 +4591,9 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, mlx5dr_action_template_destroy(at->tmpl); mlx5_free(at); } + rte_flow_error_set(error, rte_errno, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Failed to create action template"); return NULL; } @@ -4936,6 +4943,9 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, (mlx5_alloc_srh_flex_parser(dev))) { claim_zero(mlx5dr_match_template_destroy(it->mt)); mlx5_free(it); + rte_flow_error_set(error, rte_errno, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "cannot create IPv6 routing extension support"); return NULL; } } @@ -4948,6 +4958,9 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, if (flow_hw_flex_item_acquire(dev, handle, &it->flex_item)) { claim_zero(mlx5dr_match_template_destroy(it->mt)); mlx5_free(it); + rte_flow_error_set(error, rte_errno, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Failed to accquire flex item"); return NULL; } }