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 2288345610 for ; Fri, 12 Jul 2024 13:03:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1AE5D402E5; Fri, 12 Jul 2024 13:03:37 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2044.outbound.protection.outlook.com [40.107.237.44]) by mails.dpdk.org (Postfix) with ESMTP id E743D40261 for ; Fri, 12 Jul 2024 13:03:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gXcf6O7adpgxRFJgeyih6oQ9CK0UpadPNPZ2P5XiB53AoKWDIDUZTHMYt4nR+woXiPzvncy7ZvLWNbHnga5iobZzeEL19/3vJmgq+9r8Jf273ha1vkYBILIgLcD3U08a/BTzNuLdlcPYvEXmUjtXhAGJkD0hvCuwbuJ+6dVR53hTl7W3dDXVJiAhu9Ix8fsuBmlU0BjMJcSZdLUSyh7rSwUIwURjoEPKKVvFm2SrxI+spyH/tgvYsW4lenSA9EwQ6/A/k01jJBbn3Z7fIvUxAwcE7IszAqoMvkJU7F7JE7W44DhuscQyASB3FHUf1xkcQp9jR8bxij1GctQ2C0l/kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=s4HnN867EmWYotXkbCzbQX6Yynpu77+3tt6Q/6DZgVY=; b=siU/KMYkBnW2Nz1biAOOOEAHY1d9BFzoES0Sqd2ZpI1ZEcZsQVila0/rtbmRVLMOf9s60SBGya5id/3Xj7JweS7dKa0jR5L0vIXbDi8mvJGsw9xaK61yMq9bkCsCHFfg/yO4aHn2i1IbTKD+038Yw5UTU0Tsx2ANtQstN9QQRhKULEoH2i0qShF9/awIaolacYTdTRpmgx4BP2V03+2M4abU80cM9RvU1zmGplQ7RXSsDEP2PdJRj3r0fNzea7w5d77GtZqyqv5Syk7jmk2HT3jz2ewGUj2Tg2lYxj8Qkvrzok4eDWz4Em0Pqv1JRypG/y1QhdFpKV4xb0X/rZxNow== 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 (0) 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=s4HnN867EmWYotXkbCzbQX6Yynpu77+3tt6Q/6DZgVY=; b=byGmXFE9aMC+fppztmmqvMKjCTzxEP+MDhWgtbQcUPWzfL1GupzO26PXVia4hQHr65hYAFdLxw3TiRIKphaqVqnOGksme04iJ/M/LhphSuGak7k8cx73JeuxLT6+1io/DWFG3TKVMPylJTYwkyXvDmUFLZrBgtGTSKsintWAYz+tzKOxd8/feu1qcNr1N1SxrrTe7aQDUpnEkE1Cmsuam1Jg6voB3dHzxSevf+v1s+QjB4+lwvUsP0Vc7pJsmNvoIT2NErzda4ny9TuvHDSN+m+LDdRf+gOhFwfGto7KPb6FVS+9cTLb2a6Q4BKkgCyKEX++eydLoo09iMUBUc5JEQ== Received: from MN2PR04CA0033.namprd04.prod.outlook.com (2603:10b6:208:d4::46) by BY5PR12MB4195.namprd12.prod.outlook.com (2603:10b6:a03:200::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 11:03:32 +0000 Received: from BL02EPF0001A0FF.namprd03.prod.outlook.com (2603:10b6:208:d4:cafe::db) by MN2PR04CA0033.outlook.office365.com (2603:10b6:208:d4::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 11:03:32 +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 BL02EPF0001A0FF.mail.protection.outlook.com (10.167.242.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:03:32 +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.1544.4; Fri, 12 Jul 2024 04:03:16 -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.1544.4; Fri, 12 Jul 2024 04:03:14 -0700 From: Xueming Li To: Shun Hao CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: support jump in meter hierarchy' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:45 +0800 Message-ID: <20240712110153.309690-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: BL02EPF0001A0FF:EE_|BY5PR12MB4195:EE_ X-MS-Office365-Filtering-Correlation-Id: a31bda99-6a0f-4b54-40f8-08dca26244de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xwqGmC5YTdTQjQk38KCNY3V9N4JYL/U+F5kO28IAjem96MPXZ/RgRr3szxy3?= =?us-ascii?Q?zJAOsWh1TJ+Her3cAuLACR3DGpcMO8iTPUg+a0gGqpP6czm0HfOwrv/UK9F8?= =?us-ascii?Q?Ap7TbScEyv6I1EouMaBrmUOWNLUbGIT5Mq7NOGGRdoYVfBcdJlm7eC/VveDm?= =?us-ascii?Q?kvdZ/LhSUoDEyZpj17J7jw43poHJDYi50LGKwAbrvLfEK13OGklbEt/ZCb0l?= =?us-ascii?Q?mV+Xub4KMNwCGJ1ilHdDTs6A0yo92TZv0WkhMcfTdDNdPuVfo92IxHGoyBbr?= =?us-ascii?Q?i2f3UFVup2H1ehS2WpnKiGoFmrDZhShq4peleePYvOSoxD5gTnNXHAQliDWk?= =?us-ascii?Q?7jgUguPl/Uz3fXuJvNZePMtmBZD7TUtmyjgxCY8yxCAzgxJ04VwFGUwVilEs?= =?us-ascii?Q?TTf3s8rfEzV9tbRZDddaxAv/BNsQqhiYvMePtYKSkLksmFm5BNFAPXok6yk9?= =?us-ascii?Q?uWA9mj11dlUvuNyE3IM96T5ML6nswQNXCgewsXCWA61fyNrvybvzSqHoS8Ax?= =?us-ascii?Q?45826VIGCjNerqKe2KzrN8k1We1OBglG7+pm5QLX6Ml/iguAYq3yX75OvT8Z?= =?us-ascii?Q?3Uz1VNC5NKFvlcQSvSO7NiLorpCIHrqeWhknJPf8h2FcfZBJUFz8nG2J1s2J?= =?us-ascii?Q?vYUqvKrtdajqJbbuPC9+OEYnZqLCeJ1+CO4qZ20oq+cAjCQNoEZ59HN/jSHh?= =?us-ascii?Q?Ar8YN6/AQUYMmylHOgCxsxTiSQeXUMF18Iivqkh9noGVkY9LIa5TrQ5WAkQ5?= =?us-ascii?Q?7CRvY0LETdYYBTLeEVGQQlyTygHadppluYrMClyZIez5a4RMKSfjk1tRZfkr?= =?us-ascii?Q?MLj071Ba7ou/4aAYWu0bbg8rZSIJ8QnCe5XgKTqgyK9T2vH30DrQbqQlllSd?= =?us-ascii?Q?IX+ryNw10410O9cqX7X91ljkeSB3+zqQFGuFWFxZe97EkRaWzkRcd2smkhs0?= =?us-ascii?Q?QAgqNrjod/OIm+rnEkeeID0kq1MCaisN0BSO2HREWROq9GlipmPxjDOV7i9b?= =?us-ascii?Q?/AzCdj0gihIBNqhIsPj0PRKbAqYWDHks3pH++xYc1cdD21PkhoG1nLCJjmfd?= =?us-ascii?Q?6q2/aPTqYKjX929/HvHOt0XWBS9W/S5jGW8hdptATb/vfhBEX6MyQ9ap/jE0?= =?us-ascii?Q?4323uL4HNxDB7BSxxTYibhlpOnVMBGWx9Dho76arlXxj7R2B+wdg4t9XGKYA?= =?us-ascii?Q?+KA8r3UZENGLoXOfydKW/XG/CiUYiJ/q8i6ZRofvjn7N2pAqG+VTXJdLKcxZ?= =?us-ascii?Q?W6Zlgb9Ih9JtqGTuklYfR1vttfC2LTnwZrxNzV/uSB6rg+DvDEwmXI/mI6un?= =?us-ascii?Q?WWWIcACCAefIuYH0WH3DUBsbWe+8KH7N3m7OBruVhPWEP7QTjwbovUkx3/hV?= =?us-ascii?Q?eqTsKvKcbcW5bWlq2x0mbEU1qbHMAfpexrjqPK7PUC4KbaxwkkZF66tmBqb3?= =?us-ascii?Q?Ytl6l29Qw8y8dFYkDD7gdrdMpt5yFCex?= 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:(13230040)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:03:32.2710 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a31bda99-6a0f-4b54-40f8-08dca26244de 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: BL02EPF0001A0FF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4195 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=eab3879444b1d4e62a3285d56d41d4dab3bc9ebb Thanks. Xueming Li --- >From eab3879444b1d4e62a3285d56d41d4dab3bc9ebb Mon Sep 17 00:00:00 2001 From: Shun Hao Date: Tue, 4 Jun 2024 05:51:56 +0300 Subject: [PATCH] net/mlx5: support jump in meter hierarchy Cc: Xueming Li [ upstream commit dc1d92a4f547f8af6eb9b8824257ab3fd8dfbc77 ] Currently in meter hierarchy, only meter action is supported for green and yellow policy flow. This patch adds support of jump action for green or yellow policy flow. Fixes: 96ca87da4f46 ("net/mlx5: validate yellow meter action") Signed-off-by: Shun Hao Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 36 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index b97e00b287..d7eba9a71f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -17682,7 +17682,7 @@ __flow_dv_create_policy_matcher(struct rte_eth_dev *dev, static int __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, struct mlx5_flow_meter_sub_policy *sub_policy, - uint8_t egress, uint8_t transfer, bool match_src_port, + uint8_t egress, uint8_t transfer, bool *match_src_port, struct mlx5_meter_policy_acts acts[RTE_COLORS]) { struct mlx5_priv *priv = dev->data->dev_private; @@ -17697,6 +17697,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, .reserved = 0, }; int i; + uint16_t priority; int ret = mlx5_flow_get_reg_id(dev, MLX5_MTR_COLOR, 0, &flow_err); struct mlx5_sub_policy_color_rule *color_rule; struct mlx5_sub_policy_color_rule *tmp_rules[RTE_COLORS] = {NULL}; @@ -17731,12 +17732,12 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, TAILQ_INSERT_TAIL(&sub_policy->color_rules[i], color_rule, next_port); color_rule->src_port = priv->representor_id; - /* No use. */ - attr.priority = i; + priority = (match_src_port[i] == match_src_port[RTE_COLOR_GREEN]) ? + MLX5_MTR_POLICY_MATCHER_PRIO : (MLX5_MTR_POLICY_MATCHER_PRIO + 1); /* Create matchers for colors. */ if (__flow_dv_create_policy_matcher(dev, color_reg_c_idx, - MLX5_MTR_POLICY_MATCHER_PRIO, sub_policy, - &attr, match_src_port, NULL, + priority, sub_policy, + &attr, match_src_port[i], NULL, &color_rule->matcher, &flow_err)) { DRV_LOG(ERR, "Failed to create color%u matcher.", i); goto err_exit; @@ -17746,7 +17747,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, color_reg_c_idx, (enum rte_color)i, color_rule->matcher, acts[i].actions_n, acts[i].dv_actions, - match_src_port, NULL, &color_rule->rule, + match_src_port[i], NULL, &color_rule->rule, &attr)) { DRV_LOG(ERR, "Failed to create color%u rule.", i); goto err_exit; @@ -17794,7 +17795,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, uint8_t egress = (domain == MLX5_MTR_DOMAIN_EGRESS) ? 1 : 0; uint8_t transfer = (domain == MLX5_MTR_DOMAIN_TRANSFER) ? 1 : 0; bool mtr_first = egress || (transfer && priv->representor_id != UINT16_MAX); - bool match_src_port = false; + bool match_src_port[RTE_COLORS] = {false}; int i; /* If RSS or Queue, no previous actions / rules is created. */ @@ -17865,7 +17866,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, acts[i].dv_actions[acts[i].actions_n] = port_action->action; acts[i].actions_n++; - match_src_port = true; + match_src_port[i] = true; break; case MLX5_FLOW_FATE_DROP: case MLX5_FLOW_FATE_JUMP: @@ -17917,7 +17918,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, acts[i].dv_actions[acts[i].actions_n++] = tbl_data->jump.action; if (mtr_policy->act_cnt[i].modify_hdr) - match_src_port = !!transfer; + match_src_port[i] = !!transfer; break; default: /*Queue action do nothing*/ @@ -17931,9 +17932,9 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, "Failed to create policy rules per domain."); goto err_exit; } - if (match_src_port) { - mtr_policy->match_port = match_src_port; - mtr_policy->hierarchy_match_port = match_src_port; + if (match_src_port[RTE_COLOR_GREEN] || match_src_port[RTE_COLOR_YELLOW]) { + mtr_policy->match_port = 1; + mtr_policy->hierarchy_match_port = 1; } return 0; err_exit: @@ -17995,6 +17996,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain) uint8_t egress, transfer; struct rte_flow_error error; struct mlx5_meter_policy_acts acts[RTE_COLORS]; + bool match_src_port[RTE_COLORS] = {false}; int ret; egress = (domain == MLX5_MTR_DOMAIN_EGRESS) ? 1 : 0; @@ -18070,7 +18072,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain) /* Create default policy rules. */ ret = __flow_dv_create_domain_policy_rules(dev, &def_policy->sub_policy, - egress, transfer, false, acts); + egress, transfer, match_src_port, acts); if (ret) { DRV_LOG(ERR, "Failed to create default policy rules."); goto def_policy_error; @@ -19653,11 +19655,13 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev, } } if (next_mtr && *policy_mode == MLX5_MTR_POLICY_MODE_ALL) { - if (!(action_flags[RTE_COLOR_GREEN] & action_flags[RTE_COLOR_YELLOW] & - MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)) + uint64_t hierarchy_type_flag = + MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY | MLX5_FLOW_ACTION_JUMP; + if (!(action_flags[RTE_COLOR_GREEN] & hierarchy_type_flag) || + !(action_flags[RTE_COLOR_YELLOW] & hierarchy_type_flag)) return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_METER_POLICY, NULL, - "Meter hierarchy supports meter action only."); + "Unsupported action in meter hierarchy."); } /* If both colors have RSS, the attributes should be the same. */ if (flow_dv_mtr_policy_rss_compare(rss_color[RTE_COLOR_GREEN], -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.309748322 +0800 +++ 0094-net-mlx5-support-jump-in-meter-hierarchy.patch 2024-07-12 18:40:14.336594199 +0800 @@ -1 +1 @@ -From dc1d92a4f547f8af6eb9b8824257ab3fd8dfbc77 Mon Sep 17 00:00:00 2001 +From eab3879444b1d4e62a3285d56d41d4dab3bc9ebb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dc1d92a4f547f8af6eb9b8824257ab3fd8dfbc77 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 99abb2f2fb..220d92b1a7 100644 +index b97e00b287..d7eba9a71f 100644 @@ -23 +25 @@ -@@ -17963,7 +17963,7 @@ __flow_dv_create_policy_matcher(struct rte_eth_dev *dev, +@@ -17682,7 +17682,7 @@ __flow_dv_create_policy_matcher(struct rte_eth_dev *dev, @@ -32 +34 @@ -@@ -17978,6 +17978,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, +@@ -17697,6 +17697,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, @@ -40 +42 @@ -@@ -18012,12 +18013,12 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, +@@ -17731,12 +17732,12 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, @@ -57 +59 @@ -@@ -18027,7 +18028,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, +@@ -17746,7 +17747,7 @@ __flow_dv_create_domain_policy_rules(struct rte_eth_dev *dev, @@ -66 +68 @@ -@@ -18075,7 +18076,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, +@@ -17794,7 +17795,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, @@ -75 +77 @@ -@@ -18146,7 +18147,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, +@@ -17865,7 +17866,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, @@ -84 +86 @@ -@@ -18198,7 +18199,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, +@@ -17917,7 +17918,7 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, @@ -93 +95 @@ -@@ -18212,9 +18213,9 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, +@@ -17931,9 +17932,9 @@ __flow_dv_create_policy_acts_rules(struct rte_eth_dev *dev, @@ -106 +108 @@ -@@ -18276,6 +18277,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain) +@@ -17995,6 +17996,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain) @@ -114 +116 @@ -@@ -18351,7 +18353,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain) +@@ -18070,7 +18072,7 @@ __flow_dv_create_domain_def_policy(struct rte_eth_dev *dev, uint32_t domain) @@ -123 +125 @@ -@@ -19934,11 +19936,13 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev, +@@ -19653,11 +19655,13 @@ flow_dv_validate_mtr_policy_acts(struct rte_eth_dev *dev,