Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/112692 _apply patch failure_ Submitter: Wu, WenxuanX Date: Monday, June 13 2022 10:25:50 Applied on: CommitID:1ab4156e7d57858fca1db448ac7a0792e1d527b6 Apply patch set 112692-112695 failed: Checking patch doc/guides/rel_notes/release_22_07.rst... error: while searching for: This section is a comment. Do not overwrite or remove it. Also, make sure to start the actual text at the margin. ======================================================= Removed Items ------------- error: patch failed: doc/guides/rel_notes/release_22_07.rst:54 Checking patch lib/ethdev/ethdev_driver.h... error: while searching for: /** Set IP reassembly configuration */ eth_ip_reassembly_conf_set_t ip_reassembly_conf_set; /** Dump private info from device */ eth_dev_priv_dump_t eth_dev_priv_dump; }; error: patch failed: lib/ethdev/ethdev_driver.h:1281 Checking patch lib/ethdev/rte_ethdev.c... Hunk #1 succeeded at 1644 (offset 8 lines). Hunk #2 succeeded at 1703 (offset 8 lines). Hunk #3 succeeded at 1782 (offset 8 lines). Hunk #4 succeeded at 5904 (offset 65 lines). Checking patch lib/ethdev/rte_ethdev.h... Hunk #1 succeeded at 6207 (offset 55 lines). Checking patch lib/ethdev/version.map... error: while searching for: rte_flow_async_action_handle_create; rte_flow_async_action_handle_destroy; rte_flow_async_action_handle_update; }; INTERNAL { error: patch failed: lib/ethdev/version.map:279 Applying patch doc/guides/rel_notes/release_22_07.rst with 1 reject... Rejected hunk #1. Applying patch lib/ethdev/ethdev_driver.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applied patch lib/ethdev/rte_ethdev.c cleanly. Applied patch lib/ethdev/rte_ethdev.h cleanly. Applying patch lib/ethdev/version.map with 1 reject... Rejected hunk #1. diff a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst (rejected hunks) @@ -54,7 +54,9 @@ New Features This section is a comment. Do not overwrite or remove it. Also, make sure to start the actual text at the margin. ======================================================= +* **Added new ethdev API for PMD to get buffer split supported protocol types.** + Added ``rte_eth_supported_hdrs_get()``, to get supported header protocol mask of a PMD to split. Removed Items ------------- diff a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h (rejected hunks) @@ -1281,6 +1296,9 @@ struct eth_dev_ops { /** Set IP reassembly configuration */ eth_ip_reassembly_conf_set_t ip_reassembly_conf_set; + /** Get supported ptypes to split */ + eth_buffer_split_hdr_ptype_get_t hdrs_supported_ptypes_get; + /** Dump private info from device */ eth_dev_priv_dump_t eth_dev_priv_dump; }; diff a/lib/ethdev/version.map b/lib/ethdev/version.map (rejected hunks) @@ -279,6 +279,9 @@ EXPERIMENTAL { rte_flow_async_action_handle_create; rte_flow_async_action_handle_destroy; rte_flow_async_action_handle_update; + + # added in 22.07 + rte_eth_supported_hdrs_get; }; INTERNAL { Checking patch lib/ethdev/rte_ethdev.c... error: lib/ethdev/rte_ethdev.c: does not match index Checking patch lib/ethdev/rte_ethdev.h... error: lib/ethdev/rte_ethdev.h: does not match index Checking patch app/test-pmd/cmdline.c... Hunk #1 succeeded at 187 (offset 4 lines). Hunk #2 succeeded at 320 (offset 4 lines). Hunk #3 succeeded at 3653 (offset 27 lines). Hunk #4 succeeded at 4094 (offset 27 lines). Hunk #5 succeeded at 8210 (offset 28 lines). error: while searching for: TOKEN_STRING_INITIALIZER(struct cmd_showcfg_result, cfg, "config"); cmdline_parse_token_string_t cmd_showcfg_what = TOKEN_STRING_INITIALIZER(struct cmd_showcfg_result, what, "rxtx#cores#fwd#rxoffs#rxpkts#txpkts#txtimes"); cmdline_parse_inst_t cmd_showcfg = { .f = cmd_showcfg_parsed, .data = NULL, .help_str = "show config rxtx|cores|fwd|rxoffs|rxpkts|txpkts|txtimes", .tokens = { (void *)&cmd_showcfg_show, (void *)&cmd_showcfg_port, error: patch failed: app/test-pmd/cmdline.c:8070 Hunk #7 succeeded at 18049 (offset 90 lines). Checking patch app/test-pmd/config.c... Hunk #1 succeeded at 4849 (offset 92 lines). Checking patch app/test-pmd/parameters.c... Hunk #3 succeeded at 1330 (offset 1 line). Hunk #4 succeeded at 1339 (offset 1 line). Checking patch app/test-pmd/testpmd.c... Hunk #1 succeeded at 243 (offset 3 lines). Hunk #2 succeeded at 2677 (offset 89 lines). Checking patch app/test-pmd/testpmd.h... Hunk #1 succeeded at 558 (offset 24 lines). error: while searching for: unsigned int parse_item_list(const char *str, const char *item_name, unsigned int max_items, unsigned int *parsed_items, int check_unique_values); void launch_args_parse(int argc, char** argv); void cmdline_read_from_file(const char *filename); void prompt(void); error: patch failed: app/test-pmd/testpmd.h:864 Hunk #3 succeeded at 1046 (offset 24 lines). Applying patch app/test-pmd/cmdline.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Rejected hunk #6. Hunk #7 applied cleanly. Applied patch app/test-pmd/config.c cleanly. Applied patch app/test-pmd/parameters.c cleanly. Applied patch app/test-pmd/testpmd.c cleanly. Applying patch app/test-pmd/testpmd.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. diff a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c (rejected hunks) @@ -8070,12 +8196,12 @@ cmdline_parse_token_string_t cmd_showcfg_port = TOKEN_STRING_INITIALIZER(struct cmd_showcfg_result, cfg, "config"); cmdline_parse_token_string_t cmd_showcfg_what = TOKEN_STRING_INITIALIZER(struct cmd_showcfg_result, what, - "rxtx#cores#fwd#rxoffs#rxpkts#txpkts#txtimes"); + "rxtx#cores#fwd#rxoffs#rxpkts#rxhdrs#txpkts#txtimes"); cmdline_parse_inst_t cmd_showcfg = { .f = cmd_showcfg_parsed, .data = NULL, - .help_str = "show config rxtx|cores|fwd|rxoffs|rxpkts|txpkts|txtimes", + .help_str = "show config rxtx|cores|fwd|rxoffs|rxpkts|rxhdrs|txpkts|txtimes", .tokens = { (void *)&cmd_showcfg_show, (void *)&cmd_showcfg_port, diff a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h (rejected hunks) @@ -864,6 +865,9 @@ inc_tx_burst_stats(struct fwd_stream *fs, uint16_t nb_tx) unsigned int parse_item_list(const char *str, const char *item_name, unsigned int max_items, unsigned int *parsed_items, int check_unique_values); +unsigned int parse_hdrs_list(const char *str, const char *item_name, + unsigned int max_item, + unsigned int *parsed_items, int check_unique_values); void launch_args_parse(int argc, char** argv); void cmdline_read_from_file(const char *filename); void prompt(void); Checking patch drivers/net/ice/ice_ethdev.c... error: while searching for: .timesync_read_time = ice_timesync_read_time, .timesync_write_time = ice_timesync_write_time, .timesync_disable = ice_timesync_disable, }; /* store statistics names and its offset in stats structure */ error: patch failed: drivers/net/ice/ice_ethdev.c:267 Hunk #3 succeeded at 3750 (offset 34 lines). Hunk #4 succeeded at 3763 (offset 34 lines). Hunk #5 succeeded at 3832 (offset 34 lines). Hunk #6 succeeded at 5893 (offset 44 lines). Checking patch drivers/net/ice/ice_rxtx.c... Hunk #11 succeeded at 1656 (offset 2 lines). Hunk #12 succeeded at 1711 (offset 2 lines). Hunk #13 succeeded at 1820 (offset 2 lines). Hunk #14 succeeded at 1835 (offset 2 lines). Hunk #15 succeeded at 1852 (offset 2 lines). Hunk #16 succeeded at 2475 (offset 2 lines). Hunk #17 succeeded at 2509 (offset 2 lines). Hunk #18 succeeded at 2531 (offset 2 lines). Checking patch drivers/net/ice/ice_rxtx.h... Checking patch drivers/net/ice/ice_rxtx_vec_common.h... Applying patch drivers/net/ice/ice_ethdev.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Applied patch drivers/net/ice/ice_rxtx.c cleanly. Applied patch drivers/net/ice/ice_rxtx.h cleanly. Applied patch drivers/net/ice/ice_rxtx_vec_common.h cleanly. diff a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c (rejected hunks) @@ -267,6 +269,7 @@ static const struct eth_dev_ops ice_eth_dev_ops = { .timesync_read_time = ice_timesync_read_time, .timesync_write_time = ice_timesync_write_time, .timesync_disable = ice_timesync_disable, + .hdrs_supported_ptypes_get = ice_get_supported_split_hdrs, }; /* store statistics names and its offset in stats structure */ https://lab.dpdk.org/results/dashboard/patchsets/22579/ UNH-IOL DPDK Community Lab