Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/107936 _apply patch failure_ Submitter: Suanming Mou Date: Tuesday, February 22 2022 08:51:56 Applied on: CommitID:ecc0dd455e9a56db783463d83173c3f348b560ce Apply patch set 107936-107949 failed: Checking patch doc/guides/nics/mlx5.rst... Checking patch drivers/net/mlx5/linux/mlx5_os.c... Hunk #1 succeeded at 295 (offset -187 lines). Hunk #2 succeeded at 1714 (offset 193 lines). Checking patch drivers/net/mlx5/mlx5.c... Hunk #1 succeeded at 1933 (offset 734 lines). Checking patch drivers/net/mlx5/mlx5.h... error: while searching for: int tx_skew; /* Tx scheduling skew between WQE and data on wire. */ uint32_t reclaim_mode:2; /* Memory reclaim mode. */ uint32_t dv_esw_en:1; /* Enable E-Switch DV flow. */ uint32_t dv_flow_en:1; /* Enable DV flow. */ uint32_t dv_xmeta_en:2; /* Enable extensive flow metadata. */ uint32_t dv_miss_info:1; /* Restore packet after partial hw miss. */ uint32_t l3_vxlan_en:1; /* Enable L3 VXLAN flow creation. */ error: patch failed: drivers/net/mlx5/mlx5.h:287 Checking patch drivers/net/mlx5/mlx5_flow.c... Applied patch doc/guides/nics/mlx5.rst cleanly. Applied patch drivers/net/mlx5/linux/mlx5_os.c cleanly. Applied patch drivers/net/mlx5/mlx5.c cleanly. Applying patch drivers/net/mlx5/mlx5.h with 1 reject... Rejected hunk #1. Applied patch drivers/net/mlx5/mlx5_flow.c cleanly. diff a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h (rejected hunks) @@ -287,7 +287,8 @@ struct mlx5_sh_config { int tx_skew; /* Tx scheduling skew between WQE and data on wire. */ uint32_t reclaim_mode:2; /* Memory reclaim mode. */ uint32_t dv_esw_en:1; /* Enable E-Switch DV flow. */ - uint32_t dv_flow_en:1; /* Enable DV flow. */ + /* Enable DV flow. 1 means SW steering, 2 means HW steering. */ + unsigned int dv_flow_en:2; uint32_t dv_xmeta_en:2; /* Enable extensive flow metadata. */ uint32_t dv_miss_info:1; /* Restore packet after partial hw miss. */ uint32_t l3_vxlan_en:1; /* Enable L3 VXLAN flow creation. */ Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... Hunk #2 succeeded at 325 (offset 3 lines). Hunk #3 succeeded at 1501 (offset 3 lines). Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... Checking patch drivers/net/mlx5/mlx5_flow_hw.c... Applied patch drivers/net/mlx5/mlx5.h cleanly. Applied patch drivers/net/mlx5/mlx5_flow.h cleanly. Applied patch drivers/net/mlx5/mlx5_flow_hw.c cleanly. Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/mlx5.c... error: drivers/net/mlx5/mlx5.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch doc/guides/nics/mlx5.rst... error: doc/guides/nics/mlx5.rst: does not match index Checking patch doc/guides/rel_notes/release_22_03.rst... Hunk #1 succeeded at 121 (offset -35 lines). Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Applied patch doc/guides/rel_notes/release_22_03.rst cleanly. Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/linux/mlx5_os.c... error: drivers/net/mlx5/linux/mlx5_os.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_devx.c... Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_dv.c... Hunk #1 succeeded at 10966 (offset 1 line). Hunk #2 succeeded at 11066 (offset 1 line). Hunk #3 succeeded at 11076 (offset 1 line). Hunk #4 succeeded at 11623 (offset 1 line). Hunk #5 succeeded at 13650 (offset 2 lines). Hunk #6 succeeded at 14601 (offset 2 lines). Hunk #7 succeeded at 14695 (offset 2 lines). Hunk #8 succeeded at 14712 (offset 2 lines). Hunk #9 succeeded at 14733 (offset 2 lines). Hunk #10 succeeded at 14771 (offset 2 lines). Hunk #11 succeeded at 14790 (offset 2 lines). Hunk #12 succeeded at 14800 (offset 2 lines). Hunk #13 succeeded at 14816 (offset 2 lines). Hunk #14 succeeded at 14848 (offset 2 lines). Hunk #15 succeeded at 14866 (offset 2 lines). Hunk #16 succeeded at 14874 (offset 2 lines). Hunk #17 succeeded at 15052 (offset 2 lines). Hunk #18 succeeded at 15075 (offset 2 lines). Hunk #19 succeeded at 16868 (offset 1 line). Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_verbs.c... Checking patch drivers/net/mlx5/mlx5_rx.h... Checking patch drivers/net/mlx5/mlx5_rxq.c... Hunk #1 succeeded at 2284 (offset -1 lines). Hunk #2 succeeded at 2294 (offset -1 lines). Hunk #3 succeeded at 2301 (offset -1 lines). Hunk #4 succeeded at 2410 (offset -1 lines). Hunk #5 succeeded at 2418 (offset -1 lines). Hunk #6 succeeded at 2437 (offset -1 lines). Hunk #7 succeeded at 2609 (offset -1 lines). Hunk #8 succeeded at 2694 (offset -1 lines). Hunk #9 succeeded at 2704 (offset -1 lines). Hunk #10 succeeded at 2716 (offset -1 lines). Hunk #11 succeeded at 2769 (offset -1 lines). Hunk #12 succeeded at 2786 (offset -1 lines). Hunk #13 succeeded at 2794 (offset -1 lines). Hunk #14 succeeded at 2848 (offset -1 lines). Hunk #15 succeeded at 2865 (offset -1 lines). Hunk #16 succeeded at 2877 (offset -1 lines). Hunk #17 succeeded at 2894 (offset -1 lines). Applied patch drivers/net/mlx5/mlx5_devx.c cleanly. Applied patch drivers/net/mlx5/mlx5_flow_dv.c cleanly. Applied patch drivers/net/mlx5/mlx5_flow_verbs.c cleanly. Applied patch drivers/net/mlx5/mlx5_rx.h cleanly. Applied patch drivers/net/mlx5/mlx5_rxq.c cleanly. Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.c... error: drivers/net/mlx5/mlx5_flow.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_dv.c... error: drivers/net/mlx5/mlx5_flow_dv.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index Checking patch drivers/net/mlx5/mlx5.h... error: drivers/net/mlx5/mlx5.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow.h... error: drivers/net/mlx5/mlx5_flow.h: does not match index Checking patch drivers/net/mlx5/mlx5_flow_dv.c... error: drivers/net/mlx5/mlx5_flow_dv.c: does not match index Checking patch drivers/net/mlx5/mlx5_flow_hw.c... error: drivers/net/mlx5/mlx5_flow_hw.c: does not match index https://lab.dpdk.org/results/dashboard/patchsets/21182/ UNH-IOL DPDK Community Lab