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 2B8F24548E; Wed, 19 Jun 2024 11:15:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3E2442795; Wed, 19 Jun 2024 11:15:09 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2132.outbound.protection.outlook.com [40.107.244.132]) by mails.dpdk.org (Postfix) with ESMTP id D458E4021D for ; Wed, 19 Jun 2024 11:14:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cr0T8WvXa//0SSsCLFgLgT018knzH7tgd0raMIeNK8LxT1aSbXvT0MH/97upC1K5Skbvy44EuXB8fedGHL/wsyIC1sNWcDIizAwHIOjrmi9O2h0PRSVX6tRdyFr+SRtVzSuTx97uee0yPQRCxpmghVW2XlBGF6JuyVlXqYztmtrqyKIG2gXcKCPlgvgDGZaSPpj1Rc6ejEFoh95f2mF9bjiO4INVf7CGZ/APhwXB407zfIeRxPn54rNBKNooQnHurZrw74IiN67tX3T1XkWWSvQkeYrX4Y4/xeSkAklsaIT7vHfwTtAmzBvg+JOcN+E3I0lknL72UG1hUup1XEOxfg== 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=T+aDMVpEJGa7uH8Q34s78ueTZ2iQYSs4Xh6ypi2P4T0=; b=XcWmGOEhkyKithFhEslBimIDnOzbv3lV0AUd1Zavx5Eg3cE8A/UztYhdNerwvmJfEHhgi03cskXO45sEDkOZcwY5CRb4zZwq1OdVq78F2Fnpc3c9L5MGt35xG1DnPxwie14E00qDC/P0HY/kUQsUWNej6mWfcEhkZ0sS1s/uyMTACanR9fHRf/j3N7sjPE3hrXr4Vu+a4fgaRVrC66gKT102nvICvYlCP61FMEtKxJgCAA5UGCLZwzx1P+nENRZ7HXekz3MHCpb1OpO8RGGT7ftGR5ctg6E/AQjGnauO3dCbtnqQX4XLVhZPM44//ULcSiI2dOnKvdnXQ4+UBnnCiA== 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=T+aDMVpEJGa7uH8Q34s78ueTZ2iQYSs4Xh6ypi2P4T0=; b=t3nGfgBaXNZJ4EpoZUI3wPlmKQyAXUXlY+r02KPPSKaSDy9lHLUA41mjuCIB6AVmorldhUSWoAJhKWhTW6zSHPCwRHnNM7ka75Sw1nsdNyzJq0wQVWVwRiu4b78LcvnzFvyJK72TAF5GVJ5Dn9wAuAxWFoa0gQKr3NxxhwUuw1U= 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 SJ0PR13MB5523.namprd13.prod.outlook.com (2603:10b6:a03:425::15) 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:14:35 +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:14:35 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 03/21] net/nfp: pack various flags of flow action Date: Wed, 19 Jun 2024 17:13:40 +0800 Message-Id: <20240619091358.3479247-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240619091358.3479247-1-chaoyong.he@corigine.com> References: <20240619091358.3479247-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR05CA0027.namprd05.prod.outlook.com (2603:10b6:a03:c0::40) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5523:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b96e0ae-1a1a-43f5-6d75-08dc90403bbc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230037|52116011|376011|1800799021|366013|38350700011; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?pUUkJ7z6FT4WA6f4sKIyN8c6CL2urVpB04vyibxbSZIu6+VJ2k5+0pGVHmya?= =?us-ascii?Q?rXHo9aSNoV8/zLUUbaLfCIjkj0ON41t0aJQm3jY1f0UJ+1YS4iqD+hE/SUGk?= =?us-ascii?Q?PYciyHdyrwm4wbVvkD5Kgf/I8h73/hxAf9YUVc8DcpsohqrCU9hpu0QazIhT?= =?us-ascii?Q?e1Yl/mD8p6dx4FIsqCBkvGVFIhYqQ75fmDHOOinYQirdGSwm2YUJ8+Eny/mR?= =?us-ascii?Q?iGhEknRj/1EtVbofsASX9lWtKqZIWz+GDff9+wgDk/kzni+fKewRxbfa8Ure?= =?us-ascii?Q?mtJIZIIkROIgvEBzT5J+CHPwuBI86fsejxmZf/0TuJRiWgSG4R3pvPJ90jiR?= =?us-ascii?Q?ggVQw9846Ot2+Uy9d5pC3cyasvazt7ziIYfZ1KBArHIxG09wGT+pVTSy/LBF?= =?us-ascii?Q?NO4KZBDql9CuxC2coe9pz1nyeSip7+t3IYP1yPV6LGAAGWFGHgKtRhr/myHt?= =?us-ascii?Q?aGSfcki8vEpxN6l7F/XiuSn81oDCuuUSadALackJF0L7OEj8l/1sUlBDiVQY?= =?us-ascii?Q?RuYOuXMrJCvcaUM0+pmNeS7Z+CBrdQZfPPKk2VFHL4UwUZlDfQuWe9spWgCP?= =?us-ascii?Q?MRl43Kqgg2TqdViTC2SarIDO7FqwJ7AYhDZu6z4gOjF0nVLGYsH4GpWBV/w4?= =?us-ascii?Q?Y1wr3xHYa8pJoL7pdo/4TwYQU4JDxzW2KbSSOF04ju/L+Ga3SE/QSOM0pKfd?= =?us-ascii?Q?Qa08l75fzaiLdXcdf3rCI46IIMyaMizNGNvJWY/Pm5z5Gre1Lmjzr56rcdXk?= =?us-ascii?Q?NvmGc4GCdluJHsDCMb7h6JPpjEyMEZTWz93GWLiNfXfGOlbALQ3b/Nb8wdSS?= =?us-ascii?Q?E8Jqjcy1/RS/otvAGMHFwi30IR/C+pyXsoVcpCuiSQoqvFsFak9UngdAK6Vl?= =?us-ascii?Q?1K0BGvwEhH5EUsqxpl7eahRhmnxifODoLqJ4DD6SgV5EEGbyIt483H3RVGXZ?= =?us-ascii?Q?xuHcO9jP8vk4+FixgpL2afVriP66yxO0OtA721O62ytWI+bwU1LXRbeUVnxZ?= =?us-ascii?Q?9zIDRq+fI60yixxg4SQYLLFBbx9NEPhbFlGTF8HwWXd7Sfr6WF44JV7w9TYK?= =?us-ascii?Q?K22YjT2VI8bo4NO7uecIoYaqntCEofoxxEIP980kKfwPSgtITCHeYgA7KeVt?= =?us-ascii?Q?WNzEZlGEtd8chN4OAYC7YSjoo8iJQczJq8drEwnJ/UzqVJGW6kRBNMPixoJy?= =?us-ascii?Q?BoYU9Qh4aCyT3AzTMKqpp90CBjRR5THowO76qxN9iZqZqkZusFWG6epf1SyY?= =?us-ascii?Q?RERND210UX4FIUJvdnhe+avst4x93A9+3tynBUNJcVLTNeE1RYVxNR1rkbPk?= =?us-ascii?Q?wL/9dRwt9XLfSCqWEkB+zPE9Rb2FvBzmosJeADA7ScEHM3IygFEpJy5uX4M2?= =?us-ascii?Q?6Z8FUbc=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)(52116011)(376011)(1800799021)(366013)(38350700011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gbeuQnlcxbt6vx1nvhYpoiCXR3oBGyKPtPkTeDlbM/CqYjIHSwu5t85mC56c?= =?us-ascii?Q?VaWWfyvRqr+C4N0rhTrOWvumxYC5LiLLGNJsRCduS6f2Tq0wiz2sWtM2j79x?= =?us-ascii?Q?AaUlFzPb+H6PQFEzn2YjKhHW8VjoO92X3DKORbCNiiOFW6uzxquSY1m69PuL?= =?us-ascii?Q?feSmcO36WZsm5p1LfJ7TYEY5lUkorMPsT0gFifGVAF8vz+JwocIFNl1CVhgu?= =?us-ascii?Q?W9hYwL9dVutyb+yIolnD9YR0TUtHAsq2MMQ8VIi34OFWNj1oeZqQa7EVRUwr?= =?us-ascii?Q?ynbPhKOBCSqC+KVaPpvEdozeYJ3fYErsaEaXbVPySKV/MRZBYVUia1Kv3m5b?= =?us-ascii?Q?mMmfmcx8Hnem2hoQ5Z3jmggMpZ++SUdVUh2rzvZsP+7YgP/cnHCukDvJX/vr?= =?us-ascii?Q?Al6JFXZbZ4mSabkMr4KfHY9lTJoz35LNLqBKm871P7n+e8U0xMIEuYWckSlB?= =?us-ascii?Q?4j+PFzTvhYXgg9y1nDWkiZI+wQRVVCoKFd509uSBU9Vw6Jp9MOP5FiTozlZJ?= =?us-ascii?Q?EGihCBfAHSpmPRj5JqGYdJTXrKTr6Yn7CwfrQAd6/dedbUnsPTWQGWh+ySuT?= =?us-ascii?Q?0rPZkguzEX4egYD8oozLT1f5xPIN49aelCMWCWFeauNtfz/9kDvdNCwqn0OO?= =?us-ascii?Q?Q0K+dErnrFmmD4ufOFCnZjKuUdAYUVOmV/gB6hEZw7sN+IS07+e4JdMSNAGg?= =?us-ascii?Q?blgxOuCjnCz2qmkP7ukd6v41Eghle/UFlfnS/hZxeYvRMnn2/iyORwTTSFRJ?= =?us-ascii?Q?B8aFmE88XG743IBV1wE8D/sq9lO3hFPmZ3dW+XWfseYstC/m/PY2b9wf7eS7?= =?us-ascii?Q?C8nPnuRBsjU4ZCb9iw1kMl10xNrWhCGqExNRDWcx4IUepJEF+w4Y8m/FBgT3?= =?us-ascii?Q?CUiyaRZicjUkaSTvSBsHjy2oEYNlWkF3cVKnFRfTshiqUXFWbHA2SMyVxKCc?= =?us-ascii?Q?CXUtCGv/z2lKdFkjqcr5ovBkmm7aUXvf65v108AE4fThJbfgxHYDax25dm7t?= =?us-ascii?Q?1W5tje84vc/0It0mj2UuCTOZ4LoHO+/03LtId9GEfdyGm9eWNWTqL0yRoZ+H?= =?us-ascii?Q?Rc+fAV0qnIkRKphInTw0QJHwfcdoVQzpIlObICdJM8pAZjX142RTA7cAYw3x?= =?us-ascii?Q?5QZK/Nq7SM+A0kU1RIe762KQgDdnVkWyKDcyzLSY2xoSkNdx0DOt9Keumyvx?= =?us-ascii?Q?gosA4bO1E0aWjza/kqf9Cyq/v17zton8Rc/W+IvRp3mbsKe4MBQKSkcpP0Jd?= =?us-ascii?Q?WM6dkIG8Uq41eSCXCqidOciQY/SlXJio60B0iZaAA/XEi1ygEQ8pu8o83LR1?= =?us-ascii?Q?UWpQgV7Ad+j7rKLEqimp9QoeqhBl3hu0f+p0PJolgkmalhoRbobC7/SIAdNO?= =?us-ascii?Q?VI2Jgyjw91CRNUbEgLmVrjKipz/g4Tj9A2pBNVC57GUATZteXE3Ri8FfpZ4X?= =?us-ascii?Q?4vN280B7W0zNDSq8Xlvvm/gBHpOalERj/6JVU5GN6hdqxS68zPXFePCd9cVZ?= =?us-ascii?Q?awII1LQjkDnGx9gTOcSiHiGNolE+Hw2bTwv0V2gJfy+v1oZEbCVoyMAqnqqO?= =?us-ascii?Q?Y7qLFxn468c6GrgBkgXzl2bEDGnlFRHrhKHi/FDB1GeVLxkAh53ajPQGicnF?= =?us-ascii?Q?MA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b96e0ae-1a1a-43f5-6d75-08dc90403bbc 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:14:34.9726 (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: bIQRy5JtP9J3qaGyG0Q/VevI868fE7geJB+cmw1HJu2D2y8GwUsUXqaozYjd/fm3gV5/dyczZb+qROL5CpE9NAu7eenztlTLqcDaT6CBAXg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5523 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 Pack various flags of the flow action into single structure, also refactor the related logic. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_flow.c | 132 +++++++++++------------ 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index 4dacac1d28..9717af9c9c 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -974,17 +974,22 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[], return 0; } +struct nfp_action_flag { + bool drop_flag; + bool meter_flag; + bool tc_hl_flag; + bool ip_set_flag; + bool tp_set_flag; + bool mac_set_flag; + bool ttl_tos_flag; +}; + static int nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[], struct nfp_fl_key_ls *key_ls) { int ret = 0; - bool meter_flag = false; - bool tc_hl_flag = false; - bool ip_set_flag = false; - bool tp_set_flag = false; - bool mac_set_flag = false; - bool ttl_tos_flag = false; + struct nfp_action_flag flag = {}; const struct rte_flow_action *action; for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { @@ -1018,16 +1023,16 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_MAC_SRC detected"); - if (!mac_set_flag) { + if (!flag.mac_set_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_eth); - mac_set_flag = true; + flag.mac_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_MAC_DST detected"); - if (!mac_set_flag) { + if (!flag.mac_set_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_eth); - mac_set_flag = true; + flag.mac_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: @@ -1046,18 +1051,18 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC detected"); - if (!ip_set_flag) { + if (!flag.ip_set_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_ip4_addrs); - ip_set_flag = true; + flag.ip_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_DST: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV4_DST detected"); - if (!ip_set_flag) { + if (!flag.ip_set_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_ip4_addrs); - ip_set_flag = true; + flag.ip_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: @@ -1070,48 +1075,48 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_TP_SRC detected"); - if (!tp_set_flag) { + if (!flag.tp_set_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_tport); - tp_set_flag = true; + flag.tp_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_TP_DST: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_TP_DST detected"); - if (!tp_set_flag) { + if (!flag.tp_set_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_tport); - tp_set_flag = true; + flag.tp_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_TTL: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_TTL detected"); if ((key_ls->key_layer & NFP_FLOWER_LAYER_IPV4) != 0) { - if (!ttl_tos_flag) { + if (!flag.ttl_tos_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_ip4_ttl_tos); - ttl_tos_flag = true; + flag.ttl_tos_flag = true; } } else { - if (!tc_hl_flag) { + if (!flag.tc_hl_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); - tc_hl_flag = true; + flag.tc_hl_flag = true; } } break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP detected"); - if (!ttl_tos_flag) { + if (!flag.ttl_tos_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_ip4_ttl_tos); - ttl_tos_flag = true; + flag.ttl_tos_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP detected"); - if (!tc_hl_flag) { + if (!flag.tc_hl_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); - tc_hl_flag = true; + flag.tc_hl_flag = true; } break; case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: @@ -1132,9 +1137,9 @@ nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_METER: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_METER detected"); - if (!meter_flag) { + if (!flag.meter_flag) { key_ls->act_size += sizeof(struct nfp_fl_act_meter); - meter_flag = true; + flag.meter_flag = true; } else { PMD_DRV_LOG(ERR, "Only support one meter action."); return -ENOTSUP; @@ -3656,13 +3661,8 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, uint32_t count; char *position; char *action_data; - bool drop_flag = false; - bool tc_hl_flag = false; - bool ip_set_flag = false; - bool tp_set_flag = false; - bool mac_set_flag = false; - bool ttl_tos_flag = false; uint32_t total_actions = 0; + struct nfp_action_flag flag = {}; const struct rte_flow_action *action; struct nfp_flower_meta_tci *meta_tci; struct nfp_fl_rule_metadata *nfp_flow_meta; @@ -3680,7 +3680,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_DROP: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_DROP"); - drop_flag = true; + flag.drop_flag = true; break; case RTE_FLOW_ACTION_TYPE_COUNT: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_COUNT"); @@ -3714,18 +3714,18 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_MAC_SRC"); - nfp_flow_action_set_mac(position, action, true, mac_set_flag); - if (!mac_set_flag) { + nfp_flow_action_set_mac(position, action, true, flag.mac_set_flag); + if (!flag.mac_set_flag) { position += sizeof(struct nfp_fl_act_set_eth); - mac_set_flag = true; + flag.mac_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_MAC_DST"); - nfp_flow_action_set_mac(position, action, false, mac_set_flag); - if (!mac_set_flag) { + nfp_flow_action_set_mac(position, action, false, flag.mac_set_flag); + if (!flag.mac_set_flag) { position += sizeof(struct nfp_fl_act_set_eth); - mac_set_flag = true; + flag.mac_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: @@ -3752,18 +3752,18 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV4_SRC"); - nfp_flow_action_set_ip(position, action, true, ip_set_flag); - if (!ip_set_flag) { + nfp_flow_action_set_ip(position, action, true, flag.ip_set_flag); + if (!flag.ip_set_flag) { position += sizeof(struct nfp_fl_act_set_ip4_addrs); - ip_set_flag = true; + flag.ip_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_DST: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV4_DST"); - nfp_flow_action_set_ip(position, action, false, ip_set_flag); - if (!ip_set_flag) { + nfp_flow_action_set_ip(position, action, false, flag.ip_set_flag); + if (!flag.ip_set_flag) { position += sizeof(struct nfp_fl_act_set_ip4_addrs); - ip_set_flag = true; + flag.ip_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_SRC: @@ -3779,51 +3779,51 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TP_SRC"); nfp_flow_action_set_tp(position, action, true, - tp_set_flag, nfp_flow->tcp_flag); - if (!tp_set_flag) { + flag.tp_set_flag, nfp_flow->tcp_flag); + if (!flag.tp_set_flag) { position += sizeof(struct nfp_fl_act_set_tport); - tp_set_flag = true; + flag.tp_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_TP_DST: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TP_DST"); nfp_flow_action_set_tp(position, action, false, - tp_set_flag, nfp_flow->tcp_flag); - if (!tp_set_flag) { + flag.tp_set_flag, nfp_flow->tcp_flag); + if (!flag.tp_set_flag) { position += sizeof(struct nfp_fl_act_set_tport); - tp_set_flag = true; + flag.tp_set_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_TTL: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TTL"); if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) { - nfp_flow_action_set_ttl(position, action, ttl_tos_flag); - if (!ttl_tos_flag) { + nfp_flow_action_set_ttl(position, action, flag.ttl_tos_flag); + if (!flag.ttl_tos_flag) { position += sizeof(struct nfp_fl_act_set_ip4_ttl_tos); - ttl_tos_flag = true; + flag.ttl_tos_flag = true; } } else { - nfp_flow_action_set_hl(position, action, tc_hl_flag); - if (!tc_hl_flag) { + nfp_flow_action_set_hl(position, action, flag.tc_hl_flag); + if (!flag.tc_hl_flag) { position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); - tc_hl_flag = true; + flag.tc_hl_flag = true; } } break; case RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP"); - nfp_flow_action_set_tos(position, action, ttl_tos_flag); - if (!ttl_tos_flag) { + nfp_flow_action_set_tos(position, action, flag.ttl_tos_flag); + if (!flag.ttl_tos_flag) { position += sizeof(struct nfp_fl_act_set_ip4_ttl_tos); - ttl_tos_flag = true; + flag.ttl_tos_flag = true; } break; case RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP"); - nfp_flow_action_set_tc(position, action, tc_hl_flag); - if (!tc_hl_flag) { + nfp_flow_action_set_tc(position, action, flag.tc_hl_flag); + if (!flag.tc_hl_flag) { position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl); - tc_hl_flag = true; + flag.tc_hl_flag = true; } break; case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: @@ -3898,7 +3898,7 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, total_actions++; } - if (drop_flag) + if (flag.drop_flag) nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_DROP); else if (total_actions > 1) nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_NULL); -- 2.39.1