Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/102511 _apply patch failure_ Submitter: Xueming Li Date: Thursday, October 21 2021 05:08:32 Applied on: CommitID:3ac2dffae88e8eb5c374b1fdd40d605014526510 Apply patch set 102511-102517 failed: Checking patch doc/guides/nics/features.rst... Hunk #1 succeeded at 615 (offset 1 line). Checking patch doc/guides/nics/features/default.ini... Checking patch doc/guides/prog_guide/switch_representation.rst... Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: operations. * Added multi-process support. * **Added support to get all MAC addresses of a device.** Added ``rte_eth_macaddrs_get`` to allow user to retrieve all Ethernet error: patch failed: doc/guides/rel_notes/release_21_11.rst:75 Checking patch lib/ethdev/rte_ethdev.c... Hunk #1 succeeded at 2159 (offset -16 lines). Checking patch lib/ethdev/rte_ethdev.h... Hunk #1 succeeded at 1044 (offset -1 lines). Applied patch doc/guides/nics/features.rst cleanly. Applied patch doc/guides/nics/features/default.ini cleanly. Applied patch doc/guides/prog_guide/switch_representation.rst cleanly. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applied patch lib/ethdev/rte_ethdev.c cleanly. Applied patch lib/ethdev/rte_ethdev.h cleanly. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -75,6 +75,12 @@ New Features operations. * Added multi-process support. +* **Added ethdev shared Rx queue support.** + + * Added new device capability flag and Rx domain field to switch info. + * Added share group and share queue ID to Rx queue configuration. + * Added testpmd support and dedicate forwarding engine. + * **Added support to get all MAC addresses of a device.** Added ``rte_eth_macaddrs_get`` to allow user to retrieve all Ethernet 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 lib/ethdev/version.map... error: while searching for: rte_mtr_meter_policy_validate; # added in 21.11 rte_eth_dev_conf_get; rte_eth_macaddrs_get; rte_eth_rx_metadata_negotiate; error: patch failed: lib/ethdev/version.map:249 Applying patch lib/ethdev/version.map with 1 reject... Rejected hunk #1. diff a/lib/ethdev/version.map b/lib/ethdev/version.map (rejected hunks) @@ -249,6 +249,7 @@ EXPERIMENTAL { rte_mtr_meter_policy_validate; # added in 21.11 + rte_eth_dev_capability_name; rte_eth_dev_conf_get; rte_eth_macaddrs_get; rte_eth_rx_metadata_negotiate; Checking patch app/test-pmd/config.c... Hunk #1 succeeded at 2738 (offset -152 lines). Checking patch app/test-pmd/parameters.c... Hunk #1 succeeded at 167 (offset -4 lines). Hunk #2 succeeded at 608 (offset -71 lines). Hunk #3 succeeded at 1273 (offset -81 lines). Checking patch app/test-pmd/testpmd.c... Hunk #1 succeeded at 498 (offset -4 lines). Hunk #2 succeeded at 3398 (offset -236 lines). error: while searching for: } } rxtx_port_config(port); ret = eth_macaddr_get_print_err(pid, &port->eth_addr); if (ret != 0) error: patch failed: app/test-pmd/testpmd.c:3765 Hunk #4 succeeded at 3786 (offset -205 lines). Checking patch app/test-pmd/testpmd.h... Hunk #1 succeeded at 477 (offset -47 lines). Checking patch doc/guides/testpmd_app_ug/run_app.rst... Hunk #1 succeeded at 389 (offset -6 lines). Applied patch app/test-pmd/config.c cleanly. Applied patch app/test-pmd/parameters.c cleanly. Applying patch app/test-pmd/testpmd.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Hunk #4 applied cleanly. Applied patch app/test-pmd/testpmd.h cleanly. Applied patch doc/guides/testpmd_app_ug/run_app.rst cleanly. diff a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c (rejected hunks) @@ -3765,7 +3779,7 @@ init_port_config(void) } } - rxtx_port_config(port); + rxtx_port_config(pid); ret = eth_macaddr_get_print_err(pid, &port->eth_addr); if (ret != 0) Checking patch app/test-pmd/util.c... error: while searching for: struct rte_port *port = &ports[port_id]; mb = pkts[i]; eth_hdr = rte_pktmbuf_read(mb, 0, sizeof(_eth_hdr), &_eth_hdr); eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); packet_type = mb->packet_type; error: patch failed: app/test-pmd/util.c:101 Applying patch app/test-pmd/util.c with 1 reject... Rejected hunk #1. diff a/app/test-pmd/util.c b/app/test-pmd/util.c (rejected hunks) @@ -101,6 +101,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], struct rte_port *port = &ports[port_id]; mb = pkts[i]; + if (rxq_share > 0) + MKDUMPSTR(print_buf, buf_size, cur_len, "port %u, ", + mb->port); eth_hdr = rte_pktmbuf_read(mb, 0, sizeof(_eth_hdr), &_eth_hdr); eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); packet_type = mb->packet_type; Checking patch app/test-pmd/config.c... error: app/test-pmd/config.c: does not match index Checking patch app/test-pmd/testpmd.c... error: app/test-pmd/testpmd.c: does not match index Checking patch app/test-pmd/testpmd.h... error: app/test-pmd/testpmd.h: does not match index Checking patch app/test-pmd/meson.build... Hunk #1 succeeded at 21 (offset -1 lines). Checking patch app/test-pmd/shared_rxq_fwd.c... Checking patch app/test-pmd/testpmd.c... error: app/test-pmd/testpmd.c: does not match index Checking patch app/test-pmd/testpmd.h... error: app/test-pmd/testpmd.h: does not match index Checking patch doc/guides/testpmd_app_ug/run_app.rst... error: doc/guides/testpmd_app_ug/run_app.rst: does not match index Checking patch doc/guides/testpmd_app_ug/testpmd_funcs.rst... Applied patch app/test-pmd/meson.build cleanly. Applied patch app/test-pmd/shared_rxq_fwd.c cleanly. Applied patch doc/guides/testpmd_app_ug/testpmd_funcs.rst cleanly. https://lab.dpdk.org/results/dashboard/patchsets/19604/ UNH-IOL DPDK Community Lab