Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/95461 _apply patch failure_ Submitter: Rongwei Liu Date: Wednesday, July 07 2021 08:09:49 Applied on: CommitID:a09268cb16feaab6798f596a47191cc7d67872fa Apply patch set 95461-95460 failed: Skipped patch 'doc/guides/nics/mlx5.rst'. Checking patch drivers/common/mlx5/mlx5_devx_cmds.c... Checking patch drivers/common/mlx5/mlx5_devx_cmds.h... Checking patch drivers/common/mlx5/mlx5_prm.h... Checking patch drivers/net/mlx5/linux/mlx5_os.c... Hunk #3 succeeded at 1387 (offset 8 lines). Checking patch drivers/net/mlx5/mlx5.h... Checking patch drivers/net/mlx5/mlx5_flow.c... Hunk #1 succeeded at 2395 (offset -3 lines). Hunk #2 succeeded at 2410 (offset -3 lines). Hunk #3 succeeded at 2446 (offset -3 lines). Checking patch drivers/net/mlx5/mlx5_flow.h... Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 6888 (offset -36 lines). Hunk #2 succeeded at 7848 (offset -37 lines). Hunk #3 succeeded at 8629 (offset -37 lines). Hunk #4 succeeded at 8643 (offset -37 lines). Hunk #5 succeeded at 8653 (offset -37 lines). Hunk #6 succeeded at 8681 (offset -37 lines). Hunk #7 succeeded at 9888 (offset -39 lines). Hunk #8 succeeded at 10180 (offset -39 lines). Hunk #9 succeeded at 10231 (offset -39 lines). Hunk #10 succeeded at 12089 (offset -39 lines). Hunk #11 succeeded at 12896 (offset -39 lines). Hunk #12 succeeded at 12995 (offset -39 lines). Hunk #13 succeeded at 13295 (offset -39 lines). Hunk #14 succeeded at 13366 (offset -39 lines). error: while searching for: { int ret; struct mlx5_flow_dv_match_params value = { .size = sizeof(value.buf) - MLX5_ST_SZ_BYTES(fte_match_set_misc4), }; struct mlx5_flow_dv_match_params matcher = { .size = sizeof(matcher.buf) - MLX5_ST_SZ_BYTES(fte_match_set_misc4), }; struct mlx5_priv *priv = dev->data->dev_private; if (match_src_port && (priv->representor || priv->master)) { if (flow_dv_translate_item_port_id(dev, matcher.buf, error: patch failed: drivers/net/mlx5/mlx5_flow_dv.c:15392 Hunk #16 succeeded at 15437 (offset -38 lines). Hunk #17 succeeded at 15461 (offset -38 lines). Hunk #18 succeeded at 15843 (offset -41 lines). Hunk #19 succeeded at 15855 (offset -41 lines). Hunk #20 succeeded at 15863 (offset -41 lines). Hunk #21 succeeded at 15913 (offset -41 lines). Hunk #22 succeeded at 15958 (offset -41 lines). Hunk #23 succeeded at 16240 (offset -41 lines). Checking patch drivers/net/mlx5/mlx5_flow_verbs.c... Checking patch drivers/vdpa/mlx5/mlx5_vdpa_steer.c... Applied patch drivers/common/mlx5/mlx5_devx_cmds.c cleanly. Applied patch drivers/common/mlx5/mlx5_devx_cmds.h cleanly. Applied patch drivers/common/mlx5/mlx5_prm.h cleanly. Applied patch drivers/net/mlx5/linux/mlx5_os.c cleanly. Applied patch drivers/net/mlx5/mlx5.h cleanly. 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 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. 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. Hunk #14 applied cleanly. Rejected hunk #15. Hunk #16 applied cleanly. Hunk #17 applied cleanly. Hunk #18 applied cleanly. Hunk #19 applied cleanly. Hunk #20 applied cleanly. Hunk #21 applied cleanly. Hunk #22 applied cleanly. Hunk #23 applied cleanly. Applied patch drivers/net/mlx5/mlx5_flow_verbs.c cleanly. Applied patch drivers/vdpa/mlx5/mlx5_vdpa_steer.c cleanly. diff a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c (rejected hunks) @@ -15392,14 +15455,13 @@ __flow_dv_create_policy_flow(struct rte_eth_dev *dev, { int ret; struct mlx5_flow_dv_match_params value = { - .size = sizeof(value.buf) - - MLX5_ST_SZ_BYTES(fte_match_set_misc4), + .size = sizeof(value.buf), }; struct mlx5_flow_dv_match_params matcher = { - .size = sizeof(matcher.buf) - - MLX5_ST_SZ_BYTES(fte_match_set_misc4), + .size = sizeof(matcher.buf), }; struct mlx5_priv *priv = dev->data->dev_private; + uint8_t misc_mask; if (match_src_port && (priv->representor || priv->master)) { if (flow_dv_translate_item_port_id(dev, matcher.buf, Skipped patch 'doc/guides/rel_notes/release_21_08.rst'. Skipped patch 'doc/guides/testpmd_app_ug/testpmd_funcs.rst'. Checking patch app/test-pmd/cmdline_flow.c... Hunk #1 succeeded at 205 (offset -2 lines). Hunk #2 succeeded at 1128 (offset -2 lines). error: while searching for: .next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param), .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)), }, [ITEM_E_TAG] = { .name = "e_tag", .help = "match E-Tag header", error: patch failed: app/test-pmd/cmdline_flow.c:2806 Checking patch app/test-pmd/util.c... Applying patch app/test-pmd/cmdline_flow.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Applied patch app/test-pmd/util.c cleanly. diff a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c (rejected hunks) @@ -2806,6 +2808,13 @@ static const struct token token_list[] = { .next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param), .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)), }, + [ITEM_VXLAN_LAST_RSVD] = { + .name = "last_rsvd", + .help = "VXLAN last reserved bits", + .next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, + rsvd1)), + }, [ITEM_E_TAG] = { .name = "e_tag", .help = "match E-Tag header", https://lab.dpdk.org/results/dashboard/patchsets/17698/ UNH-IOL DPDK Community Lab