From patchwork Tue Oct 17 08:09:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132727 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 ED9C64318A; Tue, 17 Oct 2023 10:10:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E77FA42DA6; Tue, 17 Oct 2023 10:10:29 +0200 (CEST) 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 BEFD742830 for ; Tue, 17 Oct 2023 10:10:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i/bZGpdvDCXx+JlUxm0Z2LXnaV7f629YTunTu6IBVN38tkGk82GuHKSatkRqeGRIySoekMikY+PU6RYHElWh2Fe0n/6zUoZ7Gcya6LBc6z4KDN923aFXyJ6M7nKc04Bg6o3eNJENJx1Lk9jcimNEkGIgOP/eHps+BUXaHFha8mpJW96D6s5lDrVTDmeXQLgjdaDY6Kr1i9eqmJuo8vrruuWE6AmxpYsjsCMPwTKx9f38ZMBu3YzIo46YC6IkBka92Q7WmIYLtYySUCERfuf6zstp23lpXvusCqKoHHdupyvoWAbiVfscSe//DRcnsbJSUragZWIpH2TLgpFA8w/s8g== 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=M59nx9z4QAIdFNtQPUSYc5ZO9VEVwibTqTr0uwzhjCI=; b=MoDvkRavmEY6PvKfw95ln/7Waidqqb7hS7pOH6JhRS6b9Eb/QVnbXx8Jf8jbWhVVGgQOo5bgotM9VuHxas6Sc3r07ZxWrV/60U/n/jZTVip5KrUFbiUQYhMdqCV9AqA8uBQ75SKA3bUdXHFVqM6OVzbuxXlXSFRxaktX+OVO2w7zejGdW6b7xN+tFyZUYyumfF1jAwE+aIgU3FyCP1f1NcAzUzOl9bfTR+WleUN5tIrILp9ZipqxO4z+w3uPxkGjVcvSzgnHxRwjsz1Gd6OfpyIUd6YmnjjQGbBTVL/kFsrOD79SJ1sxK/921PpUq9Sa+98woIA0Lt3XaDzTy+eSUg== 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=M59nx9z4QAIdFNtQPUSYc5ZO9VEVwibTqTr0uwzhjCI=; b=fiISy3UXh+xkj4zFZVbDBMMUqWSjlXkZUF5606fjgyhHS/RNjFncvdkFZwJvzkxruevwx3JFgg3LifgbpsKocodgMLjNqs8EYn6OPKpOg+3dKwZV/qy5vY5//WnY+VTC9R/QUhcM2dvOEj629ofjbgoa//4O+EhEsw03j8XIa56DDsUMcLhXTka1N/CK8Ms/OdpnI4DbCrBbz+ku9ORaWhmJsxZNuVIyUT8D5JnTosPr1KKgRxCzbKrUxcE1v7eAdgHRvzX8mYRvWH5wN0u5h87kKLqp7pBBGfOLpu1E4Hk/e/6W36cDFIUE0DCQeRpp59oyYYGyKp7Zj1k6R0KKxw== Received: from CYZPR11CA0024.namprd11.prod.outlook.com (2603:10b6:930:8d::9) by SA1PR12MB8119.namprd12.prod.outlook.com (2603:10b6:806:337::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Tue, 17 Oct 2023 08:10:24 +0000 Received: from CY4PEPF0000E9DB.namprd05.prod.outlook.com (2603:10b6:930:8d:cafe::60) by CYZPR11CA0024.outlook.office365.com (2603:10b6:930:8d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36 via Frontend Transport; Tue, 17 Oct 2023 08:10:24 +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 CY4PEPF0000E9DB.mail.protection.outlook.com (10.167.241.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Tue, 17 Oct 2023 08:10:24 +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.41; Tue, 17 Oct 2023 01:10:06 -0700 Received: from nvidia.com (10.126.230.35) 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.41; Tue, 17 Oct 2023 01:10:02 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Haifei Luo , Shun Hao , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v3 06/16] net/mlx5/hws: support reformat for hws mirror Date: Tue, 17 Oct 2023 11:09:18 +0300 Message-ID: <20231017080928.30454-7-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017080928.30454-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231017080928.30454-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] 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: CY4PEPF0000E9DB:EE_|SA1PR12MB8119:EE_ X-MS-Office365-Filtering-Correlation-Id: af888464-86d4-42aa-9f5d-08dbcee883e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LmadPxYc0wDhgHGD/4lOiv/lkX/+FyUhq3654lI4gWeuZAqoMf3x8vcu1Uw2NsqXROPJxIIZteGLQ81qXDabS7owRIImqGD6Mvt3LcH1diDQA6XdYpmzzPBCER/2FQRxsIE78xEedCfgv8DFgp7ku5SgxBJQFEW/iMB4zvGJ47EoTlrNGxQ4IXgIbf/VGYmqpCPON4rAL5Aafq3m+HRWovK+69yk7kXlvaRUN/143ozExGR0WAum4SUiuvSGLAHYDhT4qhnVr4gEXNynywLH082N9x2eHDZql1pkklt+RxZzPdADAe4OcvhGhwX98XJsmV9XdFqTDdWEb4mbD/eVz32N8kihUWqe1uAECRK+4PfkZj+IN/Q+4PcZHJ27MTs8oNVnp+iTmuI9dEayipz7kpOp8JRt0j5bxUhQDULJ3yakgIrVedOJhFRduR9dHDqP0J9vVxrdI3k/ODLI9NjDVkaOo2yqO8578nerJtQQJJbzcExr28k7A34bGeMQAD8hw5u5zunhi92z9Se8ikJVhPB5gY6gB+8RKRFK4JpYZMskW4iGMldKg2JTHU9tOXF3OuZ0DOlXUlc/OkXUr63P5AXvQ8E9LW7ypG5U67yP/nCj4GT9GgnOoXQG6Ui0HSejgNwZBWjQ8EdgoRJeem24xGwr6CQnVsT6WLs7g0Ylt23Jd39ZVw3JCy36YH0vJEG+oD7HqgIURcEByssgELpM/1CMbFVXXGUu2u5KPwMlJ9YBQ59zxFoUPKEkx7hk4uDO 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)(396003)(39860400002)(346002)(376002)(136003)(230922051799003)(82310400011)(1800799009)(64100799003)(186009)(451199024)(36840700001)(46966006)(40470700004)(6286002)(83380400001)(16526019)(26005)(107886003)(7696005)(1076003)(336012)(426003)(2616005)(40460700003)(47076005)(6666004)(36860700001)(55016003)(40480700001)(478600001)(41300700001)(36756003)(86362001)(82740400003)(7636003)(8936002)(4326008)(5660300002)(2906002)(8676002)(356005)(316002)(70586007)(70206006)(54906003)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 08:10:24.2249 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af888464-86d4-42aa-9f5d-08dbcee883e5 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: CY4PEPF0000E9DB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8119 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 From: Haifei Luo In dest_array action, an optional reformat action can be applied to each destination. This patch supports this by using the extended destination entry. Signed-off-by: Haifei Luo Signed-off-by: Shun Hao Acked-by: Suanming Mou --- drivers/common/mlx5/mlx5_prm.h | 15 +++++++ drivers/net/mlx5/hws/mlx5dr_action.c | 67 +++++++++++++++++++++++++++- drivers/net/mlx5/hws/mlx5dr_action.h | 2 + drivers/net/mlx5/hws/mlx5dr_cmd.c | 10 ++++- drivers/net/mlx5/hws/mlx5dr_cmd.h | 2 + 5 files changed, 94 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index aa0b622ca2..bced5a59dd 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -5352,6 +5352,21 @@ enum mlx5_parse_graph_arc_node_index { MLX5_GRAPH_ARC_NODE_PROGRAMMABLE = 0x1f, }; +enum mlx5_packet_reformat_context_reformat_type { + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_L2_TO_L2_TUNNEL = 0x2, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_L2_TO_L3_TUNNEL = 0x4, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_ADD_ESP_TRANSPORT_OVER_IPV4 = 0x5, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_L2_TO_L3_ESP_TUNNEL = 0x6, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_ADD_ESP_TRANSPORT_OVER_UDPV4 = 0x7, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_DEL_ESP_TRANSPORT = 0x8, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_L3_ESP_TUNNEL_TO_L2 = 0x9, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_DEL_ESP_TRANSPORT_OVER_UDP = 0xA, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_ADD_ESP_TRANSPORT_OVER_IPV6 = 0xB, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_ADD_ESP_TRANSPORT_OVER_UDPV6 = 0xC, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_ADD_NISP_TNL = 0xD, + MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_REMOVE_NISP_TNL = 0xE, +}; + #define MLX5_PARSE_GRAPH_FLOW_SAMPLE_MAX 8 #define MLX5_PARSE_GRAPH_IN_ARC_MAX 8 #define MLX5_PARSE_GRAPH_OUT_ARC_MAX 8 diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 6b62111593..11a7c58925 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -1703,6 +1703,44 @@ mlx5dr_action_create_modify_header(struct mlx5dr_context *ctx, return NULL; } +static struct mlx5dr_devx_obj * +mlx5dr_action_dest_array_process_reformat(struct mlx5dr_context *ctx, + enum mlx5dr_action_type type, + void *reformat_data, + size_t reformat_data_sz) +{ + struct mlx5dr_cmd_packet_reformat_create_attr pr_attr = {0}; + struct mlx5dr_devx_obj *reformat_devx_obj; + + if (!reformat_data || !reformat_data_sz) { + DR_LOG(ERR, "Empty reformat action or data"); + rte_errno = EINVAL; + return NULL; + } + + switch (type) { + case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2: + pr_attr.type = MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_L2_TO_L2_TUNNEL; + break; + case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3: + pr_attr.type = MLX5_PACKET_REFORMAT_CONTEXT_REFORMAT_TYPE_L2_TO_L3_TUNNEL; + break; + default: + DR_LOG(ERR, "Invalid value for reformat type"); + rte_errno = EINVAL; + return NULL; + } + pr_attr.reformat_param_0 = 0; + pr_attr.data_sz = reformat_data_sz; + pr_attr.data = reformat_data; + + reformat_devx_obj = mlx5dr_cmd_packet_reformat_create(ctx->ibv_ctx, &pr_attr); + if (!reformat_devx_obj) + return NULL; + + return reformat_devx_obj; +} + struct mlx5dr_action * mlx5dr_action_create_dest_array(struct mlx5dr_context *ctx, size_t num_dest, @@ -1710,6 +1748,7 @@ mlx5dr_action_create_dest_array(struct mlx5dr_context *ctx, uint32_t flags) { struct mlx5dr_cmd_set_fte_dest *dest_list = NULL; + struct mlx5dr_devx_obj *packet_reformat = NULL; struct mlx5dr_cmd_ft_create_attr ft_attr = {0}; struct mlx5dr_cmd_set_fte_attr fte_attr = {0}; struct mlx5dr_cmd_forward_tbl *fw_island; @@ -1796,6 +1835,21 @@ mlx5dr_action_create_dest_array(struct mlx5dr_context *ctx, dest_list[i].destination_id = dests[i].dest->devx_dest.devx_obj->id; fte_attr.action_flags |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST; break; + case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2: + case MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3: + packet_reformat = mlx5dr_action_dest_array_process_reformat + (ctx, + *action_type, + dests[i].reformat.reformat_data, + dests[i].reformat.reformat_data_sz); + if (!packet_reformat) + goto free_dest_list; + + dest_list[i].ext_flags |= MLX5DR_CMD_EXT_DEST_REFORMAT; + dest_list[i].ext_reformat = packet_reformat; + ft_attr.reformat_en = true; + fte_attr.extended_dest = 1; + break; default: DR_LOG(ERR, "Unsupported action in dest_array"); rte_errno = ENOTSUP; @@ -1819,8 +1873,9 @@ mlx5dr_action_create_dest_array(struct mlx5dr_context *ctx, goto free_action; action->dest_array.fw_island = fw_island; + action->dest_array.num_dest = num_dest; + action->dest_array.dest_list = dest_list; - simple_free(dest_list); return action; free_action: @@ -1828,6 +1883,10 @@ mlx5dr_action_create_dest_array(struct mlx5dr_context *ctx, destroy_fw_island: mlx5dr_cmd_forward_tbl_destroy(fw_island); free_dest_list: + for (i = 0; i < num_dest; i++) { + if (dest_list[i].ext_reformat) + mlx5dr_cmd_destroy_obj(dest_list[i].ext_reformat); + } simple_free(dest_list); return NULL; } @@ -1917,6 +1976,12 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) case MLX5DR_ACTION_TYP_DEST_ARRAY: mlx5dr_action_destroy_stcs(action); mlx5dr_cmd_forward_tbl_destroy(action->dest_array.fw_island); + for (i = 0; i < action->dest_array.num_dest; i++) { + if (action->dest_array.dest_list[i].ext_reformat) + mlx5dr_cmd_destroy_obj + (action->dest_array.dest_list[i].ext_reformat); + } + simple_free(action->dest_array.dest_list); break; case MLX5DR_ACTION_TYP_REFORMAT_TNL_L3_TO_L2: case MLX5DR_ACTION_TYP_MODIFY_HDR: diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h b/drivers/net/mlx5/hws/mlx5dr_action.h index efe07c9d47..582a38bebc 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.h +++ b/drivers/net/mlx5/hws/mlx5dr_action.h @@ -153,6 +153,8 @@ struct mlx5dr_action { } devx_dest; struct { struct mlx5dr_cmd_forward_tbl *fw_island; + size_t num_dest; + struct mlx5dr_cmd_set_fte_dest *dest_list; } dest_array; }; }; diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c b/drivers/net/mlx5/hws/mlx5dr_cmd.c index 22f7c6b019..781de40c02 100644 --- a/drivers/net/mlx5/hws/mlx5dr_cmd.c +++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c @@ -169,7 +169,9 @@ mlx5dr_cmd_set_fte(struct ibv_context *ctx, uint32_t *in; uint32_t i; - dest_entry_sz = MLX5_ST_SZ_BYTES(dest_format); + dest_entry_sz = fte_attr->extended_dest ? + MLX5_ST_SZ_BYTES(extended_dest_format) : + MLX5_ST_SZ_BYTES(dest_format); total_dest_sz = dest_entry_sz * fte_attr->dests_num; inlen = align((MLX5_ST_SZ_BYTES(set_fte_in) + total_dest_sz), DW_SIZE); in = simple_calloc(1, inlen); @@ -192,6 +194,7 @@ mlx5dr_cmd_set_fte(struct ibv_context *ctx, in_flow_context = MLX5_ADDR_OF(set_fte_in, in, flow_context); MLX5_SET(flow_context, in_flow_context, group_id, group_id); MLX5_SET(flow_context, in_flow_context, flow_source, fte_attr->flow_source); + MLX5_SET(flow_context, in_flow_context, extended_destination, fte_attr->extended_dest); MLX5_SET(set_fte_in, in, ignore_flow_level, fte_attr->ignore_flow_level); action_flags = fte_attr->action_flags; @@ -230,6 +233,11 @@ mlx5dr_cmd_set_fte(struct ibv_context *ctx, dest->destination_type); MLX5_SET(dest_format, in_dests, destination_id, dest->destination_id); + if (dest->ext_flags & MLX5DR_CMD_EXT_DEST_REFORMAT) { + MLX5_SET(dest_format, in_dests, packet_reformat, 1); + MLX5_SET(extended_dest_format, in_dests, packet_reformat_id, + dest->ext_reformat->id); + } break; default: rte_errno = EOPNOTSUPP; diff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.h b/drivers/net/mlx5/hws/mlx5dr_cmd.h index 6f4aa3e320..28e5ea4726 100644 --- a/drivers/net/mlx5/hws/mlx5dr_cmd.h +++ b/drivers/net/mlx5/hws/mlx5dr_cmd.h @@ -14,6 +14,7 @@ struct mlx5dr_cmd_set_fte_dest { uint8_t destination_type; uint32_t destination_id; enum mlx5dr_cmd_ext_dest_flags ext_flags; + struct mlx5dr_devx_obj *ext_reformat; uint16_t esw_owner_vhca_id; }; @@ -21,6 +22,7 @@ struct mlx5dr_cmd_set_fte_attr { uint32_t action_flags; uint8_t ignore_flow_level; uint8_t flow_source; + uint8_t extended_dest; uint8_t encrypt_decrypt_type; uint32_t encrypt_decrypt_obj_id; uint32_t packet_reformat_id;