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 EA2704548E; Wed, 19 Jun 2024 11:20:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8351042D97; Wed, 19 Jun 2024 11:20:25 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2138.outbound.protection.outlook.com [40.107.237.138]) by mails.dpdk.org (Postfix) with ESMTP id 53AA140289 for ; Wed, 19 Jun 2024 11:20:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tt+FFaV31iOlvOuCWTSndauXSDRzy0E7ewLNQyJNi1Fmc6JzhxCn6ilU/TIHueKbOYcG35N4J5a97FZFpKAZS0OtMJih005N5fIBx9twQ0q3QuECABU15LWD10QrkX3i5leO7IBrMzwKsEDX/Z0Wjeo7wBgArOX9HjJgJ76u9xYi/kaduFye8w2chLiteh3DLDkqwJExvmiZB4HxdEp1IatSl1DKM9plNO/eK31CuXha/Bvy0nlvlefeSg7Z8wGbqVSnoFiYqYQgjApkgp1vWRvjI2UxQzKroxOwzGmu73zl2zgjSerBDxaId1zEulkqp1IYenYQXor2D1qKuQKd9Q== 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=LoskHV963LZV4ERa8gwDS3U76FkhPfLaxeema/4Z674=; b=YzPjGLXttZ/5ORcww5i78zNziVork+pvA0VOi1rb5Vrvie5+oyLSWTCiTJ2awIrzivVqTKaa1po8la6e4pTElZHURK9PnV79uxa9vKo5Bw1Qy2m9FAPaBTDj0EzKmtPW2gRhQbqrEzIC5grYc+EgJwftuAditml2pv+Zuu0rxdMvfh4e0DuXLHui8oMcKyVZUoow6AExf1rO9WgTLOkgZs9fkNTFBktUWtcT8Qvx4Wpbsey6lLSQu3gITNks7L8mxyROenGOBV1qxSMtKLdp5FHDg27tAa01CV1sluqkCPKz+l5w+JOHz9ISoIPzfxybi9JqN9DhQkIZ24/fj9FA+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LoskHV963LZV4ERa8gwDS3U76FkhPfLaxeema/4Z674=; b=raWtsdijs+n4uihfsspjMAIoWagzzWQ7r/UJ3stf+Jpv8wDSFiz06I2PE9nAZWE6RmktC6Fu4Iq01m/CJBzt/ERonDHQexXA5NoRSmmRE8hv7ayS8ksiB+2RKMfjXPAp2kAeYPqhpOkSGSOIS+5xTkTrTdojm0uW+0taSO8CbLM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by BY1PR13MB7041.namprd13.prod.outlook.com (2603:10b6:a03:5a8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.31; Wed, 19 Jun 2024 09:20:04 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::b900:5f05:766f:833%4]) with mapi id 15.20.7677.030; Wed, 19 Jun 2024 09:20:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 3/7] net/nfp: remove the duplicate logic of output action Date: Wed, 19 Jun 2024 17:19:37 +0800 Message-Id: <20240619091941.3479371-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240619091941.3479371-1-chaoyong.he@corigine.com> References: <20240619091941.3479371-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BY5PR13CA0003.namprd13.prod.outlook.com (2603:10b6:a03:180::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY1PR13MB7041:EE_ X-MS-Office365-Filtering-Correlation-Id: 550b3341-63e4-4c9c-2eeb-08dc904100bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|1800799021|366013|376011|52116011|38350700011; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?S86ypmX9mLSvIaOOfH1ptIdzsuOs8JSyaF4LXnbdwEYpRcKWmDcTxZmwRZ4J?= =?us-ascii?Q?RB+M/Wo0bO5pQ8w+sI0kNncZeY4xLEcZMwxc+/9X56EFgSCneQNMdRgb24+S?= =?us-ascii?Q?lx1eTTJxkY3443crFaWSCzr50US6zd9XteWUGWEHa625pdu/QBLCgHf7MG+m?= =?us-ascii?Q?VThG9vi8qV1+LIB7gWQFd+GshYCyp/eakI/dKEdcy5bwGZ7IP/VrZ7kvKul3?= =?us-ascii?Q?QkZxrtpH5IdjWgTOQPYpGpiT2bSHzqFUmFeGi0bbsc6vmIlQFsMHrt2sHE4V?= =?us-ascii?Q?PQ54iamoxSmiyP2r9DZqCiJltLGFZCNl1fxv7UjB+QLvoCGem39OmKocRCAz?= =?us-ascii?Q?0BGd/w50D7Heba2/Z6p6QTRJo+2DTB8nU1t/bM3FxTnJPxIEKhZXAkLbKtQS?= =?us-ascii?Q?xAXofNUudq/KGDLvJW2w4mzW0enyGtqM7qUAHYslRBP3m5kpmMQlyLgF/ydx?= =?us-ascii?Q?gL4XnzniimcrVthoFZ8Uhx3fSYp0NQCkrbNNP6vwy2Nid+iBPg/7bGKmf1Li?= =?us-ascii?Q?ov0O4QFgX+c4YZja6M6mSljYb91A1/8+hYgxlBV/l8O/OQA0UzvT4Jeuw3iO?= =?us-ascii?Q?4DMsVJCTGf7g1i8LhenamWxIPin2MyTyy7SWPafi4Wr/ZfzLjjWIIs3x6BNG?= =?us-ascii?Q?ZMbTW+WqWC3shgW0R0/gON4uoBaaB71qruITS+yuEuBDpzuiHFa9ETfJnJ17?= =?us-ascii?Q?C8GokgkaFeWd+xDCfjqUMukGg4xWO7mCB0X1Ko9cE4wYRX76wAYW0E1pYzMc?= =?us-ascii?Q?c/cAWV6pizV7Yg+dinqzL48J5ffQSQVx8y//ZRaXG3cwQnFKO/52yQcYg3hD?= =?us-ascii?Q?RthVJbni4rg9gX/OVKWKizYUCRIMvzmIFGPaWVLTHAbNyUm28b1aYT01HUab?= =?us-ascii?Q?y5bDfh/Nm2QttJtaVMpUw/zztSi3sc+LEHaJ0gWl2V3n7Nti64AJk8gxhEfm?= =?us-ascii?Q?aZwBtVC0viAYAkeIhMy2gpefMjInd4RI9hR2iVwLSYvNC9J01CQa5adS6Cln?= =?us-ascii?Q?Pe5FCalmRpdxDmXUup+yGnBZSBMEvkYX1XR5tsjxkza0d3mIGQ34BbGCIGt8?= =?us-ascii?Q?gnayaBIKJE9wocZg117mc/g8sngRZrwQM6Ox7O0CFXKBsbCbQnK8ix4SGACg?= =?us-ascii?Q?aV2egQEK/nw686WlX0vFxP2O9LWakClKhahetjiOL2ZWT0bZz5SSps6H+qH1?= =?us-ascii?Q?XuqZx+DdEnoh056c9fIeSqrEIrlrJO4fLfjORhji3D1m+3jpecaWfF3N7o9U?= =?us-ascii?Q?6g4Y3qxjgVsVLW2kP925gpLJ7ENfD7wzBEGPBARwe5r33RzzrCPmyzHh4XWp?= =?us-ascii?Q?ucYV8GBY1b8jZABKRB7ShwioRfs5ggr/2wOfeJl/jgtC/XH3aT2elffGso0Q?= =?us-ascii?Q?BcKkbf4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230037)(1800799021)(366013)(376011)(52116011)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VCTxEtUXia67/AMaFfLf19DZlfe7kYHOGcvu3AItgvSJlrhJFRBBGCjWa/T9?= =?us-ascii?Q?ESZr38yWACPgxCCYjbmZsZ/LGTw5NeJ8LyZXR5d9Oonio8BORwBbN8Sk9uCV?= =?us-ascii?Q?CJi2UNEJ8eH8ZH4DTrnqhByMy56Vek8nxnf6qQGtNPE7cHGg82FC5cOVaVkY?= =?us-ascii?Q?GnqZlJ6mZK3AcnaiKv2t/W9414nruLsXfGXE7dx8J/Hu1pam2kVIZTpnZsYL?= =?us-ascii?Q?7Ptl3OcXH+pxpxouIkYQ33XbTEGpnhpV8ILJG9o14kISHYYiDKEiAXE9l+/l?= =?us-ascii?Q?PYI5hhPrbOo/Y+0pwqOJTnn9ddQe8F/GxJ9Yi37M3LYZVCcq1dHfCjpGQdhr?= =?us-ascii?Q?IGvTuZH30mQ5Kb5BbhAUZpTNadnS3bjkMZIFwhDNDKphH0aeT8q4JC319/6E?= =?us-ascii?Q?LVGSc9bf6Mcl7AcsYBHxWhJX01um0H5PbkrOwN6xNL1r8yTMoAWMKx5LPdhb?= =?us-ascii?Q?MhQEkTfXJxWrbePqax40I7FgspgvjLLxAq1hM+9AM4xaMgJUn4W3CxINPvpx?= =?us-ascii?Q?Y8Nq3Q0+iTNz/pskCoOSBs6E8sYUhPMlkaJJwPMtwY2/dirMu37VWrhT9F7y?= =?us-ascii?Q?b40Nqtb7qUceXoG2HbXFeyQEb1HA0skQoA1CpSoY/rUtYNRJZBa8SmlmxbIq?= =?us-ascii?Q?5pd7F2uK3cSG4oxu+X/FGfdb1ZGThXOlErUmbzSXgEK/5NOgvFocczRUhk5w?= =?us-ascii?Q?4vLlKB50RrZOUziSfZL5zp+BSr4kQpC6WolgV3VtLPp44QfapTu6M8vDId6f?= =?us-ascii?Q?+Ug2MK0j5JsQOHhLVx5GrmTlqCB0lNNEFnX3MNbzAhhxmYBLm+3MuCnrMQDx?= =?us-ascii?Q?ZhV12fqX5goLdUjUWscOqhtpJiVn7DROkyTYX5JRvXaET8r8Vm/eyQwXr3ou?= =?us-ascii?Q?EbAFuiGQn8RvAVVv8IwMO2Zn/9tiJ54UwppYZ9kFqaqV75tvHFOHbgTjEeAn?= =?us-ascii?Q?KrvblCXY5Qw0XchdueVqyfotfoUPymCwgaSh9iSu4AW+JxigFqRosHabh+vj?= =?us-ascii?Q?gECslEZoMZxd5qH/dfS5Vbde3nBukEUG2rKADR709p2H2pqagSdCsTlqG/YE?= =?us-ascii?Q?nCOfoD87rPIE2MZxjI+Zpo1Opc6LD7Kfeor74ynzGJYgmP8XyAvYHv4gy+o5?= =?us-ascii?Q?aOELUeerwwWW88eMTmiOyKy/DoMjkoFoM92a+627XfxTn3MVxJ5EGVp/YQdf?= =?us-ascii?Q?dOLKS+KlXm8Ch4D6Dol4pz0klBGewD34eA8MpzhWv93c95AA+hYqDKuErXnz?= =?us-ascii?Q?pMAaOxTUW94HqusharqDsFUjCpf8omFrNVXuSDfSTqpI+9XSJ9BPlQRlb45G?= =?us-ascii?Q?Wu82nblv0LTaKJTMZi9Jjpw37xRbu3aECeSoT3+YJeWSNc0NCet5EPg4iFU4?= =?us-ascii?Q?OSs2nqr2sN9aCe9W5+7V1KZlRMXi8RhgnanVGdm5gAxFp6PnZ7WzHUW05Kqs?= =?us-ascii?Q?n6KcFCY8eQtWhciGt7QxTdjGdMQDUeNncK90elQsUI9YJ2RWnhkuCB458vhw?= =?us-ascii?Q?sBzkuNHnvp3RaMETzwCbuLQqY5wl65gG9ZpfyFcqUkGDsI1Qkiv4YlBXQ6zd?= =?us-ascii?Q?9osoBMfkNtwSf1ft0/HCMJT0m/baV9kl0MJvipp2XmO/MbfBwO8n8+ByQUVw?= =?us-ascii?Q?fw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 550b3341-63e4-4c9c-2eeb-08dc904100bc X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2024 09:20:04.1811 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JGQUAL2nxZjubHU0I3Z7zNvCDewDZqe/QrcOAC1P3dZbUXWG375nw1G0qydB1GuquZRXik0ghxDY8K7l7ottxW/WXyZe2rP5UcteaZ67H/g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR13MB7041 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 Remove the duplicate logic of output flow action. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_flow.c | 81 ++++++------------------ 1 file changed, 19 insertions(+), 62 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index f1388620d6..b533f4e3f2 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -2508,55 +2508,33 @@ nfp_flow_action_output(char *act_data, struct nfp_fl_rule_metadata *nfp_flow_meta, uint32_t output_cnt) { - size_t act_size; + uint32_t port_id; struct rte_eth_dev *ethdev; struct nfp_fl_act_output *output; struct nfp_flower_representor *representor; - const struct rte_flow_action_port_id *port_id; - - port_id = action->conf; - if (port_id == NULL || port_id->id >= RTE_MAX_ETHPORTS) - return -ERANGE; - - ethdev = &rte_eth_devices[port_id->id]; - representor = ethdev->data->dev_private; - act_size = sizeof(struct nfp_fl_act_output); - - output = (struct nfp_fl_act_output *)act_data; - output->head.jump_id = NFP_FL_ACTION_OPCODE_OUTPUT; - output->head.len_lw = act_size >> NFP_FL_LW_SIZ; - output->port = rte_cpu_to_be_32(representor->port_id); - if (output_cnt == 0) - output->flags = rte_cpu_to_be_16(NFP_FL_OUT_FLAGS_LAST); - - nfp_flow_meta->shortcut = rte_cpu_to_be_32(representor->port_id); + const struct rte_flow_action_ethdev *action_ethdev; + const struct rte_flow_action_port_id *action_port_id; - return 0; -} + if (action->conf == NULL) + return -EINVAL; -static int -nfp_flow_action_output_stage(char *act_data, - const struct rte_flow_action *action, - struct nfp_fl_rule_metadata *nfp_flow_meta, - uint32_t output_cnt) -{ - size_t act_size; - struct rte_eth_dev *ethdev; - struct nfp_fl_act_output *output; - struct nfp_flower_representor *representor; - const struct rte_flow_action_ethdev *action_ethdev; + if (action->type == RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT) { + action_ethdev = action->conf; + port_id = action_ethdev->port_id; + } else { + action_port_id = action->conf; + port_id = action_port_id->id; + } - action_ethdev = action->conf; - if (action_ethdev == NULL || action_ethdev->port_id >= RTE_MAX_ETHPORTS) + if (port_id >= RTE_MAX_ETHPORTS) return -ERANGE; - ethdev = &rte_eth_devices[action_ethdev->port_id]; + ethdev = &rte_eth_devices[port_id]; representor = ethdev->data->dev_private; - act_size = sizeof(struct nfp_fl_act_output); output = (struct nfp_fl_act_output *)act_data; output->head.jump_id = NFP_FL_ACTION_OPCODE_OUTPUT; - output->head.len_lw = act_size >> NFP_FL_LW_SIZ; + output->head.len_lw = sizeof(struct nfp_fl_act_output) >> NFP_FL_LW_SIZ; output->port = rte_cpu_to_be_32(representor->port_id); if (output_cnt == 0) output->flags = rte_cpu_to_be_16(NFP_FL_OUT_FLAGS_LAST); @@ -3999,28 +3977,7 @@ nfp_flow_action_compile_drop(struct nfp_action_compile_param *param) } static int -nfp_flow_action_compile_repr_port(struct nfp_action_compile_param *param) -{ - int ret; - uint32_t output_cnt; - - output_cnt = *param->output_cnt - 1; - *param->output_cnt = output_cnt; - - ret = nfp_flow_action_output_stage(param->position, param->action, - param->nfp_flow_meta, output_cnt); - if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT"); - return ret; - } - - param->position += sizeof(struct nfp_fl_act_output); - - return 0; -} - -static int -nfp_flow_action_compile_port_id(struct nfp_action_compile_param *param) +nfp_flow_action_compile_output(struct nfp_action_compile_param *param) { int ret; uint32_t output_cnt; @@ -4031,7 +3988,7 @@ nfp_flow_action_compile_port_id(struct nfp_action_compile_param *param) ret = nfp_flow_action_output(param->position, param->action, param->nfp_flow_meta, output_cnt); if (ret != 0) { - PMD_DRV_LOG(ERR, "Failed process RTE_FLOW_ACTION_TYPE_PORT_ID"); + PMD_DRV_LOG(ERR, "Failed process output action"); return ret; } @@ -4393,8 +4350,8 @@ static nfp_flow_action_compile_fn action_compile_fns[] = { [RTE_FLOW_ACTION_TYPE_DROP] = nfp_flow_action_compile_drop, [RTE_FLOW_ACTION_TYPE_COUNT] = nfp_flow_action_compile_stub, [RTE_FLOW_ACTION_TYPE_JUMP] = nfp_flow_action_compile_stub, - [RTE_FLOW_ACTION_TYPE_PORT_ID] = nfp_flow_action_compile_port_id, - [RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT] = nfp_flow_action_compile_repr_port, + [RTE_FLOW_ACTION_TYPE_PORT_ID] = nfp_flow_action_compile_output, + [RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT] = nfp_flow_action_compile_output, [RTE_FLOW_ACTION_TYPE_SET_MAC_SRC] = nfp_flow_action_compile_mac_src, [RTE_FLOW_ACTION_TYPE_SET_MAC_DST] = nfp_flow_action_compile_mac_dst, [RTE_FLOW_ACTION_TYPE_OF_POP_VLAN] = nfp_flow_action_compile_pop_vlan, -- 2.39.1