[dpdk-test-report] |WARNING| pw95313-95318 [PATCH] [6/6] doc: update mlx5 metering policy part

[dpdk-test-report] |WARNING| pw95313-95318 [PATCH] [6/6] doc: update mlx5 metering policy part

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3319 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/95313

_apply patch failure_

Submitter: Bing Zhao <bingz@nvidia.com>
Date: Monday, July 05 2021 15:57:56 
Applied on: CommitID:254501687fade29b11125d79c734346a9dd21138
Apply patch set 95313-95318 failed:

Checking patch drivers/net/mlx5/mlx5_flow.c...
error: while searching for:
		for (i = 0; i < MLX5_MTR_RTE_COLORS; i++) {
			struct mlx5_flow dev_flow = {0};
			struct mlx5_flow_handle dev_handle = { {0} };

			if (policy->is_rss) {
				const void *rss_act =
					policy->act_cnt[i].rss->conf;
				struct rte_flow_action rss_actions[2] = {
					[0] = {
					.type = RTE_FLOW_ACTION_TYPE_RSS,
					.conf = rss_act
					},
					[1] = {
					.type = RTE_FLOW_ACTION_TYPE_END,
					.conf = NULL
					}
				};


error: patch failed: drivers/net/mlx5/mlx5_flow.c:4612
error: while searching for:
				rss_desc_v[i].tunnel =
					!!(dev_flow.handle->layers &
					MLX5_FLOW_LAYER_TUNNEL);
			} else {
				/* This is queue action. */
				rss_desc_v[i] = wks->rss_desc;
				rss_desc_v[i].key_len = 0;

error: patch failed: drivers/net/mlx5/mlx5_flow.c:4650
Hunk #4 succeeded at 4654 (offset -6 lines).
Hunk #5 succeeded at 4806 (offset -6 lines).
Hunk #6 succeeded at 4816 (offset -6 lines).
Hunk #7 succeeded at 4833 (offset -6 lines).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
Hunk #1 succeeded at 14545 (offset -5 lines).
Hunk #2 succeeded at 14558 (offset -5 lines).
Hunk #3 succeeded at 14581 (offset -5 lines).
Hunk #4 succeeded at 14594 (offset -5 lines).
Hunk #5 succeeded at 15545 (offset -5 lines).
Hunk #6 succeeded at 15990 (offset -5 lines).
Hunk #7 succeeded at 16035 (offset -5 lines).
Hunk #8 succeeded at 16051 (offset -5 lines).
Hunk #9 succeeded at 16082 (offset -5 lines).
Hunk #10 succeeded at 16104 (offset -5 lines).
Hunk #11 succeeded at 16150 (offset -5 lines).
Applying patch drivers/net/mlx5/mlx5_flow.c with 2 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Applied patch drivers/net/mlx5/mlx5_flow_dv.c cleanly.
diff a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c	(rejected hunks)
@@ -4612,18 +4612,19 @@ get_meter_sub_policy(struct rte_eth_dev *dev,
 		for (i = 0; i < MLX5_MTR_RTE_COLORS; i++) {
 			struct mlx5_flow dev_flow = {0};
 			struct mlx5_flow_handle dev_handle = { {0} };
+			uint8_t fate = policy->act_cnt[i].fate_action;
 
-			if (policy->is_rss) {
+			if (fate == MLX5_FLOW_FATE_SHARED_RSS) {
 				const void *rss_act =
 					policy->act_cnt[i].rss->conf;
 				struct rte_flow_action rss_actions[2] = {
 					[0] = {
 					.type = RTE_FLOW_ACTION_TYPE_RSS,
-					.conf = rss_act
+					.conf = rss_act,
 					},
 					[1] = {
 					.type = RTE_FLOW_ACTION_TYPE_END,
-					.conf = NULL
+					.conf = NULL,
 					}
 				};
 
@@ -4650,7 +4651,8 @@ get_meter_sub_policy(struct rte_eth_dev *dev,
 				rss_desc_v[i].tunnel =
 					!!(dev_flow.handle->layers &
 					MLX5_FLOW_LAYER_TUNNEL);
-			} else {
+				rss_desc[i] = &rss_desc_v[i];
+			} else if (fate == MLX5_FLOW_FATE_QUEUE) {
 				/* This is queue action. */
 				rss_desc_v[i] = wks->rss_desc;
 				rss_desc_v[i].key_len = 0;

https://lab.dpdk.org/results/dashboard/patchsets/17657/

UNH-IOL DPDK Community Lab