From patchwork Wed Feb 22 09:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rongwei liu X-Patchwork-Id: 124345 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 82FE941D3B; Wed, 22 Feb 2023 10:37:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74EFE42D86; Wed, 22 Feb 2023 10:37:48 +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 DE90542D86 for ; Wed, 22 Feb 2023 10:37:46 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K0O+lcwGZ2qRIS+CCLzjhV94W9wd25ELzxicpX/7cPxgxTjlEHtI3dCtvlyW94mgm982gWsY4i97Vo/pyalG4pRcuZfZ4/WF52nxD9IEL/4YW9Ay2b8zYgqnZ+wOJt4Cng8BlmEdTrTh6fYEPB/DFFEO7kwPQ0nEXvEBCNiMaFrI7jNEtajXSn/2LihkOvif1ua9KUn5cJRXJ8xrem/wjyJzAMO4rx8NtdedWClCljYGe810IeeuoQOX9Dao0cV2kvpM4L7BBDRScXfG8ku/2mJY29RxcW/brlu3ovVJp4JXSsXFEB4IWJIj0AP7e+X/nmqfiGYbBzfMdxYF0pTCRg== 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=kgIkk/rviUm8PK3PcYwIGxTq4NxTdo5L1gYhFpYXwdV9FgqmjP+hngKtdZdvGrxJM0sMtR1KsBLlrS92VJn/iuSLcyWNSZcAkN415jC1+1qCHCbkj8rZfS5SReTJUl6xrzjf8Lit5TxjW+sR5XAlVC+Avem1vsuU/4o+c1Vb/VJLQntKcteJxJOXa6DQJGsBrYZUk8Nrlg15/9d2pWH54T2i4xhFpb9x4BkWVs24mh/XYl8fj6q1kpzWFeBrevDEhKaM/CCNqzWobbv2QSu6Q15IsaPBdSZYXtt52tFwu+E3JS+Yh77T65zQQmjJrlooWc/8+0aV1Uru2Nc1fveedg== 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=pUuLdGhbVLLEu4/Ctlqj4z8vYJpqvuqjbOE+sM0ljScXWW9AcKurpz4DNqO638QVs7FyiPGmQ+BHvsUV0oA2IH6dS39zKB5bnocV4cWTbhfPJmLr55ACNobcSmhFr3WzFqZvNRKnR8uyN0olrBAUumBTSGoeigRzfiPKabyveSb94jLnO02l5+cOo741NUF7ehT7rOLdtV+zDoaLyfQBgYD+ALb3JW6ZXB3wccgiEeQhf5El1wEM79713epKVwxtXgFnJidM8J3VrGScHC4ft8rc4WWAzLVKmuqeiQ+N5n87UUhmbmHxZvP0MKTLE9tvOIOBXqJ9O9Gx4OuE59iQLA== Received: from MW4PR03CA0144.namprd03.prod.outlook.com (2603:10b6:303:8c::29) by CY5PR12MB6108.namprd12.prod.outlook.com (2603:10b6:930:27::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21; Wed, 22 Feb 2023 09:37:45 +0000 Received: from CO1NAM11FT033.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8c:cafe::79) by MW4PR03CA0144.outlook.office365.com (2603:10b6:303:8c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19 via Frontend Transport; Wed, 22 Feb 2023 09:37:45 +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 CO1NAM11FT033.mail.protection.outlook.com (10.13.174.247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.20 via Frontend Transport; Wed, 22 Feb 2023 09:37:44 +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 01:37:33 -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 01:37:31 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v2 1/6] net/mlx5: enable hws flex item create Date: Wed, 22 Feb 2023 11:37:10 +0200 Message-ID: <20230222093715.740279-2-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230222093715.740279-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230222093715.740279-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT033:EE_|CY5PR12MB6108:EE_ X-MS-Office365-Filtering-Correlation-Id: fe2372fb-6e0c-4b5e-b535-08db14b873b6 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: lu3h3OdytbaCY5sAz8xs8AXg5f07EHfgyOJ17gvv0iUWUSDLE9qJLhZiNDjPW4xhdDqnN/IRvuKMEUs2dQLgE7Sxuqg7ge4J/z3TGSP0c6LOd7tdw4ibHNd+o2QTnJvIK5DaUAcZmtii0jhgqLqxzLLLLzmoL8oxF9Hq52d2/5QCD6YcqjiK/IpfIIs66B5e0/UQSPUHbS64RVPzxVwagv5fJlbxHq8QJFsfeVIwZ1scT8LUJkpDVjUB0quMqAMBFXtKjdY6S591lWDfHxEmXjzygGi1QHkU2jq9Q1RvOQ6oZ4hCaJRdoJ6Y10LTB4Djar+XamRTVPQCByU0h3fc8QSxygPsZmTdL3Doj78Yjuk0cuy1FXV1gA7EHnjBlyANrntrfGTCyGHkXtQmHiJTYJf7YomiT1PEWia/lP/crDTyTMDjeH4HFCTeugs0REaQqOu9jhQxv+3oNtk7bVF/qq3H81Vc+uu8MpfWK/X9ukVZwKwNhoZVFf2wSpqKwYsmllmFJ0TAFVPiiiKciZPnF8CM8QCsJv6Cn3MomyStDA6FseJ2h7z6m7zClCNOR4XFZXaGhLCC4C7FS0fPZTsk3i8+fzuUEXzmLPoBT+pGwhHHF5sryvS9rUZC1eQ6fNLdUcX9nTQkGoMBz3uQdS4mQtVD2NTMY0SZTZsTsMrna6ZrgKLb8WjNkQ+EDQV/0iWNNgsJpLAfPErTVtw64Vbm98jjHvgzBVGSO0f0Nr9oxTI= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(346002)(376002)(136003)(396003)(451199018)(40470700004)(46966006)(36840700001)(40480700001)(110136005)(2906002)(336012)(426003)(47076005)(2616005)(478600001)(40460700003)(55016003)(8936002)(36756003)(7636003)(316002)(5660300002)(107886003)(41300700001)(7696005)(36860700001)(1076003)(34020700004)(8676002)(4326008)(70206006)(70586007)(6286002)(26005)(186003)(82310400005)(86362001)(356005)(83380400001)(6666004)(16526019)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:37:44.9386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe2372fb-6e0c-4b5e-b535-08db14b873b6 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: CO1NAM11FT033.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6108 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 Wed Feb 22 09:37:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rongwei liu X-Patchwork-Id: 124346 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 16F5641D3B; Wed, 22 Feb 2023 10:37:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 63E0842DAA; Wed, 22 Feb 2023 10:37:50 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2056.outbound.protection.outlook.com [40.107.94.56]) by mails.dpdk.org (Postfix) with ESMTP id A660942DA4 for ; Wed, 22 Feb 2023 10:37:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Thboiiiq8V09LRx7NtRlQpLI0F4g/FmONcHEmcsIse+oChGNa5bk1sgP3x3onQ1YZ5E/wfzCmQ0dO3xD0R6+Zj/RGQXxZQtqDgpKoGWCkjarnrnFpqECVu6Sh+oKfaVULCxcCtLj6BTBemHO3bXBk4mQI5X0+CSvzeUUn8tKCQF5h+fBOHwwnEoZAvB9d0uigmB8I+L+gFz37qFrMAA+GX8RfNOmkwiRtw7bQ4BeQWbMAnccpdhV+bHLRk2E96+RxJYEnVyxY1ThMQW2eCUL+85pDyZLQWMbNygEijGEmjMfOQJXQbFHr0i9UjnrsOnu7R2VLcQ1cLvuFPb5ihP2PA== 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=WHpWxzSGNW9QAyFYLPyA4Dlzk9b3yO658EYp1b4HzTMk2hlcBNpfgAvq0Q4gfiyy8N3G/Pzy3IpBHUacNWY7m7tQomfe0x0HacQVriiJDGRO2JMaGBhE6B+my+s1/Fn5t8st/kMfqwd4A9H6Tofjr4ZJZzxxppSVk1ak7YJqercKGfri8+cGSnjKBR9Z09qOcO3uEc0SFr8hczeBg3eyUkF51SgRK3GqjuPL/iOmy+Mj241MDuJP9ewrHGbq+uYLkzGcNCB09Fnv9BpWzkqPcd4Z2E9B47O4ufTqu9ZKjMO4aaMzCfRIbRubokL1ex3KPkprcwBYgf69F25yc5jKXA== 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=bAsDcviVNpL8hTUzndPNRIE5R9JEVKYpK81YVUtOOSvTsXk9YTmFfuCiRXDIVG/7Uac/V3jZI+AG336XEIMfjO/qPsrWWvOHenEXdQyRZX8PzSj9fkd6/Czqaa45UqXygx4K9Rtd9h/v7wsZl0ZZuX1r3AmbE+zONJPL8ntt3s1IWQ98u8VOQ4XxhC1Nj4kLs0nQ9DIiDVuhASvGIw0V7jwEBw8f+AhR80fQY1wyujl+iAgOlx77XkGznFgz8kioqMiw/e8E9RmF+bdOZSmV8Kp9/8RfMcc60fSP0gm3LHXbXjRlLBff2zm+MhsIfgRqs0aRn4tKycaIWuMhmD5Udg== Received: from DS7P222CA0004.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::14) by CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Wed, 22 Feb 2023 09:37:47 +0000 Received: from DS1PEPF0000E633.namprd02.prod.outlook.com (2603:10b6:8:2e:cafe::2b) by DS7P222CA0004.outlook.office365.com (2603:10b6:8:2e::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; Wed, 22 Feb 2023 09:37:47 +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 DS1PEPF0000E633.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.14 via Frontend Transport; Wed, 22 Feb 2023 09:37:47 +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 01:37:35 -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 01:37:33 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v2 2/6] net/mlx5: add IPv6 protocol as flex item input Date: Wed, 22 Feb 2023 11:37:11 +0200 Message-ID: <20230222093715.740279-3-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230222093715.740279-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230222093715.740279-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E633:EE_|CH2PR12MB4133:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f4fb1b7-3882-4e83-e205-08db14b87544 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: fRZPa5i+GTZkFR/pzPUYOu9PKL7AzIlWjWxveAQCDjiGB2KPyHet3YjuPOz3r2zc3NZmC/5AyYRPYzsxn0pXluX/YsrJw33csC5hBZIv+1E3jjjh8dVom5jFd06ybh8sT3MoAHL7vtqQQXP2OOSl6kdRUr8NcpIPyrbEyaSBVr7jR0NBDPG1q9HeU7oUW4rblgJzs7+QF90SMLjJLHtpDHK3ld/2+XB52YZVSQQmddsBomipkWQ3fx4gFsuQrvN3zkFDmdFhyzFI3RDHQWt7sxi4QJswTgtneSxFyczvcAKQG63m9fKZ+852zeH8Rmy67w7BscoUSgRMjASn2ieghrszRibR+QIPOHgJxwNQuRtVGqvSVD1NemiJ0Q3l4JH0eVX8kuX5bcLv8byF0QJvwJ/Pje8lCTYj1D5VWCAiqLAlhg5nFKQGRi5Lr7kWn/TlZxFLpWIV3P6AskxtNFkTqh+fSW2pG5lEpieSwYpxFsOopRFGqguP5r+LwxVrSsmKTuKbScHNLfHGhywu+DM86rOIitZXyjB2SPrN7Rq7bJgUs0qZti21tYtMdcAr/wKO0IQLhHJX47yr8df7oRMZwod9p73pnzbYXMx6eV28l2RG6aW8yrEW08R86qGuNLACr9K5v5/sceWk8VOrKxFjbrmuNK8fsPlNR8ROGTXCvPMWAFKmEOJNbIzaRm4nD4/TkSby844HwgOsDhKTfuFHQQ== 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)(46966006)(40470700004)(40460700003)(5660300002)(8936002)(107886003)(41300700001)(2906002)(426003)(336012)(47076005)(2616005)(110136005)(7696005)(316002)(478600001)(4326008)(26005)(70206006)(16526019)(186003)(1076003)(6666004)(6286002)(8676002)(70586007)(82740400003)(356005)(55016003)(86362001)(40480700001)(36756003)(82310400005)(36860700001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:37:47.5637 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f4fb1b7-3882-4e83-e205-08db14b87544 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: DS1PEPF0000E633.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4133 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 Wed Feb 22 09:37:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rongwei liu X-Patchwork-Id: 124347 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 9236141D3B; Wed, 22 Feb 2023 10:38:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A657E42FA2; Wed, 22 Feb 2023 10:37:54 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2077.outbound.protection.outlook.com [40.107.220.77]) by mails.dpdk.org (Postfix) with ESMTP id F0E0E42F9A for ; Wed, 22 Feb 2023 10:37:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d0nDtvZxvNA082mNvL1Ui1+YyesFScMUZn0eRxkSreP7/knxsP9pVkv4nmdEYI3ja4cfjBQt8yVeuIuF97p7tncJFkImPUpHaY9A53jnjRxn7+ukNMSZssFJVfpYL+sjcmv1vTUYgDaTSnmVzOsLfbjuKdFp+AfUtL2IR7FDataV8EJNc7N+XWFTnYclkp+XU+dwp4VBWl7vchPbBDs2EwXAI0VP/mopi6WFlzOfK7OBTUaBItLbe+sIIhwHS+vkDgQ7Ha2diSm9g8g/Doym/4mc3wEybYMPzMUq/7xshK1vvqz1Fku/2hxt3vZkuDDuu+0DNWbWSNtuTs8hiB+14g== 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=WnML+k9E/ATYWDwbbTIJORjxkWag3I/a/gzRorX6UAtQmKqVcNjoOrLvVpU+3emEOOjfyirdS+s6OJ3hKmYjlzLXWs0o2XEm3gfB8NNgYFDFnO1Tph10AVxduE6pyVLN/MimxsNyzaRQxvyidOTu4xQ63x/3ph4nF/UrnNMaml9bWt7jOOdmQPaSiVjNRjXOO2VLtjwJMF/hvAceAffBVaCQd6iP8PNNI284MpPeaJFW05eLA7xYAsThzncUf/tEMHGhkpZ1uyFKH14QOVxqtmj0ZQPaX5a3ekyRjdiJpfExup0ZlrpbQshqfCuAe0aVlUKeRDVc6CmggJoW+L62hQ== 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=WDN5I8ZMXYdLhKQ/5b8m2i3K+gwB6S7IMcrhuw7730w=; b=SQ1KoEJeIgDxfXkVCIkI/3XnQXpnR5mH4SR1jipCafWStBVyxqtlrHxgsPazRUhbS6RCNj1r2c9emMp77v21uGO/3hOTOY9bHN6iPtGOpJVZxgFdbIHMmqxnQ6cWjyFzPLk9GOUaiVELFYll1WZk2IX3DvcY2Vl788H1SBhBMqnAJ12MYPRF3HQZ9P6OF4dsIVu5WTb9J0So410v8oKyX9/CutyJgCScrmvrp6HRt1Rznrk7ge4S/LYxBlMou/ey2t+74earqz9Ldm4wttlvZlL/wL8VtP2X935/eYK9BoHAqFrc+GnNnpbK10DNRIybx3Uw1DvxXGAZpJhrEUX1TA== Received: from DS7P222CA0020.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::16) by SJ0PR12MB6805.namprd12.prod.outlook.com (2603:10b6:a03:44f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21; Wed, 22 Feb 2023 09:37:50 +0000 Received: from DS1PEPF0000E633.namprd02.prod.outlook.com (2603:10b6:8:2e:cafe::35) by DS7P222CA0020.outlook.office365.com (2603:10b6:8:2e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.20 via Frontend Transport; Wed, 22 Feb 2023 09:37:50 +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 DS1PEPF0000E633.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.14 via Frontend Transport; Wed, 22 Feb 2023 09:37:50 +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 01:37:38 -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 01:37:36 -0800 From: Rongwei Liu To: , , , , CC: , Alex Vesker Subject: [PATCH v2 3/6] net/mlx5/hws: add hws flex item matching support Date: Wed, 22 Feb 2023 11:37:12 +0200 Message-ID: <20230222093715.740279-4-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230222093715.740279-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230222093715.740279-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E633:EE_|SJ0PR12MB6805:EE_ X-MS-Office365-Filtering-Correlation-Id: fec681a0-93ec-4970-443f-08db14b876ed 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: LxTdiiKyun4URHHCPY1B+DUXJwyUBZSHQxxo4nMFhvE5YTwkE/QrW2vrBVu9g72wDRKyMmmJIHSypR3zYoiFE8g/0/xhNIyIHzQCJdg5iI8GQgq4PLiPAmLjM4HzcpiO7X5CAq8USK9M5Hql05XeEMl/YCWIwYyE/AWtd9PJd9IfB9Lksk9UxItLZovkfc6RXuFrbIr/vtlREFUdOUsNTWls8G8MChR548Z7JjXfi+ZOgGzk4KelBOpCTnUX0vHyktlLrSxeu4NJIsqOqHnAZ7B5YM9INTlONRLSFTIjt6yly7jEjRo/BA0WTLgK+YYGhcq8fdTooPT+iZueTWbySN8PLECrxaoGqaWesiDJaZeD0VwDvCR/NAMdDjJAnziB3amH8YsAH/BVPevsB3f5rkOfTT3x5ABlpKgfQrYcBy5xbuKUNwWCfClUVnUXVznl/pg7gEPBSMEWEHCa+nrHVJTgCKZSzlxggBAgWil+TiFaEmSlPf8xABqp7xk5wZiT363THd0a8wQp/K7YFoVhbvkbMqrCWVZzs5GEKajFKESfMp9BLtisXQ1o8/kWCHkRiiyK3Maykp8hDqiVDsMS2uQV9GpPlYKVHxXf3RR34MBIBcF1e71II2DDGVHNv6eu46VzWV9QGfiwjoQjWYIUKsa/n4uht1ctobWB9GJlQkmaOavrlzJcnEMWXdi2sVW536DXFAXy5ExvJyixZS2VYw== 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)(376002)(39860400002)(346002)(136003)(451199018)(36840700001)(46966006)(40470700004)(1076003)(6666004)(107886003)(86362001)(7696005)(82310400005)(40480700001)(426003)(47076005)(36756003)(478600001)(336012)(70206006)(54906003)(316002)(70586007)(8676002)(83380400001)(110136005)(186003)(16526019)(2616005)(6286002)(26005)(4326008)(41300700001)(8936002)(55016003)(30864003)(5660300002)(2906002)(356005)(40460700003)(82740400003)(7636003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:37:50.3293 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fec681a0-93ec-4970-443f-08db14b876ed 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: DS1PEPF0000E633.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6805 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 Wed Feb 22 09:37:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rongwei liu X-Patchwork-Id: 124348 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 359AA41D3B; Wed, 22 Feb 2023 10:38:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC4B642DC8; Wed, 22 Feb 2023 10:37:57 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2043.outbound.protection.outlook.com [40.107.243.43]) by mails.dpdk.org (Postfix) with ESMTP id 1643442DB8 for ; Wed, 22 Feb 2023 10:37:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pru2WysZ6YOUY2NPCyulYMtx38CsT5nktpO5lKGKpN79YXTDZOkoTfYfO6jwOlny5dag5kQ8rn31vwpKCmOP4z75aeO6Ma83+GzFrqflsxIfjCIbD5iuImSiHlij23ljTblDljcTzkY4GggoqsnPPiG85Qn5bKioeQKB7ZiajHCXn5o3IWFFZaO3RfoE8489ye/yltyMHw/XFfcbZVQXdrSJB7RIaqfl16lymsz2vGaWAiU1iaiUmowM02qXyN2JHpNZdWu7YKzZjmObKDoDCNtGGXiDD/9zi0P/Bp8aLlthw5SX/5mGPHpeAaVF97Ijc7L/X9fq++HQ6UUwR1/ZnQ== 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=DWe2em340s59yqyCPW6Ux6xfOHpFWp4TXRfobjVjuAMOdDuJDa0xFGubWFZGE33tIUtROEaLoAfzgU0KRwOVBvD+O3Y3OfbpCnkTa6pY8ROQkhuse7kUEKH4qzfuiTs3nl+dZx1Vh53T1hoY+brNxjP4kWXjf8NpLhPJ0BSXPrCRrK495ihHBbt9tylcB3qtoWJMe/9cmGWiofrwDfiWiHpETpMXQCUSLZiXHn5WtE6zyYOp/6UuvqDnSPKEfPdDhdzL253NKJP5eKt21MmF/irSRS+ykkYKN5GquI3zrmzY4dxNGTey35zSQNnf84W0xJy6Sn/3rC6f2/mXh2uURQ== 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=TMubX+jqkkqPBn2spDiOmVBQo9+I4bda2Y+3gg51E9A=; b=uaepvDJ+8rVtqz3/d5QBelMhNMUg1xuedLb8JD4mI5MxE52zaS4stYae6FNvJJLBuJal8/ClMfS8QxDjNGB2hqb61biYy/rNJqAdHYABBBIVg12gkR1IHJeG9A4ZvtKCAZi67j+NL5+cdVTsAL2TXMXbgdtuX8gAbMdxC5fWzeHwrx+46RZLTzv8PlPsfTiGUhKNoKv148WwDDTSY5xbQrFnA4RlwYNTOcssVfH2oDtxqQ1FfnjoiYHCR+e5Z1ni7hulPZrTrYY8nnbrGiLTgS1CUIxwiXJ7QxP7eDpYfLgZxmzy3+IwJbN0dxoVtnd/1WZZkm4509CJekzb5+fsTg== Received: from DS7P222CA0026.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::32) by CY8PR12MB8193.namprd12.prod.outlook.com (2603:10b6:930:71::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Wed, 22 Feb 2023 09:37:52 +0000 Received: from DS1PEPF0000E633.namprd02.prod.outlook.com (2603:10b6:8:2e:cafe::fd) by DS7P222CA0026.outlook.office365.com (2603:10b6:8:2e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19 via Frontend Transport; Wed, 22 Feb 2023 09:37:52 +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 DS1PEPF0000E633.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.14 via Frontend Transport; Wed, 22 Feb 2023 09:37:52 +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 01:37:41 -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 01:37:38 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v2 4/6] net/mlx5: add flex item modify field implementation Date: Wed, 22 Feb 2023 11:37:13 +0200 Message-ID: <20230222093715.740279-5-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230222093715.740279-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230222093715.740279-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E633:EE_|CY8PR12MB8193:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ee473e3-fec0-4e16-9979-08db14b87806 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: OjhnH+45Yi/ViUNbHuFAi46IiSD8gqlI3f9Dxy/0GSUgy7CzqQSIfeiD/k6qxXkUbv++3c4FtGSSHpoFXsrBcle+OsR7GaJPVffHBSt/hxs2ZhTqOd8EI088mKn1/1G4XJHLQ3GGx1b68bTu9S499PpkpYvqzA26SJylH33hqsnqhni5s6xddKGhdY49Cmy7BO6o1Bimxza3C8l29LhiSxqsgeiBSLSal9BcmmWlIDlE4qSmlNWjVKk7a1jLCAz5ss4P0/LgffN7aRkk7o6B7wKi5ZXwhDA+UIvVug98BjI/QYEdePXdnU5mqjR3XUIpYHpvJr1rLB1k9laYjmVdr0pMsfvWKd7/2DbA3m1bb8H0yf0mimmQaX7LSRpEgcckyT79GMaQosHthRhSgd6idCcsBCL1MO5CoqkEbTQ/HrpzrjYhzVWpFWjbS8c/GU+gQ18u8lYO/rh5WvRDtqfzXPjxc4tMmfVaDX8yCx670nCLH0Zewt3eBTrtDIEdUC0tUWBrxxu2uOqB9/IzjVxEdI4cVWv1ZAOiN74AN1JF7MGP560uGESlCFFvTt5xPao6oev84tK/8Q6ODelqbzra1zHF1xAQqMEpZq+R8IrOYQa3n6N7JiETWOo3xaHLuJGi7sf22DwPSTFeaWsHtXPf9M3lYsZj6EDKEnCubq9RqJ0QPE4ZXQDbv91QCby4tHRaFFL8S6BXoo0kNpCoB3I6BA== 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)(136003)(376002)(396003)(346002)(451199018)(36840700001)(46966006)(40470700004)(7696005)(478600001)(336012)(26005)(16526019)(6286002)(186003)(2616005)(40460700003)(82740400003)(426003)(47076005)(316002)(83380400001)(4326008)(8676002)(110136005)(1076003)(6666004)(107886003)(70206006)(70586007)(41300700001)(8936002)(36860700001)(5660300002)(2906002)(7636003)(55016003)(356005)(82310400005)(36756003)(86362001)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:37:52.1887 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ee473e3-fec0-4e16-9979-08db14b87806 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: DS1PEPF0000E633.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8193 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 Wed Feb 22 09:37:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rongwei liu X-Patchwork-Id: 124349 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 0A7E741D3B; Wed, 22 Feb 2023 10:38:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBC3542FCC; Wed, 22 Feb 2023 10:38:00 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2086.outbound.protection.outlook.com [40.107.92.86]) by mails.dpdk.org (Postfix) with ESMTP id 696FB42FC6 for ; Wed, 22 Feb 2023 10:37:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nJma2e5qQPS5N+okZ0UDwRE5RmeFqEHPXg+kpdqq2oNZhnBS6H2rWAPz1hAKHnqJSMvlJtCyIHwPQm2k+jUp1u9yd+ieOm1isFCtk0NkkR9Q/QC8LiP86WaJ4BaX7U5BWWQfRz4rRW+3/vvX769uLD7oDr63tmZ+nRWs5sfxfpfYVO7anHYx04tM9A2dkUDBICxR0eRCezWDuWlfr40rqECs4JiLe5NLyrCrstouaVtCNtQ+ezoOwg/21042c/7Sbvhsi6hV+6VBX/NKvMcOxjp4Bjx9AvSKytLgxBHikgvI2E7/KUuxIrgRZt/+UhxxiyPDU0Oe91/Tgd8+dGE1QQ== 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=eBX9/JoYgjKHaG9b56WjbTkswjyYmuwKojrmj3KgU8DkZeUvc2vEum+JiLXlJZ9rYc8H3tguDbmq08RRCzDAtNJgbDyL46E+1lTuS4PTvV2yHgeTbnO0EThIfLxV5RYK3utR2paz8E2yWZVflRhTUorgJqM2Fqnk7I+knYHzLKYXeEH/SzKVnizPV/cmw6lbLeWu9MWklMiCiUipgtX2u+BCKWJOuPV7WfzYOY01kHDdFkscy6LpL3cxUM3j6g77uQX9KPiJ9kCOdazoTcC/1o9XC1X6h5cmOLsXySHPp1Yqkxs2MPf4ghDjfwP0zixlQds+ogfapequfurAKvydAA== 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=VCAtcBq2EmpQngfqbePi/KA/esnBXqtuhYfPWAgUYMXXdpOenP4tu+gCDg0lBVP4wWpZJicZ+XxSscKa20hh1Arj2IcCUZPlf3FaCEqcvSSd0r/SdIu5WP+KFjW1QyZ0LpiD+FEV6clgxkNkts2TJ0+bdZdCrGyQgl+2FiiVyN/h56bqjvqWQB0uN/3qs2zZeJfaokPkJl4x9uQTMgzob103+cgHtmApjY6y6e3WNngHgJj8lQVtCITJl3DQeFRkzTbp0Qy8e6qqjHyZa9eKwWp/YfZKGhPickQYhv8bNoTGHVYMMUsuEflL2EJfS6sMp/c44u0YIEgv1FDGK4TMOw== Received: from MW4PR04CA0374.namprd04.prod.outlook.com (2603:10b6:303:81::19) by CY5PR12MB6480.namprd12.prod.outlook.com (2603:10b6:930:33::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Wed, 22 Feb 2023 09:37:57 +0000 Received: from CO1NAM11FT115.eop-nam11.prod.protection.outlook.com (2603:10b6:303:81:cafe::cc) by MW4PR04CA0374.outlook.office365.com (2603:10b6:303:81::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; Wed, 22 Feb 2023 09:37:56 +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 CO1NAM11FT115.mail.protection.outlook.com (10.13.174.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19 via Frontend Transport; Wed, 22 Feb 2023 09:37:56 +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 01:37:43 -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 01:37:41 -0800 From: Rongwei Liu To: , , , , CC: , Dariusz Sosnowski Subject: [PATCH v2 5/6] net/mlx5: return error for sws modify field Date: Wed, 22 Feb 2023 11:37:14 +0200 Message-ID: <20230222093715.740279-6-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230222093715.740279-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230222093715.740279-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT115:EE_|CY5PR12MB6480:EE_ X-MS-Office365-Filtering-Correlation-Id: 93545f8a-2e6b-49b4-de47-08db14b87aab 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: EnKJUEBtA1sgV4nuuJQgjRzluBWJFP6rP4817JxmriU64kHuWdInVHNTX37JVXKdYwNdNfsBpN5Rhc6Bww+Dy9dP6kYbpgLs79Kkxy1vIGiyUdPTBLa7ox3FT6reMQc52Kebov0gn9f0dbbd8qpyC1X2WSKkmJa294wfSrdtbMW1MBrYITCC4BESqefjGu0ev0Qtj/4zl7DhTgqDrWB4DqdoiirDo5EcHDM/5HJfmtY4IcS9ZGx0EhMR+e4PogOCwUCtPd6cXEhG2uuFbbpS1OCKDFS0uTn2o9zohIlAviz0oFK7tkOEWq4rKUTKdLfJmzZdO4DnQRaU9sOi6STDBwx7BaQORKuLkDPe82zcRdc8Jxc4x3MJM8ilCahRm1qSN2W1JwBILKJIW9GhvkRORMWw0FcmTodMo8OikL5l4u+Skprw0/e6v0iIE5hgFiVSgPHGXGeF8nasMmbx6u3HW+p1sRIh0fx0NQKCMXL/QAusHE3mZuXYsBZLm626OVMEf2j0FJhwiAyxE9UJh0y7x6N3/e+uJRLHZkNMP3APUkTozcndRVloLitfWtgfLR8Cf5uykoFbm03b1tTUAVSjl9Elk0q65NDF/wgBuykHLhTxle7ksoB8axrkg3nDKrzBjut0yIEUH6Q0b5p2UbsmobbeBSpGqznftIGCvGTDVTS6QgnDyJjzXCThFpwbs41nlkix6lYozsXM/aNBhi7boKncLRex7feHBMiGNMsNCdA= 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)(136003)(376002)(346002)(39860400002)(451199018)(46966006)(36840700001)(40470700004)(40460700003)(5660300002)(8936002)(107886003)(41300700001)(2906002)(336012)(426003)(2616005)(47076005)(54906003)(110136005)(7696005)(316002)(4326008)(478600001)(16526019)(26005)(8676002)(70586007)(1076003)(186003)(6666004)(70206006)(6286002)(82740400003)(356005)(86362001)(55016003)(40480700001)(36756003)(82310400005)(36860700001)(34020700004)(83380400001)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:37:56.6585 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93545f8a-2e6b-49b4-de47-08db14b87aab 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: CO1NAM11FT115.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6480 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 Wed Feb 22 09:37:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rongwei liu X-Patchwork-Id: 124350 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 7952F41D3B; Wed, 22 Feb 2023 10:38:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 488D842FC6; Wed, 22 Feb 2023 10:38:04 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2046.outbound.protection.outlook.com [40.107.94.46]) by mails.dpdk.org (Postfix) with ESMTP id 72D9842FD8 for ; Wed, 22 Feb 2023 10:38:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=awGah4TCR54MF28wVK5M+rCw9NWa/O/OBKaPY7o/0hrOnFrhuLwWZVg+kPfMf9bQgb+gK7agLTmcDG2/8C2Dg7b/iDGgtmbsIPxYieriDIUG5l8DSTEcnkO2J8ifbSu2ZWWo8ZnpKd3LdfPyeUZv8G0m/ZBFHXIk11gIcRZGbtTL+5a0533IBEnbWcTkpKGUuXQh4USYTNvXpJbiqSpfmoOf7M9dCmvd/pzTVbtqIebSgPH/RgL1lMSCKaXkYe7Tp1y0C4dqHGiqN4Bn4qMzKLev37qtVFkD+ORdG3WlAh8NMW7SMQ/NpPwkUpLVK6LctAKWJfVGmN01YLyQO/e56A== 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=PrDXBranF6Dr7doyL9GpMilML2XMW8PS/iiuvwJB6suVas0Vzw1ezF9KINuhgBAWZG2PCoO5KJlMWNmBKNgyaL5rUBo9iVBWB7IioKkmw81irJnXPaX+jXzkx+dsjwEzy6JVzI6R57ZnOhzNYpRgxJpYUmmS7j4mJr+hJlGbIjudSkEjCwlXux2BWJ1iq2sqOOYtIBZVJnjqg+RkGWeg4ptDSrlapnou+rC6AcTfykOioCwwrJVl1DokaWY1ZaNV1ZzWXnuXKn4J1xOSI/S+sufbpO+O6D4M7Ja8cXyv5TvHAN4j661b/WnzBrIMov4OlzhG9OANccp9GWVhsKTS7Q== 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=u9zS7sPgILGRvO4dsulj2LyIHNJMxbpEPjfLQl8Yqso=; b=Umqff6kbbadsrhL4SqRudxKZNFLx4BtYogN91CTG6uqATvmcxDZyE7vRlzY60TOEkU/xGG3aTKv803KWjN9uLvKs3uSNYdB2U7hYnbak2AUpDSRKjr+Q43ZB6sySquVZFRd4GFgccK9qn4KO5uIapA1sqlVOX5kHsQTGp6K04QjA5kTE+iA6VDXsvIOK0TN5x0ZzufWtjg+nP+PeicTGHbkE3H7PbFx0/y/TaaLJsa810eQ6frnQsMa5Ks+d6w4jIH5oJf3qdZgvamQgbe0UKY589cxq2p1PrNayok/Dydwn2HonjnzYDRxDdA/Rt7IBkjUFiCmTJbA40cA7BC6o4A== Received: from MW4PR04CA0122.namprd04.prod.outlook.com (2603:10b6:303:84::7) by SN7PR12MB6789.namprd12.prod.outlook.com (2603:10b6:806:26b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.19; Wed, 22 Feb 2023 09:38:00 +0000 Received: from CO1NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:303:84:cafe::1e) by MW4PR04CA0122.outlook.office365.com (2603:10b6:303:84::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.20 via Frontend Transport; Wed, 22 Feb 2023 09:38:00 +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 CO1NAM11FT014.mail.protection.outlook.com (10.13.175.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19 via Frontend Transport; Wed, 22 Feb 2023 09:38:00 +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 01:37:46 -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 01:37:44 -0800 From: Rongwei Liu To: , , , , CC: Subject: [PATCH v2 6/6] doc/mlx5: update mlx5 doc Date: Wed, 22 Feb 2023 11:37:15 +0200 Message-ID: <20230222093715.740279-7-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230222093715.740279-1-rongweil@nvidia.com> References: <20230215115251.3924578-7-rongweil@nvidia.com> <20230222093715.740279-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT014:EE_|SN7PR12MB6789:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d52e615-1e23-4086-e00b-08db14b87cdd 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: mGFAg6pDLx+XeB3irIFZDGTXX7sT/cl6Ltva8ybxYccbJshcOn2b1Ddw4kTe4gsKUz/8kAY2X3sthHraje4+FcZsPEP9oU8v9370tj5FkjeyKIs2gJS8pJjk41Okvx5TVFChsbsU3TVc828p3SoxtSZ4Df5/Xc6ttE5PPaLvULX8khMRuf7L7v70jKM/lDlHZbIlDzSDmOC0JFJLzv3R8PpXh4SYhJYNnRp7g9SxmTq2sWM8369HWgyA0NRcJomLZKgepPVu6IN06TOJZS15awcKaQmhu5v60Gd08hBmsxy+NWgDxBBsBPvp40Rchgp0vHM/fSVeqovnEwqF6OoTATm7X/zs+CYL3WrI1nk8IYK/8FF5XvLmRFNjagHykZWXk4Pyk5vEa2I5zRhsRlCLzyp044iUWaAZhjkm6zyNwr1PlxSBajcgkVs1nzmM8HTvCKG80+wzP05fPTI5F6ir6m9bN947uRMvaXmpaNX1QjJno0SHkXtUKjPmx0nRRi3GtFgjfFtqOi9OE+zNA75pzEzRYpRHCO+IHrKypOX8Kgb4wP762nhfWRPo+e2wD68FzMu2CsJ8N8WYIF6b44olYRpdQXNNz1UJuSowlaO9E6v0Er6a2pJ67qG44CO1Y0JOwUSUh3cf/Cy2XSXE5Vt1jNAzsSy5fPWKTNAd5/C7SX1JIGemXvKJIXMXnOyO/CndWHNq9d4bnx03Yh43PMslbU4I5tLSmrIL0/4dCuGz6X4= 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)(376002)(346002)(396003)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(70206006)(8676002)(4326008)(316002)(70586007)(8936002)(5660300002)(7696005)(41300700001)(356005)(86362001)(36756003)(110136005)(55016003)(40460700003)(6286002)(426003)(186003)(6666004)(16526019)(1076003)(478600001)(107886003)(47076005)(7636003)(336012)(26005)(2616005)(2906002)(82310400005)(40480700001)(82740400003)(34020700004)(36860700001)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 09:38:00.2948 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d52e615-1e23-4086-e00b-08db14b87cdd 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: CO1NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6789 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.