From patchwork Mon Oct 16 18:42:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132642 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 2CB0A43181; Mon, 16 Oct 2023 20:43:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3160040E6E; Mon, 16 Oct 2023 20:43:29 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) by mails.dpdk.org (Postfix) with ESMTP id DCF2940E6E for ; Mon, 16 Oct 2023 20:43:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e2c16neXL0iSIsOdzqjQzbZ4MA3mzXCXV8dtZpZsw3XAAEhvwUeZVpKClUsXlRUTPao/pyumFYXSWBbki1hFtS5YxLSnsGL2Md+t5zNtFXvTK4lSXuddzwFVcNT+K/4w/O/vtwWX/qEVq0Qga5XG+ckIU1nOFz8E1xYWB5YrHXP+6nlOkjey9Dqlpuit6f3NuYcAdb7yj9zRduSFzor6X2zfizMEVIPmcKSUZbP/2PHJvIAEzQVtgzUlfZb5Y8R7JXWDOXPUvHUTDELqbw9kkAuK6cHIzts4ljrHXH7XTDbaJgNqNVCzkQfCq3rHEl1aS1PRxfSxi88p5oitOXWRqQ== 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=4j7iLitmKH9kSaRM5+Q7vEvK4ohETKlix6QQq3nA/cU=; b=nH+u5DJ0YDG+hzrybK4Z8bdGYclAzyll+1urK/JRbTyAuY3kZai+uJ3KLqEfZP/roFjPy4zLx7fR7rLHUUyCDOwRgAzJPxTWuV9YK4D6M1PUjGTuaxwawKHUZIkbALPB6fEofZ2F5W79BvDOBpD6kB07srf7eEV4ni6z2ZhSJyTYYq+I6b1tyU53ZRLHiIuG12+ib9UyuX0jzqR+1fl9vA9FitNq6Z0CTM7yWsDFAcnVT92TdDp+phF3rT8rsye8Lmwzq8A2xyaXHgwUCUBV5skBt6IySWcIuUCJRzj/uOn0HJtfIc3acx0NsnnrqqQTwnOJd0lpo5fMAG3KHFqk8A== 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=4j7iLitmKH9kSaRM5+Q7vEvK4ohETKlix6QQq3nA/cU=; b=ECHIdE/ZFPEYrL06zEBoEtMBDyJowurbpcgfgoV0DcXjPx91dPz4mPocgoOJGMw7bfQ+ZfZ1KSfc92iwK4j8tEBGzocqS2joQ9eU3geB6UioS6nR4qaq7BB8P2DPEOkWc0hPFfanoHw5hmdWr5Gr7FJ1mIzM6lxGb7ik8WYWNy2BlmpLDuDT7Ie1wCDdqP7tVqZDGnhnckQVRTxuiRA0yuuhwuHx6jAnLdiPqT7Gc5DLdTu5EQ61S5w+0GxjAaH6elTJH0hGNr4O3ke1FlTCbu/7Pflh8EUsUTv6PX3JkRyLIjLUVJNWTXbCv6NeQlQbjSVovL7FVWDf12qfZCaGqQ== Received: from MW4PR04CA0279.namprd04.prod.outlook.com (2603:10b6:303:89::14) by MN0PR12MB6343.namprd12.prod.outlook.com (2603:10b6:208:3c0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Mon, 16 Oct 2023 18:43:24 +0000 Received: from MWH0EPF000989EC.namprd02.prod.outlook.com (2603:10b6:303:89:cafe::b2) by MW4PR04CA0279.outlook.office365.com (2603:10b6:303:89::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36 via Frontend Transport; Mon, 16 Oct 2023 18:43: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 MWH0EPF000989EC.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Mon, 16 Oct 2023 18:43: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; Mon, 16 Oct 2023 11:43:09 -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; Mon, 16 Oct 2023 11:43:06 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , =?utf-8?q?=C2=A0_=2E_=2E_/patches/upstream-pmd-indirect-actions-list/v2/v2-?= =?utf-8?q?0000-cover-letter_=2E_patch?= , Haifei Luo , Shun Hao , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v2 06/16] net/mlx5/hws: support reformat for hws mirror Date: Mon, 16 Oct 2023 21:42:25 +0300 Message-ID: <20231016184235.200427-6-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016184235.200427-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231016184235.200427-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EC:EE_|MN0PR12MB6343:EE_ X-MS-Office365-Filtering-Correlation-Id: e3e40943-dc99-4532-b569-08dbce77c764 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r18dARKqPuBsWlcjOpuNNH0ZLkuuNEfq6MK2GoiVYmKpwM06b9CKvR9kLHbMT4uz5nA9vAg+KDgiYApQXxXvTJEp0ghGB3u7OArRTVqecjVZiXwewxXYTGiLlgSTUcdXGAOfR+ayhUcVTcYFNnYOEWPDz5gF2spB5RwlYpFJytzD6l7hoNvlzQOW94zkzwheCSXYxPw2jwTBGOrqOG8kVp08QfUPS0cMD/ooFsTP4xnBTPbkojLv3O4xbA2iTsPIx0ldUy8ciBlotYUW0cFy3fWih1ZQ0VuYIB+GngQiG/qj99HCOTpRiJ0m8WT1Dzkkp2fnq2iKU/S78jANm3EsZSFhagydZZ4qePknhnLbM1Z9fkM7ttN7gRZ05xdJBijNxBp9m1NhP9j4n3qxluKs8o4xpumjrQvh/kBTDWRksePdtqvXUwTdxsbH6l8ROpDFRBe5EhuV0CKNi2UjD4uMlTZGWM7TwjejBIJYYDh3udByZ7qR6meOapY6h199AluIiUDYxAGUcDSA/tZBT/sjqVPmH7lqYp6OR7dAHDpHK7sxlbkHKex+vgOH3rTjxV+fCazZOXt3uPaXd6WWcwoFbpy7xTPjE/HfcRLRahYvh2YZcyaTDUGWPNc8/tW8BAEcqNuEzN16uuVcaNBVOwacE3lv4evx0h7sOS8FfR8H6IGmKJouPp2mlrXmmkC5yWSv9REq5HVXLpw+NiVFsVgZAdldUt2COM9T2l07Hq0p6pUZ/igGiaJmB95CygH7Oeft 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)(136003)(396003)(346002)(39860400002)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(82310400011)(40470700004)(46966006)(36840700001)(83380400001)(336012)(26005)(426003)(16526019)(6286002)(1076003)(5660300002)(41300700001)(8936002)(8676002)(107886003)(2616005)(36756003)(40460700003)(86362001)(4326008)(356005)(7636003)(40480700001)(55016003)(82740400003)(36860700001)(47076005)(2906002)(478600001)(316002)(54906003)(70586007)(6916009)(70206006)(7696005)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 18:43:24.3346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e3e40943-dc99-4532-b569-08dbce77c764 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: MWH0EPF000989EC.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6343 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 --- 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;