From patchwork Thu Sep 28 02:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongwei Liu X-Patchwork-Id: 132068 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 3FECB42658; Thu, 28 Sep 2023 04:34:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E9361402D8; Thu, 28 Sep 2023 04:34:11 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2060.outbound.protection.outlook.com [40.107.92.60]) by mails.dpdk.org (Postfix) with ESMTP id 84F8040150 for ; Thu, 28 Sep 2023 04:34:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZUyRejdsQ5GDgPp6KyoKM+UXG7v/Gsvb7T59Qo+1yvo1SyDkI3l/VP0T/jYYCK2m6zuZKHKoVuF46KCHrIZqqlzDtMotEwAbu49Fs8BeXe28L+fM8cFtY0aokj8lob6/Xpr+ZYP6dpV+GmmKsENW6InJpNi9PmUv9uyJgzQhE0sDXQNuzB2IU8OEGU3V7XoTRDHKfGGNwAJqEBzCrX7iUAkrHbNRIaw3CLsYft+SS3XHJqDXL16WqTcdpuS3pjUbdNPgFfZrFLCsw8jOyod0SsFgSYl2qvyTbmOwBptKYGXZNlmFQlcJZAdAvT7cwO5L6SYeoU4HAqFHe9ZCeK6rdA== 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=SJG7SR4jkTzQ3FVO3Dx0i0GwXtbiXzHch5upfjGrgBc=; b=FkA455DoHBfBlZGLXBRFkI06Qm9bEDT0YXs9a5OKO2HPr0yYOG5RCiKFrE3tvrXKWYFt+/Dzlhyus8QqHL+LfsSl8Mk/1YSbrSPQey4CHqZOHe+F79ua9Grhf5UEILqzXs/Xp+oeEr+xTJRhSmmjeMosUzmmZtCAvqDLwOfOvaG3u6SHak592ZJ0qLthQDzGoaI2wQqatnnoGj+U+f8g6O0mv/uev6CebUAT8sUPZkY2mXoHqpvyU3Izy9CD+G/53qn8mpuGhRDgaDUaK21bFDbl7HFm9xdasUAlkExw6+kyWykfk8yRfawvVWl4uMKzv7ps0XaunYdxG/artBQuCA== 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=SJG7SR4jkTzQ3FVO3Dx0i0GwXtbiXzHch5upfjGrgBc=; b=oG3UhOBRznw286kSDoBNPXjfWEheiQ9MLPy7uqYyNA8juxA4gQ2a0Cr9YUkICO6JPtGxbjDgkNdNSOWWWxVbA2IIbfGcq5DIC9jJnyCch7SzTYQ1EdrRXwVSlWDfJ6k/7edijtAGZPMZhx4SB+/3GeWPPpQEQme6/nzO21OvnweTMcOJIUJWFJdgjUVCgvAYTAwBLY0WfqRJxebZuKqBut26UDEYwxtUHQlZiSGt3sPBPUPJ7EkG7fw6Pvf/PF/MD0xvVEWBnNvlUUkfJMtHMYfUPhCY+9EnLKWNnxjoeap4q38vsPc129gqSxsSp5pyl9BnkuMkKElMPpPLK8WX6Q== Received: from DM5PR08CA0040.namprd08.prod.outlook.com (2603:10b6:4:60::29) by PH7PR12MB7796.namprd12.prod.outlook.com (2603:10b6:510:275::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Thu, 28 Sep 2023 02:34:05 +0000 Received: from CY4PEPF0000EDD7.namprd03.prod.outlook.com (2603:10b6:4:60:cafe::3e) by DM5PR08CA0040.outlook.office365.com (2603:10b6:4:60::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.24 via Frontend Transport; Thu, 28 Sep 2023 02:34:05 +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 CY4PEPF0000EDD7.mail.protection.outlook.com (10.167.241.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 02:34:05 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.41; Wed, 27 Sep 2023 19:33:58 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 27 Sep 2023 19:33:56 -0700 From: Rongwei Liu To: , , , , , Subject: [PATCH v1 1/5] net/mlx5: sample the srv6 last segment Date: Thu, 28 Sep 2023 05:33:36 +0300 Message-ID: <20230928023341.1239731-2-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230928023341.1239731-1-rongweil@nvidia.com> References: <20230928023341.1239731-1-rongweil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail202.nvidia.com (10.129.68.7) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD7:EE_|PH7PR12MB7796:EE_ X-MS-Office365-Filtering-Correlation-Id: f11344f8-f2d8-42ae-3a80-08dbbfcb6249 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: wzXt1QZAbaCk41dRHuJpaUU0OitTibLGQGLY9nDvJV8j9zjWhqQlazJBLeNZC29kBMcgiDBDPpkZ92Qm+adkAvnN9Hk5G4ti0HiEcnIgeA6Lhy9qLbYANkh+z9twbWlQxfaPDa6WArB2q9H8RFovAIWcX70Eqbm3MwNktZ4oosvb1eTBLPNkgiYAOyDMwQezvbzagz9pUgoxjWTXjjNaLFp0y1Ox/XJEkk6RiQh9uT9KybOvI7BiddI+0Gt9fR1eKgB/C5oPQ2t5A4eXkqgioO9LYCQHeWCcbLUirUu+CZ0MTYhLYeKFwpDW4ypwz4TtDt+yOh1LWXcTyEgqoxy5aoGhoOpmk2y4hqUxcO2OYfmznWFNhodqqysYXGcpQfpk4S2InqnyhtBtqh16rJCLHS9NtG9pGGpe5ztLamcrjygtGVWMZ7hQt9FD1VxMdzPxEWfP7JJqKsHPT8beDmMVBTVKFQL4MJDVQSnG7vI/DSNDLwJada5wH30pg6cK0cRRTkoSAkc6Qa3cqyBnWrdGCkN0CFJqMSV+UeTYbDBOUhJuMhy55rjiwISWkWqknDQRq0YYCb8YMVrAf+3yW94ivPjjyFa+oSUKrGlKwRh14ib6VUdZkWFuf+OQpyoWk+7lP88ZjxfOut/TJy+6tpO3ss50Apvd71ZGEZmZB64+1LripvoX3s/iD/4F2cNJzhJFsSNpZGDbeFvGoBEStXmFvttnDGYdj72U1Sf+YC3Ti1/Jdh4Np1Sb6oXffa5LwQB8 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:(13230031)(4636009)(376002)(346002)(136003)(396003)(39860400002)(230922051799003)(1800799009)(186009)(64100799003)(451199024)(82310400011)(36840700001)(40470700004)(46966006)(70586007)(336012)(40460700003)(16526019)(6286002)(26005)(82740400003)(6666004)(426003)(86362001)(1076003)(7696005)(110136005)(47076005)(478600001)(36860700001)(2906002)(55016003)(83380400001)(40480700001)(7636003)(356005)(316002)(8936002)(36756003)(2616005)(5660300002)(70206006)(8676002)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 02:34:05.0352 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f11344f8-f2d8-42ae-3a80-08dbbfcb6249 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: CY4PEPF0000EDD7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7796 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 removing the IPv6 routing extension header from the packets, the destination address should be updated to the last one in the segment list. Enlarge the hardware sample scope to cover the last segment. Signed-off-by: Rongwei Liu --- drivers/net/mlx5/mlx5.c | 41 ++++++++++++++++++++++++++++++----------- drivers/net/mlx5/mlx5.h | 6 ++++++ 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 902e919425..2c6919a0c1 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1088,6 +1088,7 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev) struct mlx5_devx_graph_node_attr node = { .modify_field_select = 0, }; + uint32_t i; uint32_t ids[MLX5_GRAPH_NODE_SAMPLE_NUM]; struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_common_dev_config *config = &priv->sh->cdev->config; @@ -1121,10 +1122,18 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev) node.next_header_field_size = 0x8; node.in[0].arc_parse_graph_node = MLX5_GRAPH_ARC_NODE_IP; node.in[0].compare_condition_value = IPPROTO_ROUTING; - node.sample[0].flow_match_sample_en = 1; - /* First come first serve no matter inner or outer. */ - node.sample[0].flow_match_sample_tunnel_mode = MLX5_GRAPH_SAMPLE_TUNNEL_FIRST; - node.sample[0].flow_match_sample_offset_mode = MLX5_GRAPH_SAMPLE_OFFSET_FIXED; + /* Final IPv6 address. */ + for (i = 0; i <= MLX5_SRV6_SAMPLE_NUM - 1 && i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) { + node.sample[i].flow_match_sample_en = 1; + node.sample[i].flow_match_sample_offset_mode = + MLX5_GRAPH_SAMPLE_OFFSET_FIXED; + /* First come first serve no matter inner or outer. */ + node.sample[i].flow_match_sample_tunnel_mode = + MLX5_GRAPH_SAMPLE_TUNNEL_FIRST; + node.sample[i].flow_match_sample_field_base_offset = + (i + 1) * sizeof(uint32_t); /* in bytes */ + } + node.sample[0].flow_match_sample_field_base_offset = 0; node.out[0].arc_parse_graph_node = MLX5_GRAPH_ARC_NODE_TCP; node.out[0].compare_condition_value = IPPROTO_TCP; node.out[1].arc_parse_graph_node = MLX5_GRAPH_ARC_NODE_UDP; @@ -1137,8 +1146,8 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev) goto error; } priv->sh->srh_flex_parser.flex.devx_fp->devx_obj = fp; - priv->sh->srh_flex_parser.flex.mapnum = 1; - priv->sh->srh_flex_parser.flex.devx_fp->num_samples = 1; + priv->sh->srh_flex_parser.flex.mapnum = MLX5_SRV6_SAMPLE_NUM; + priv->sh->srh_flex_parser.flex.devx_fp->num_samples = MLX5_SRV6_SAMPLE_NUM; ret = mlx5_devx_cmd_query_parse_samples(fp, ids, priv->sh->srh_flex_parser.flex.mapnum, &priv->sh->srh_flex_parser.flex.devx_fp->anchor_id); @@ -1146,12 +1155,22 @@ mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev) DRV_LOG(ERR, "Failed to query sample IDs."); goto error; } - ret = mlx5_devx_cmd_match_sample_info_query(ibv_ctx, ids[0], - &priv->sh->srh_flex_parser.flex.devx_fp->sample_info[0]); - if (ret) { - DRV_LOG(ERR, "Failed to query sample id information."); - goto error; + for (i = 0; i <= MLX5_SRV6_SAMPLE_NUM - 1 && i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) { + ret = mlx5_devx_cmd_match_sample_info_query(ibv_ctx, ids[i], + &priv->sh->srh_flex_parser.flex.devx_fp->sample_info[i]); + if (ret) { + DRV_LOG(ERR, "Failed to query sample id %u information.", ids[i]); + goto error; + } + } + for (i = 0; i <= MLX5_SRV6_SAMPLE_NUM - 1 && i < MLX5_GRAPH_NODE_SAMPLE_NUM; i++) { + priv->sh->srh_flex_parser.flex.devx_fp->sample_ids[i] = ids[i]; + priv->sh->srh_flex_parser.flex.map[i].width = sizeof(uint32_t) * CHAR_BIT; + priv->sh->srh_flex_parser.flex.map[i].reg_id = i; + priv->sh->srh_flex_parser.flex.map[i].shift = + (i + 1) * sizeof(uint32_t) * CHAR_BIT; } + priv->sh->srh_flex_parser.flex.map[0].shift = 0; return 0; error: if (fp) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 9c93eea269..951feb5ac4 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1376,6 +1376,7 @@ struct mlx5_flex_pattern_field { uint16_t shift:5; uint16_t reg_id:5; }; + #define MLX5_INVALID_SAMPLE_REG_ID 0x1F /* Port flex item context. */ @@ -1387,6 +1388,11 @@ struct mlx5_flex_item { struct mlx5_flex_pattern_field map[MLX5_FLEX_ITEM_MAPPING_NUM]; }; +/* + * Sample an IPv6 address and the first dword of SRv6 header. + * Then it is 16 + 4 = 20 bytes which is 5 dwords. + */ +#define MLX5_SRV6_SAMPLE_NUM 5 /* Mlx5 internal flex parser profile structure. */ struct mlx5_internal_flex_parser_profile { uint32_t refcnt;