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

_apply patch failure_

Submitter: Sean Zhang <xiazhang@nvidia.com>
Date: Wednesday, October 19 2022 14:57:33 
Applied on: CommitID:a74b1b25136a592c275afbfa6b70771469750aee
Apply patch set 118618 failed:

Checking patch drivers/net/mlx5/mlx5_flow.c...
Hunk #1 succeeded at 108 (offset -18 lines).
Hunk #2 succeeded at 565 (offset -18 lines).
Hunk #3 succeeded at 5443 (offset -69 lines).
Hunk #4 succeeded at 6103 (offset -69 lines).
Hunk #5 succeeded at 6916 (offset -70 lines).
Hunk #6 succeeded at 6930 (offset -70 lines).
Hunk #7 succeeded at 7019 (offset -70 lines).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
Hunk #1 succeeded at 7059 (offset -130 lines).
error: while searching for:
			     mlx5_flow_get_thread_workspace())->rss_desc,
	};
	struct mlx5_dv_matcher_workspace wks_m = wks;
	int ret = 0;
	int tunnel;


error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:13560
error: while searching for:
						  RTE_FLOW_ERROR_TYPE_ITEM,
						  NULL, "item not supported");
		tunnel = !!(wks.item_flags & MLX5_FLOW_LAYER_TUNNEL);
		switch (items->type) {
		case RTE_FLOW_ITEM_TYPE_CONNTRACK:
			flow_dv_translate_item_aso_ct(dev, match_mask,
						      match_value, items);

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:13569
error: while searching for:
			wks.last_item = tunnel ? MLX5_FLOW_ITEM_INNER_FLEX :
						 MLX5_FLOW_ITEM_OUTER_FLEX;
			break;
		default:
			ret = flow_dv_translate_items(dev, items, &wks_m,
				match_mask, MLX5_SET_MATCHER_SW_M, error);

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:13581
Applied patch drivers/net/mlx5/mlx5_flow.c cleanly.
Applying patch drivers/net/mlx5/mlx5_flow_dv.c with 3 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
diff a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c	(rejected hunks)
@@ -13560,6 +13561,7 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,
 			     mlx5_flow_get_thread_workspace())->rss_desc,
 	};
 	struct mlx5_dv_matcher_workspace wks_m = wks;
+	int item_type;
 	int ret = 0;
 	int tunnel;
 
@@ -13569,7 +13571,8 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,
 						  RTE_FLOW_ERROR_TYPE_ITEM,
 						  NULL, "item not supported");
 		tunnel = !!(wks.item_flags & MLX5_FLOW_LAYER_TUNNEL);
-		switch (items->type) {
+		item_type = items->type;
+		switch (item_type) {
 		case RTE_FLOW_ITEM_TYPE_CONNTRACK:
 			flow_dv_translate_item_aso_ct(dev, match_mask,
 						      match_value, items);
@@ -13581,6 +13584,12 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,
 			wks.last_item = tunnel ? MLX5_FLOW_ITEM_INNER_FLEX :
 						 MLX5_FLOW_ITEM_OUTER_FLEX;
 			break;
+		case MLX5_RTE_FLOW_ITEM_TYPE_SQ:
+			flow_dv_translate_item_sq(match_value, items,
+						  MLX5_SET_MATCHER_SW_V);
+			flow_dv_translate_item_sq(match_mask, items,
+						  MLX5_SET_MATCHER_SW_M);
+			break;
 		default:
 			ret = flow_dv_translate_items(dev, items, &wks_m,
 				match_mask, MLX5_SET_MATCHER_SW_M, error);

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

UNH-IOL DPDK Community Lab