Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/123888 _apply patch failure_ Submitter: Rongwei Liu Date: Tuesday, February 14 2023 12:57:11 Applied on: CommitID:39d469a7eb4f157923be73aea0b0cc1015860ca7 Apply patch set 123888-123892 failed: Checking patch drivers/net/mlx5/hws/mlx5dr_definer.c... Hunk #2 succeeded at 815 (offset -89 lines). error: while searching for: } if (m->hdr.teid) { if (!(cd->caps->flex_protocols & MLX5_HCA_FLEX_GTPU_TEID_ENABLED)) { rte_errno = ENOTSUP; return rte_errno; } error: patch failed: drivers/net/mlx5/hws/mlx5dr_definer.c:925 error: while searching for: fc->item_idx = item_idx; fc->tag_set = &mlx5dr_definer_gtp_teid_set; fc->bit_mask = __mlx5_mask(header_gtp, teid); fc->byte_off = cd->caps->format_select_gtpu_dw_1 * DW_SIZE; } if (m->hdr.gtp_hdr_info) { if (!(cd->caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) { rte_errno = ENOTSUP; return rte_errno; } error: patch failed: drivers/net/mlx5/hws/mlx5dr_definer.c:933 error: while searching for: fc->tag_set = &mlx5dr_definer_gtp_ext_flag_set; fc->bit_mask = __mlx5_mask(header_gtp, ext_hdr_flag); fc->bit_off = __mlx5_dw_bit_off(header_gtp, ext_hdr_flag); fc->byte_off = cd->caps->format_select_gtpu_dw_0 * DW_SIZE; } if (m->hdr.msg_type) { if (!(cd->caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) { rte_errno = ENOTSUP; return rte_errno; } error: patch failed: drivers/net/mlx5/hws/mlx5dr_definer.c:946 Hunk #6 succeeded at 872 (offset -89 lines). Hunk #7 succeeded at 883 (offset -89 lines). Hunk #8 succeeded at 898 (offset -89 lines). Hunk #9 succeeded at 913 (offset -89 lines). Hunk #10 succeeded at 929 (offset -89 lines). Hunk #11 succeeded at 942 (offset -89 lines). Hunk #12 succeeded at 953 (offset -89 lines). Hunk #13 succeeded at 974 (offset -89 lines). error: while searching for: int i, ret; cd.fc = fc; cd.caps = ctx->caps; cd.relaxed = mt->flags & MLX5DR_MATCH_TEMPLATE_FLAG_RELAXED_MATCH; /* Collect all RTE fields to the field array and set header layout */ error: patch failed: drivers/net/mlx5/hws/mlx5dr_definer.c:1673 Applying patch drivers/net/mlx5/hws/mlx5dr_definer.c with 4 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Rejected hunk #4. Rejected hunk #5. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Rejected hunk #14. diff a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c (rejected hunks) @@ -925,7 +926,7 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, } if (m->hdr.teid) { - if (!(cd->caps->flex_protocols & MLX5_HCA_FLEX_GTPU_TEID_ENABLED)) { + if (!(caps->flex_protocols & MLX5_HCA_FLEX_GTPU_TEID_ENABLED)) { rte_errno = ENOTSUP; return rte_errno; } @@ -933,11 +934,11 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, fc->item_idx = item_idx; fc->tag_set = &mlx5dr_definer_gtp_teid_set; fc->bit_mask = __mlx5_mask(header_gtp, teid); - fc->byte_off = cd->caps->format_select_gtpu_dw_1 * DW_SIZE; + fc->byte_off = caps->format_select_gtpu_dw_1 * DW_SIZE; } if (m->hdr.gtp_hdr_info) { - if (!(cd->caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) { + if (!(caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) { rte_errno = ENOTSUP; return rte_errno; } @@ -946,12 +947,12 @@ mlx5dr_definer_conv_item_gtp(struct mlx5dr_definer_conv_data *cd, fc->tag_set = &mlx5dr_definer_gtp_ext_flag_set; fc->bit_mask = __mlx5_mask(header_gtp, ext_hdr_flag); fc->bit_off = __mlx5_dw_bit_off(header_gtp, ext_hdr_flag); - fc->byte_off = cd->caps->format_select_gtpu_dw_0 * DW_SIZE; + fc->byte_off = caps->format_select_gtpu_dw_0 * DW_SIZE; } if (m->hdr.msg_type) { - if (!(cd->caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) { + if (!(caps->flex_protocols & MLX5_HCA_FLEX_GTPU_DW_0_ENABLED)) { rte_errno = ENOTSUP; return rte_errno; } @@ -1673,7 +1676,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, int i, ret; cd.fc = fc; - cd.caps = ctx->caps; + cd.ctx = ctx; cd.relaxed = mt->flags & MLX5DR_MATCH_TEMPLATE_FLAG_RELAXED_MATCH; /* Collect all RTE fields to the field array and set header layout */ Checking patch drivers/common/mlx5/mlx5_devx_cmds.c... Checking patch drivers/net/mlx5/hws/mlx5dr_definer.c... error: drivers/net/mlx5/hws/mlx5dr_definer.c: does not match index Checking patch drivers/net/mlx5/hws/mlx5dr_definer.h... Hunk #1 succeeded at 511 (offset -8 lines). Checking patch drivers/net/mlx5/mlx5.c... Checking patch drivers/net/mlx5/mlx5.h... Hunk #3 succeeded at 2266 (offset -4 lines). Checking patch drivers/net/mlx5/mlx5_flow.h... Hunk #2 succeeded at 2602 (offset -17 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:4738 Hunk #4 succeeded at 4864 (offset -7 lines). Hunk #5 succeeded at 4872 (offset -7 lines). Hunk #6 succeeded at 4914 (offset -7 lines). Applied patch drivers/common/mlx5/mlx5_devx_cmds.c cleanly. Applied patch drivers/net/mlx5/hws/mlx5dr_definer.h cleanly. Applied patch drivers/net/mlx5/mlx5.c cleanly. Applied patch drivers/net/mlx5/mlx5.h cleanly. Applied patch drivers/net/mlx5/mlx5_flow.h cleanly. Applying patch drivers/net/mlx5/mlx5_flow_hw.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. diff a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c (rejected hunks) @@ -4738,6 +4742,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_IPV6_ROUTING_EXT: break; case RTE_FLOW_ITEM_TYPE_INTEGRITY: /* Checking patch drivers/common/mlx5/mlx5_prm.h... error: while searching for: MLX5_MODI_TUNNEL_HDR_DW_1 = 0x75, MLX5_MODI_GTPU_FIRST_EXT_DW_0 = 0x76, MLX5_MODI_HASH_RESULT = 0x81, }; /* Total number of metadata reg_c's. */ error: patch failed: drivers/common/mlx5/mlx5_prm.h:760 Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Applying patch drivers/common/mlx5/mlx5_prm.h with 1 reject... Rejected hunk #1. Applied patch drivers/net/mlx5/mlx5_flow_dv.c cleanly. diff a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h (rejected hunks) @@ -760,6 +760,7 @@ enum mlx5_modification_field { MLX5_MODI_TUNNEL_HDR_DW_1 = 0x75, MLX5_MODI_GTPU_FIRST_EXT_DW_0 = 0x76, MLX5_MODI_HASH_RESULT = 0x81, + MLX5_MODI_OUT_IPV6_NEXT_HDR = 0x4A, }; /* Total number of metadata reg_c's. */ https://lab.dpdk.org/results/dashboard/patchsets/25389/ UNH-IOL DPDK Community Lab