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

_apply patch failure_

Submitter: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Date: Monday, February 13 2023 13:45:48 
Applied on: CommitID:39d469a7eb4f157923be73aea0b0cc1015860ca7
Apply patch set 123803 failed:

Checking patch drivers/common/mlx5/mlx5_prm.h...
Hunk #1 succeeded at 1691 (offset -5 lines).
Checking patch drivers/net/mlx5/hws/mlx5dr_cmd.c...
Hunk #1 succeeded at 767 (offset -139 lines).
Checking patch drivers/net/mlx5/hws/mlx5dr_cmd.h...
error: while searching for:
	bool cross_vhca_resources;
	uint32_t shared_vhca_id;
	char fw_ver[64];
};

int mlx5dr_cmd_destroy_obj(struct mlx5dr_devx_obj *devx_obj);

error: patch failed: drivers/net/mlx5/hws/mlx5dr_cmd.h:202
Checking patch drivers/net/mlx5/hws/mlx5dr_definer.c...
error: while searching for:
	}
}

static int
mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
				struct mlx5dr_match_template *mt,

error: patch failed: drivers/net/mlx5/hws/mlx5dr_definer.c:1645
Hunk #3 succeeded at 1583 (offset -216 lines).
Checking patch drivers/net/mlx5/hws/mlx5dr_definer.h...
Hunk #1 succeeded at 106 (offset -6 lines).
Checking patch drivers/net/mlx5/mlx5_flow_hw.c...
error: while searching for:
		case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST:
		case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY:
		case RTE_FLOW_ITEM_TYPE_CONNTRACK:
			break;
		case RTE_FLOW_ITEM_TYPE_INTEGRITY:
			/*

error: patch failed: drivers/net/mlx5/mlx5_flow_hw.c:4734
Applied patch drivers/common/mlx5/mlx5_prm.h cleanly.
Applied patch drivers/net/mlx5/hws/mlx5dr_cmd.c cleanly.
Applying patch drivers/net/mlx5/hws/mlx5dr_cmd.h with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/mlx5/hws/mlx5dr_definer.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Applied patch drivers/net/mlx5/hws/mlx5dr_definer.h cleanly.
Applying patch drivers/net/mlx5/mlx5_flow_hw.c with 1 reject...
Rejected hunk #1.
diff a/drivers/net/mlx5/hws/mlx5dr_cmd.h b/drivers/net/mlx5/hws/mlx5dr_cmd.h	(rejected hunks)
@@ -202,6 +202,7 @@ struct mlx5dr_cmd_query_caps {
 	bool cross_vhca_resources;
 	uint32_t shared_vhca_id;
 	char fw_ver[64];
+	bool ipsec_offload;
 };
 
 int mlx5dr_cmd_destroy_obj(struct mlx5dr_devx_obj *devx_obj);
diff a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c	(rejected hunks)
@@ -1645,6 +1647,36 @@ mlx5dr_definer_check_item_range_supp(struct rte_flow_item *item)
 	}
 }
 
+static int
+mlx5dr_definer_conv_item_esp(struct mlx5dr_definer_conv_data *cd,
+			     struct rte_flow_item *item,
+			     int item_idx)
+{
+	const struct rte_flow_item_esp *m = item->mask;
+	struct mlx5dr_definer_fc *fc;
+
+	if (!cd->caps->ipsec_offload) {
+		rte_errno = ENOTSUP;
+		return rte_errno;
+	}
+
+	if (!m)
+		return 0;
+	if (m->hdr.spi) {
+		fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SPI];
+		fc->item_idx = item_idx;
+		fc->tag_set = &mlx5dr_definer_ipsec_spi_set;
+		DR_CALC_SET_HDR(fc, ipsec, spi);
+	}
+	if (m->hdr.seq) {
+		fc = &cd->fc[MLX5DR_DEFINER_FNAME_ESP_SEQUENCE_NUMBER];
+		fc->item_idx = item_idx;
+		fc->tag_set = &mlx5dr_definer_ipsec_sequence_number_set;
+		DR_CALC_SET_HDR(fc, ipsec, sequence_number);
+	}
+	return 0;
+}
+
 static int
 mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
 				struct mlx5dr_match_template *mt,
diff a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c	(rejected hunks)
@@ -4734,6 +4734,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev,
 		case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST:
 		case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY:
 		case RTE_FLOW_ITEM_TYPE_CONNTRACK:
+		case RTE_FLOW_ITEM_TYPE_ESP:
 			break;
 		case RTE_FLOW_ITEM_TYPE_INTEGRITY:
 			/*

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

UNH-IOL DPDK Community Lab