|WARNING| pw108493 [PATCH] [v2] net/mlx5: fix MPLS/GRE Verbs spec ordering
dpdklab at iol.unh.edu
dpdklab at iol.unh.edu
Wed Mar 2 18:28:50 CET 2022
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/108493
_apply patch failure_
Submitter: Dariusz Sosnowski <dsosnowski at nvidia.com>
Date: Wednesday, March 02 2022 17:06:59
Applied on: CommitID:305769000c40a4fdf1ed0cf24c157b447b91ea7d
Apply patch set 108493 failed:
Checking patch drivers/net/mlx5/mlx5_flow_verbs.c...
error: while searching for:
struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
struct mlx5_flow_rss_desc *rss_desc;
const struct rte_flow_item *tunnel_item = NULL;
MLX5_ASSERT(wks);
rss_desc = &wks->rss_desc;
error: patch failed: drivers/net/mlx5/mlx5_flow_verbs.c:1680
error: while searching for:
item_flags |= MLX5_FLOW_LAYER_VXLAN_GPE;
break;
case RTE_FLOW_ITEM_TYPE_GRE:
subpriority = MLX5_TUNNEL_PRIO_GET(rss_desc);
item_flags |= MLX5_FLOW_LAYER_GRE;
tunnel_item = items;
error: patch failed: drivers/net/mlx5/mlx5_flow_verbs.c:1817
error: while searching for:
}
}
if (item_flags & MLX5_FLOW_LAYER_GRE)
flow_verbs_translate_item_gre(dev_flow, tunnel_item,
item_flags);
dev_flow->handle->layers = item_flags;
/* Other members of attr will be ignored. */
dev_flow->verbs.attr.priority =
error: patch failed: drivers/net/mlx5/mlx5_flow_verbs.c:1834
Applying patch drivers/net/mlx5/mlx5_flow_verbs.c with 3 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Rejected hunk #5.
Rejected hunk #6.
diff a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c (rejected hunks)
@@ -1680,6 +1717,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
struct mlx5_flow_rss_desc *rss_desc;
const struct rte_flow_item *tunnel_item = NULL;
+ uint8_t *gre_spec = NULL;
MLX5_ASSERT(wks);
rss_desc = &wks->rss_desc;
@@ -1817,6 +1855,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
item_flags |= MLX5_FLOW_LAYER_VXLAN_GPE;
break;
case RTE_FLOW_ITEM_TYPE_GRE:
+ gre_spec = flow_verbs_reserve_gre(dev_flow);
subpriority = MLX5_TUNNEL_PRIO_GET(rss_desc);
item_flags |= MLX5_FLOW_LAYER_GRE;
tunnel_item = items;
@@ -1834,8 +1873,8 @@ flow_verbs_translate(struct rte_eth_dev *dev,
}
}
if (item_flags & MLX5_FLOW_LAYER_GRE)
- flow_verbs_translate_item_gre(dev_flow, tunnel_item,
- item_flags);
+ flow_verbs_translate_item_gre(dev_flow, gre_spec,
+ tunnel_item, item_flags);
dev_flow->handle->layers = item_flags;
/* Other members of attr will be ignored. */
dev_flow->verbs.attr.priority =
https://lab.dpdk.org/results/dashboard/patchsets/21371/
UNH-IOL DPDK Community Lab
More information about the test-report
mailing list