|WARNING| pw119127 [PATCH] net/mlx5: fix assert failure in item translation

[dpdklab@iol.unh.edu]

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

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

_apply patch failure_

Submitter: Suanming Mou <suanmingm@nvidia.com>
Date: Wednesday, October 26 2022 02:09:13 
Applied on: CommitID:011c617ca20858ce0ad20625e9d3e4c3d6252047
Apply patch set 119127 failed:

Checking patch drivers/net/mlx5/mlx5_flow.c...
Hunk #1 succeeded at 63 (offset -18 lines).
Hunk #2 succeeded at 7400 (offset -182 lines).
Hunk #3 succeeded at 7437 (offset -182 lines).
Checking patch drivers/net/mlx5/mlx5_flow.h...
Hunk #1 succeeded at 1566 (offset -354 lines).
Checking patch drivers/net/mlx5/mlx5_flow_dv.c...
error: while searching for:
			    uint8_t *match_criteria,
			    struct rte_flow_error *error)
{
	struct mlx5_flow_rss_desc rss_desc = { .level = attr->rss_level };
	struct rte_flow_attr rattr = {
		.group = attr->group,

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:13499
error: while searching for:
		.attr = &rattr,
		.rss_desc = &rss_desc,
	};
	int ret;

	for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
		if (!mlx5_flow_os_item_supported(items->type))
			return rte_flow_error_set(error, ENOTSUP,
						  RTE_FLOW_ERROR_TYPE_ITEM,
						  NULL, "item not supported");
		ret = flow_dv_translate_items(&rte_eth_devices[attr->port_id],
			items, &wks, key, key_type,  NULL);
		if (ret)
			return ret;
	}
	if (wks.item_flags & MLX5_FLOW_ITEM_INTEGRITY) {
		flow_dv_translate_item_integrity_post(key,

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:13515
error: while searching for:
		*match_criteria = flow_dv_matcher_enable(key);
	if (item_flags)
		*item_flags = wks.item_flags;
	return 0;
}

/**

error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:13569
Applied patch drivers/net/mlx5/mlx5_flow.c cleanly.
Applied patch drivers/net/mlx5/mlx5_flow.h cleanly.
Applying patch drivers/net/mlx5/mlx5_flow_dv.c with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
diff a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c	(rejected hunks)
@@ -13499,6 +13499,7 @@ flow_dv_translate_items_hws(const struct rte_flow_item *items,
 			    uint8_t *match_criteria,
 			    struct rte_flow_error *error)
 {
+	struct mlx5_flow_workspace *flow_wks = mlx5_flow_push_thread_workspace();
 	struct mlx5_flow_rss_desc rss_desc = { .level = attr->rss_level };
 	struct rte_flow_attr rattr = {
 		.group = attr->group,
@@ -13515,17 +13516,20 @@ flow_dv_translate_items_hws(const struct rte_flow_item *items,
 		.attr = &rattr,
 		.rss_desc = &rss_desc,
 	};
-	int ret;
+	int ret = 0;
 
+	RTE_SET_USED(flow_wks);
 	for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
-		if (!mlx5_flow_os_item_supported(items->type))
-			return rte_flow_error_set(error, ENOTSUP,
-						  RTE_FLOW_ERROR_TYPE_ITEM,
-						  NULL, "item not supported");
+		if (!mlx5_flow_os_item_supported(items->type)) {
+			ret = rte_flow_error_set(error, ENOTSUP,
+						 RTE_FLOW_ERROR_TYPE_ITEM,
+						 NULL, "item not supported");
+			goto exit;
+		}
 		ret = flow_dv_translate_items(&rte_eth_devices[attr->port_id],
 			items, &wks, key, key_type,  NULL);
 		if (ret)
-			return ret;
+			goto exit;
 	}
 	if (wks.item_flags & MLX5_FLOW_ITEM_INTEGRITY) {
 		flow_dv_translate_item_integrity_post(key,
@@ -13569,7 +13573,9 @@ flow_dv_translate_items_hws(const struct rte_flow_item *items,
 		*match_criteria = flow_dv_matcher_enable(key);
 	if (item_flags)
 		*item_flags = wks.item_flags;
-	return 0;
+exit:
+	mlx5_flow_pop_thread_workspace();
+	return ret;
 }
 
 /**

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

UNH-IOL DPDK Community Lab