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

_apply patch failure_

Submitter: Maayan Kashani <mkashani@nvidia.com>
Date: Sunday, February 05 2023 15:39:52 
Applied on: CommitID:bc1db4f45af35c87e7d97db7a24d479674aa8a43
Apply patch set 123060 failed:

Checking patch doc/guides/nics/mlx5.rst...
error: while searching for:

- The NIC egress flow rules on representor port are not supported.

- When using DV/verbs flow engine (``dv_flow_en`` = 1/0 respectively), Match on SPI field
  in ESP header for group 0 needs MLNX_OFED 5.6+.


Statistics

error: patch failed: doc/guides/nics/mlx5.rst:599
Checking patch drivers/net/mlx5/mlx5_flow_verbs.c...
error: while searching for:
		int ret = 0;

		switch (items->type) {
		case RTE_FLOW_ITEM_TYPE_ESP:
			ret = mlx5_flow_os_validate_item_esp(items, item_flags,
							  next_protocol,

error: patch failed: drivers/net/mlx5/mlx5_flow_verbs.c:1330
error: while searching for:
				return ret;
			last_item = MLX5_FLOW_ITEM_ESP;
			break;
		case RTE_FLOW_ITEM_TYPE_VOID:
			break;
		case RTE_FLOW_ITEM_TYPE_ETH:

error: patch failed: drivers/net/mlx5/mlx5_flow_verbs.c:1338
Checking patch drivers/net/mlx5/windows/mlx5_flow_os.c...
error: while searching for:

int
mlx5_flow_os_validate_item_esp(const struct rte_flow_item *item,
			    uint64_t item_flags __rte_unused,
			    uint8_t target_protocol __rte_unused,
			    struct rte_flow_error *error)
{
	const struct rte_flow_item_esp *mask = item->mask;

error: patch failed: drivers/net/mlx5/windows/mlx5_flow_os.c:419
error: while searching for:
				      MLX5_FLOW_LAYER_OUTER_L4;
	int ret;

#ifndef HAVE_IBV_FLOW_SPEC_ESP
	return rte_flow_error_set(error, ENOTSUP,
					  RTE_FLOW_ERROR_TYPE_ITEM, item,
					  "ESP item not supported");
#endif
	if (!(item_flags & l3m))
		return rte_flow_error_set(error, EINVAL,
					  RTE_FLOW_ERROR_TYPE_ITEM, item,

error: patch failed: drivers/net/mlx5/windows/mlx5_flow_os.c:432
Applying patch doc/guides/nics/mlx5.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/mlx5/mlx5_flow_verbs.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch drivers/net/mlx5/windows/mlx5_flow_os.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst	(rejected hunks)
@@ -599,8 +599,8 @@ Limitations
 
 - The NIC egress flow rules on representor port are not supported.
 
-- When using DV/verbs flow engine (``dv_flow_en`` = 1/0 respectively), Match on SPI field
-  in ESP header for group 0 needs MLNX_OFED 5.6+.
+- When using DV/verbs flow engine (``dv_flow_en`` = 1/0 respectively),
+  Match on SPI field in ESP header for group 0 is supported from connectX-7.
 
 
 Statistics
diff a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c	(rejected hunks)
@@ -1330,6 +1330,7 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 		int ret = 0;
 
 		switch (items->type) {
+#ifdef HAVE_IBV_FLOW_SPEC_ESP
 		case RTE_FLOW_ITEM_TYPE_ESP:
 			ret = mlx5_flow_os_validate_item_esp(items, item_flags,
 							  next_protocol,
@@ -1338,6 +1339,7 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 				return ret;
 			last_item = MLX5_FLOW_ITEM_ESP;
 			break;
+#endif
 		case RTE_FLOW_ITEM_TYPE_VOID:
 			break;
 		case RTE_FLOW_ITEM_TYPE_ETH:
diff a/drivers/net/mlx5/windows/mlx5_flow_os.c b/drivers/net/mlx5/windows/mlx5_flow_os.c	(rejected hunks)
@@ -419,8 +419,8 @@ mlx5_flow_os_set_specific_workspace(struct mlx5_flow_workspace *data)
 
 int
 mlx5_flow_os_validate_item_esp(const struct rte_flow_item *item,
-			    uint64_t item_flags __rte_unused,
-			    uint8_t target_protocol __rte_unused,
+			    uint64_t item_flags,
+			    uint8_t target_protocol,
 			    struct rte_flow_error *error)
 {
 	const struct rte_flow_item_esp *mask = item->mask;
@@ -432,11 +432,6 @@ mlx5_flow_os_validate_item_esp(const struct rte_flow_item *item,
 				      MLX5_FLOW_LAYER_OUTER_L4;
 	int ret;
 
-#ifndef HAVE_IBV_FLOW_SPEC_ESP
-	return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_ITEM, item,
-					  "ESP item not supported");
-#endif
 	if (!(item_flags & l3m))
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ITEM, item,

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

UNH-IOL DPDK Community Lab