From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8BBE7A0A03; Thu, 20 Oct 2022 05:22:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0044042C9C; Thu, 20 Oct 2022 05:22:47 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2081.outbound.protection.outlook.com [40.107.92.81]) by mails.dpdk.org (Postfix) with ESMTP id 7DF4C42C7D for ; Thu, 20 Oct 2022 05:22:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ms98B2+YUhL/lr9+ubDJOTusWHRXpReew1FEb+YZKzxfXknqYfvBhH2JNzyfAnBwviKkPWhnS5nNwjX9vH4w1sThGpSCgvUwAWF6PIox0wjNPFkjsk2NEczfNjWImmzR0tWJiA6B8q9wOIoow/4z6BHxCKmNNYHvMWwf62WLqzmRw4OMIaY7SPC+f9M/yNmtg3fgXpsjni+mSFo8P6lqVwKYqo8RPJ4CVch71h0AqbACHOv8rj45L48wQXI2vu7gFClCDNTuyJTKcTCjEdO9Zr8Wok2+3YlERJSHV8itjCk7KUc1dA3FgzT0WYtg/tG5VF5+JcPabiOmLc8y5ugtNw== 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=wBYEtH8rucWhtFy0mT2rTBIc4cBqjLttqgDiqBGXRnk=; b=L6irAGQI6SIgELBh69zMlkMDu+w2nAhnKly7gNQJek1RuUumisLnSKW9kPLapcl3vDxQpmCZ3DrZmFlteK8P8XvOT18VO8rfMJZEbL+Hams+or5togz38JeS2Pb73YXDrcbBbFEKCeqzZLsc5Q7Sn0Hi8+SJqFxf9C0HGbFdBPFe4Wc0qqALbG6nYOzA7WZ1iURxioDH1g3e99KZZfTgIS+8yKNe8lppez6sXONC3ZVlcSlRZy6SZWSJht74Ij6E6g1KJz5lcnWZn/9Csj9WyMwxJSeun/Sv7ojDebVKp09I9gfQ/77SpeiPm11/yBxg2/j6QGhan8RMqri0xSEAUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=wBYEtH8rucWhtFy0mT2rTBIc4cBqjLttqgDiqBGXRnk=; b=QH7DfPcHreKV4VNwRWcmnIHVK6J27tMGS25mYfXj20EYVVxUcSzqi+Y5Ljp9F0EWGHut0NvrNfvVPQ29nmWkpY9KusxVcj+AJX42d9HccLYcGspBHZVP2PV4ZLVb4JkZ/YNDeEfVEYFvIlKxIuc+3ffsZCZHrUGJYb7ofEM+Y/FKPa6pqSi/Pi7/DW9S1RJe4NbF8Jk5b25LgxgOdkICKwLqhBeabFkcxpwJZHVj41qwjOrcSqUnFTOu+4RHQCy9aAhJXGBjX4Yuc3XR4KfhDCzIcTSKy2YiBIKfMfRwamFBXX1l7vum8+KyMhEglr3g/9lDy/K/T3eR51eQ2R+0iA== Received: from BN9P223CA0029.NAMP223.PROD.OUTLOOK.COM (2603:10b6:408:10b::34) by BY5PR12MB4871.namprd12.prod.outlook.com (2603:10b6:a03:1d1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34; Thu, 20 Oct 2022 03:22:44 +0000 Received: from BN8NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10b:cafe::d1) by BN9P223CA0029.outlook.office365.com (2603:10b6:408:10b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34 via Frontend Transport; Thu, 20 Oct 2022 03:22:43 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT059.mail.protection.outlook.com (10.13.177.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Thu, 20 Oct 2022 03:22:43 +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.26; Wed, 19 Oct 2022 20:22:31 -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.29; Wed, 19 Oct 2022 20:22:29 -0700 From: Suanming Mou To: Matan Azrad , Viacheslav Ovsiienko CC: , , Subject: [PATCH v5 03/18] net/mlx5: add shared header reformat support Date: Thu, 20 Oct 2022 06:21:55 +0300 Message-ID: <20221020032210.30250-4-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20221020032210.30250-1-suanmingm@nvidia.com> References: <20220923144334.27736-1-suanmingm@nvidia.com> <20221020032210.30250-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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: BN8NAM11FT059:EE_|BY5PR12MB4871:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c71f09e-bfc1-46b2-4722-08dab24a5a50 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VyII0g7A2+QAfeBmyzJ11UslxUVnKtibTi1dAxL+2Trmus/BEbpWdQLYVgNttFBPuP2pQYGEdedFrfzBZUhOuCTo6QofT74v0fpDMoTpAvkosvJcZGHBkz/F2r7xWUU6S9uTJ6aZl34JzjeHzQhRfKPhLYg397Bjpcxh5367L2hcnF8IQs1b0L8ojeJ7Fqg50h4U2iBATgkxc44kMAXImB+9LSooo0zxcG2IgBuJ53Y8/l19RqsncJSSexIl2WL+6ZWfaqmVcj7UDUIsShMx1+ui3XuxTXupqt4eq0lNOk7jFiPRAGUnBr54GEy3T7PdxPltg4rj3sh3g98Q63sYd4bRrO5iJetNi9kU92Afie0hhDrfO4FoKWaRt4jQkK82nAVZwHEMolve8c7/6KyMv47f8sQ7OIoNOxWxOI/nCzqfTHDlijEd7I6uSDAQlHCalC94Ha4E7U6xcjzZUW/Xo2B+CNSqK40+fn9sHSF8klEuBTCEzbjkOT5d6VvjOG5xodBD035LHjB6ylj0rM89g0zdLOb6MMzqt1t0RJ66ebjmR14W43Wo3fcK9F49J3hGr8KFZiMRxzgzsMRJ+PKI5n/pcSI+zLw13OhMZIFw1LpAbw/QuYS4J7kdwHUhdfxs/zNsDTDso+UxYcV3Z4qJga/+bCf4IU3d8fI/SVLm/YMciM1LsT7nEE3Lhvd1zjbT2tsasHTdYdruvw3bp8/S8tDYfF5+eelGwLF8RFmT6dUI9ai5RCHwtPN6iPJp9XH702pbt9U/0/brWuQb0c6jgA== 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:(13230022)(4636009)(39860400002)(346002)(396003)(376002)(136003)(451199015)(46966006)(36840700001)(40470700004)(86362001)(36756003)(356005)(7636003)(82740400003)(2906002)(7696005)(336012)(55016003)(5660300002)(40460700003)(40480700001)(6666004)(6286002)(26005)(16526019)(186003)(1076003)(2616005)(107886003)(83380400001)(426003)(47076005)(36860700001)(6636002)(82310400005)(478600001)(70586007)(110136005)(41300700001)(70206006)(54906003)(316002)(8936002)(4326008)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 03:22:43.6849 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c71f09e-bfc1-46b2-4722-08dab24a5a50 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: BN8NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4871 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 As the rte_flow_async API defines, the action mask with field value not be 0 means the action will be used as shared in all the flows in the table. The header reformat action with action mask field not be 0 will be created as constant shared action. For encapsulation header reformat action, there are two kinds of encapsulation data, raw_encap_data and rte_flow_item encap_data. Both of these two kinds of data can be identified from the action mask conf as constant or not. Examples: 1. VXLAN encap (encap_data: rte_flow_item) action conf (eth/ipv4/udp/vxlan_hdr) a. action mask conf (eth/ipv4/udp/vxlan_hdr) - items are constant. b. action mask conf (NULL) - items will change. 2. RAW encap (encap_data: raw) action conf (raw_data) a. action mask conf (not NULL) - encap_data constant. b. action mask conf (NULL) - encap_data will change. Signed-off-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow.h | 6 +- drivers/net/mlx5/mlx5_flow_hw.c | 124 ++++++++++---------------------- 2 files changed, 39 insertions(+), 91 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index cde602d3a1..26660da0de 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1075,10 +1075,6 @@ struct mlx5_action_construct_data { uint16_t action_dst; /* mlx5dr_rule_action dst offset. */ union { struct { - /* encap src(item) offset. */ - uint16_t src; - /* encap dst data offset. */ - uint16_t dst; /* encap data len. */ uint16_t len; } encap; @@ -1121,6 +1117,8 @@ struct mlx5_hw_jump_action { /* Encap decap action struct. */ struct mlx5_hw_encap_decap_action { struct mlx5dr_action *action; /* Action object. */ + /* Is header_reformat action shared across flows in table. */ + bool shared; size_t data_size; /* Action metadata size. */ uint8_t data[]; /* Action data. */ }; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index d46e4c6769..e62d25fda2 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -402,10 +402,6 @@ __flow_hw_act_data_general_append(struct mlx5_priv *priv, * Offset of source rte flow action. * @param[in] action_dst * Offset of destination DR action. - * @param[in] encap_src - * Offset of source encap raw data. - * @param[in] encap_dst - * Offset of destination encap raw data. * @param[in] len * Length of the data to be updated. * @@ -418,16 +414,12 @@ __flow_hw_act_data_encap_append(struct mlx5_priv *priv, enum rte_flow_action_type type, uint16_t action_src, uint16_t action_dst, - uint16_t encap_src, - uint16_t encap_dst, uint16_t len) { struct mlx5_action_construct_data *act_data; act_data = __flow_hw_act_data_alloc(priv, type, action_src, action_dst); if (!act_data) return -1; - act_data->encap.src = encap_src; - act_data->encap.dst = encap_dst; act_data->encap.len = len; LIST_INSERT_HEAD(&acts->act_list, act_data, next); return 0; @@ -523,53 +515,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, return 0; } -/** - * Translate encap items to encapsulation list. - * - * @param[in] dev - * Pointer to the rte_eth_dev data structure. - * @param[in] acts - * Pointer to the template HW steering DR actions. - * @param[in] type - * Action type. - * @param[in] action_src - * Offset of source rte flow action. - * @param[in] action_dst - * Offset of destination DR action. - * @param[in] items - * Encap item pattern. - * @param[in] items_m - * Encap item mask indicates which part are constant and dynamic. - * - * @return - * 0 on success, negative value otherwise and rte_errno is set. - */ -static __rte_always_inline int -flow_hw_encap_item_translate(struct rte_eth_dev *dev, - struct mlx5_hw_actions *acts, - enum rte_flow_action_type type, - uint16_t action_src, - uint16_t action_dst, - const struct rte_flow_item *items, - const struct rte_flow_item *items_m) -{ - struct mlx5_priv *priv = dev->data->dev_private; - size_t len, total_len = 0; - uint32_t i = 0; - - for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++, items_m++, i++) { - len = flow_dv_get_item_hdr_len(items->type); - if ((!items_m->spec || - memcmp(items_m->spec, items->spec, len)) && - __flow_hw_act_data_encap_append(priv, acts, type, - action_src, action_dst, i, - total_len, len)) - return -1; - total_len += len; - } - return 0; -} - /** * Translate rte_flow actions to DR action. * @@ -611,7 +556,7 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, const struct rte_flow_action_raw_encap *raw_encap_data; const struct rte_flow_item *enc_item = NULL, *enc_item_m = NULL; uint16_t reformat_pos = MLX5_HW_MAX_ACTS, reformat_src = 0; - uint8_t *encap_data = NULL; + uint8_t *encap_data = NULL, *encap_data_m = NULL; size_t data_size = 0; bool actions_end = false; uint32_t type, i; @@ -718,9 +663,9 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, MLX5_ASSERT(reformat_pos == MLX5_HW_MAX_ACTS); enc_item = ((const struct rte_flow_action_vxlan_encap *) actions->conf)->definition; - enc_item_m = - ((const struct rte_flow_action_vxlan_encap *) - masks->conf)->definition; + if (masks->conf) + enc_item_m = ((const struct rte_flow_action_vxlan_encap *) + masks->conf)->definition; reformat_pos = i++; reformat_src = actions - action_start; refmt_type = MLX5DR_ACTION_REFORMAT_TYPE_L2_TO_TNL_L2; @@ -729,9 +674,9 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, MLX5_ASSERT(reformat_pos == MLX5_HW_MAX_ACTS); enc_item = ((const struct rte_flow_action_nvgre_encap *) actions->conf)->definition; - enc_item_m = - ((const struct rte_flow_action_nvgre_encap *) - actions->conf)->definition; + if (masks->conf) + enc_item_m = ((const struct rte_flow_action_nvgre_encap *) + masks->conf)->definition; reformat_pos = i++; reformat_src = actions - action_start; refmt_type = MLX5DR_ACTION_REFORMAT_TYPE_L2_TO_TNL_L2; @@ -743,6 +688,11 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, refmt_type = MLX5DR_ACTION_REFORMAT_TYPE_TNL_L2_TO_L2; break; case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + raw_encap_data = + (const struct rte_flow_action_raw_encap *) + masks->conf; + if (raw_encap_data) + encap_data_m = raw_encap_data->data; raw_encap_data = (const struct rte_flow_action_raw_encap *) actions->conf; @@ -773,22 +723,17 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, } if (reformat_pos != MLX5_HW_MAX_ACTS) { uint8_t buf[MLX5_ENCAP_MAX_LEN]; + bool shared_rfmt = true; if (enc_item) { MLX5_ASSERT(!encap_data); - if (flow_dv_convert_encap_data - (enc_item, buf, &data_size, error) || - flow_hw_encap_item_translate - (dev, acts, (action_start + reformat_src)->type, - reformat_src, reformat_pos, - enc_item, enc_item_m)) + if (flow_dv_convert_encap_data(enc_item, buf, &data_size, error)) goto err; encap_data = buf; - } else if (encap_data && __flow_hw_act_data_encap_append - (priv, acts, - (action_start + reformat_src)->type, - reformat_src, reformat_pos, 0, 0, data_size)) { - goto err; + if (!enc_item_m) + shared_rfmt = false; + } else if (encap_data && !encap_data_m) { + shared_rfmt = false; } acts->encap_decap = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*acts->encap_decap) + data_size, @@ -802,12 +747,22 @@ flow_hw_actions_translate(struct rte_eth_dev *dev, acts->encap_decap->action = mlx5dr_action_create_reformat (priv->dr_ctx, refmt_type, data_size, encap_data, - rte_log2_u32(table_attr->nb_flows), - mlx5_hw_act_flag[!!attr->group][type]); + shared_rfmt ? 0 : rte_log2_u32(table_attr->nb_flows), + mlx5_hw_act_flag[!!attr->group][type] | + (shared_rfmt ? MLX5DR_ACTION_FLAG_SHARED : 0)); if (!acts->encap_decap->action) goto err; acts->rule_acts[reformat_pos].action = acts->encap_decap->action; + acts->rule_acts[reformat_pos].reformat.data = + acts->encap_decap->data; + if (shared_rfmt) + acts->rule_acts[reformat_pos].reformat.offset = 0; + else if (__flow_hw_act_data_encap_append(priv, acts, + (action_start + reformat_src)->type, + reformat_src, reformat_pos, data_size)) + goto err; + acts->encap_decap->shared = shared_rfmt; acts->encap_decap_pos = reformat_pos; } acts->acts_num = i; @@ -972,6 +927,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, .ingress = 1, }; uint32_t ft_flag; + size_t encap_len = 0; memcpy(rule_acts, hw_acts->rule_acts, sizeof(*rule_acts) * hw_acts->acts_num); @@ -989,9 +945,6 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, } else { attr.ingress = 1; } - if (hw_acts->encap_decap && hw_acts->encap_decap->data_size) - memcpy(buf, hw_acts->encap_decap->data, - hw_acts->encap_decap->data_size); LIST_FOREACH(act_data, &hw_acts->act_list, next) { uint32_t jump_group; uint32_t tag; @@ -1050,23 +1003,20 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: enc_item = ((const struct rte_flow_action_vxlan_encap *) action->conf)->definition; - rte_memcpy((void *)&buf[act_data->encap.dst], - enc_item[act_data->encap.src].spec, - act_data->encap.len); + if (flow_dv_convert_encap_data(enc_item, buf, &encap_len, NULL)) + return -1; break; case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: enc_item = ((const struct rte_flow_action_nvgre_encap *) action->conf)->definition; - rte_memcpy((void *)&buf[act_data->encap.dst], - enc_item[act_data->encap.src].spec, - act_data->encap.len); + if (flow_dv_convert_encap_data(enc_item, buf, &encap_len, NULL)) + return -1; break; case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: raw_encap_data = (const struct rte_flow_action_raw_encap *) action->conf; - rte_memcpy((void *)&buf[act_data->encap.dst], - raw_encap_data->data, act_data->encap.len); + rte_memcpy((void *)buf, raw_encap_data->data, act_data->encap.len); MLX5_ASSERT(raw_encap_data->size == act_data->encap.len); break; @@ -1074,7 +1024,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev, break; } } - if (hw_acts->encap_decap) { + if (hw_acts->encap_decap && !hw_acts->encap_decap->shared) { rule_acts[hw_acts->encap_decap_pos].reformat.offset = job->flow->idx - 1; rule_acts[hw_acts->encap_decap_pos].reformat.data = buf; -- 2.25.1