Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/107384 _apply patch failure_ Submitter: Ferruh Yigit Date: Friday, February 11 2022 19:11:43 Applied on: CommitID:1d1126ad436e8c7c015fb3f67ad3af05c3b397d5 Apply patch set 107384-107385 failed: Checking patch drivers/net/af_xdp/rte_eth_af_xdp.c... error: while searching for: return 0; } /* Secondary process rx function. RX is disabled because memory mapping of the * rings being assigned by the kernel in the primary process only. */ static uint16_t eth_af_xdp_rx_noop(void *queue __rte_unused, struct rte_mbuf **bufs __rte_unused, uint16_t nb_pkts __rte_unused) { return 0; } /* Secondary process tx function. TX is disabled because memory mapping of the * rings being assigned by the kernel in the primary process only. */ static uint16_t eth_af_xdp_tx_noop(void *queue __rte_unused, struct rte_mbuf **bufs __rte_unused, uint16_t nb_pkts __rte_unused) { return 0; } static int rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) { error: patch failed: drivers/net/af_xdp/rte_eth_af_xdp.c:1916 error: while searching for: } eth_dev->dev_ops = &ops; eth_dev->device = &dev->device; eth_dev->rx_pkt_burst = eth_af_xdp_rx_noop; eth_dev->tx_pkt_burst = eth_af_xdp_tx_noop; eth_dev->process_private = (struct pmd_process_private *) rte_zmalloc_socket(name, sizeof(struct pmd_process_private), error: patch failed: drivers/net/af_xdp/rte_eth_af_xdp.c:1961 Checking patch drivers/net/ark/ark_ethdev.c... Checking patch drivers/net/ark/ark_ethdev_rx.c... Checking patch drivers/net/ark/ark_ethdev_rx.h... Checking patch drivers/net/ark/ark_ethdev_tx.c... Checking patch drivers/net/ark/ark_ethdev_tx.h... Checking patch drivers/net/bnx2x/bnx2x_rxtx.c... Checking patch drivers/net/bnxt/bnxt.h... Checking patch drivers/net/bnxt/bnxt_cpr.c... Checking patch drivers/net/bnxt/bnxt_rxr.c... Checking patch drivers/net/bnxt/bnxt_txr.c... Checking patch drivers/net/cnxk/cnxk_ethdev.c... Checking patch drivers/net/dpaa2/dpaa2_ethdev.c... Checking patch drivers/net/dpaa2/dpaa2_ethdev.h... Checking patch drivers/net/dpaa2/dpaa2_rxtx.c... Checking patch drivers/net/enic/enic.h... Checking patch drivers/net/enic/enic_ethdev.c... Checking patch drivers/net/enic/enic_main.c... Checking patch drivers/net/enic/enic_rxtx.c... Checking patch drivers/net/hns3/hns3_rxtx.c... Checking patch drivers/net/hns3/hns3_rxtx.h... Checking patch drivers/net/mlx4/mlx4.c... Checking patch drivers/net/mlx4/mlx4_mp.c... Checking patch drivers/net/mlx4/mlx4_rxtx.c... Checking patch drivers/net/mlx4/mlx4_rxtx.h... Checking patch drivers/net/mlx5/linux/mlx5_mp_os.c... Checking patch drivers/net/mlx5/linux/mlx5_os.c... Checking patch drivers/net/mlx5/mlx5.c... Checking patch drivers/net/mlx5/mlx5_rx.c... Checking patch drivers/net/mlx5/mlx5_rx.h... Checking patch drivers/net/mlx5/mlx5_trigger.c... Checking patch drivers/net/mlx5/mlx5_tx.c... Checking patch drivers/net/mlx5/mlx5_tx.h... Checking patch drivers/net/mlx5/windows/mlx5_os.c... Checking patch drivers/net/pfe/pfe_ethdev.c... Checking patch drivers/net/qede/qede_ethdev.c... Checking patch drivers/net/qede/qede_rxtx.c... Checking patch drivers/net/qede/qede_rxtx.h... Checking patch lib/ethdev/ethdev_driver.c... Checking patch lib/ethdev/ethdev_driver.h... Hunk #1 succeeded at 1432 (offset -77 lines). Checking patch lib/ethdev/meson.build... Checking patch lib/ethdev/version.map... error: while searching for: rte_eth_hairpin_queue_peer_unbind; rte_eth_hairpin_queue_peer_update; rte_eth_ip_reassembly_dynfield_register; rte_eth_representor_id_get; rte_eth_switch_domain_alloc; rte_eth_switch_domain_free; error: patch failed: lib/ethdev/version.map:289 Applying patch drivers/net/af_xdp/rte_eth_af_xdp.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applied patch drivers/net/ark/ark_ethdev.c cleanly. Applied patch drivers/net/ark/ark_ethdev_rx.c cleanly. Applied patch drivers/net/ark/ark_ethdev_rx.h cleanly. Applied patch drivers/net/ark/ark_ethdev_tx.c cleanly. Applied patch drivers/net/ark/ark_ethdev_tx.h cleanly. Applied patch drivers/net/bnx2x/bnx2x_rxtx.c cleanly. Applied patch drivers/net/bnxt/bnxt.h cleanly. Applied patch drivers/net/bnxt/bnxt_cpr.c cleanly. Applied patch drivers/net/bnxt/bnxt_rxr.c cleanly. Applied patch drivers/net/bnxt/bnxt_txr.c cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev.c cleanly. Applied patch drivers/net/dpaa2/dpaa2_ethdev.c cleanly. Applied patch drivers/net/dpaa2/dpaa2_ethdev.h cleanly. Applied patch drivers/net/dpaa2/dpaa2_rxtx.c cleanly. Applied patch drivers/net/enic/enic.h cleanly. Applied patch drivers/net/enic/enic_ethdev.c cleanly. Applied patch drivers/net/enic/enic_main.c cleanly. Applied patch drivers/net/enic/enic_rxtx.c cleanly. Applied patch drivers/net/hns3/hns3_rxtx.c cleanly. Applied patch drivers/net/hns3/hns3_rxtx.h cleanly. Applied patch drivers/net/mlx4/mlx4.c cleanly. Applied patch drivers/net/mlx4/mlx4_mp.c cleanly. Applied patch drivers/net/mlx4/mlx4_rxtx.c cleanly. Applied patch drivers/net/mlx4/mlx4_rxtx.h cleanly. Applied patch drivers/net/mlx5/linux/mlx5_mp_os.c cleanly. Applied patch drivers/net/mlx5/linux/mlx5_os.c cleanly. Applied patch drivers/net/mlx5/mlx5.c cleanly. Applied patch drivers/net/mlx5/mlx5_rx.c cleanly. Applied patch drivers/net/mlx5/mlx5_rx.h cleanly. Applied patch drivers/net/mlx5/mlx5_trigger.c cleanly. Applied patch drivers/net/mlx5/mlx5_tx.c cleanly. Applied patch drivers/net/mlx5/mlx5_tx.h cleanly. Applied patch drivers/net/mlx5/windows/mlx5_os.c cleanly. Applied patch drivers/net/pfe/pfe_ethdev.c cleanly. Applied patch drivers/net/qede/qede_ethdev.c cleanly. Applied patch drivers/net/qede/qede_rxtx.c cleanly. Applied patch drivers/net/qede/qede_rxtx.h cleanly. Applied patch lib/ethdev/ethdev_driver.c cleanly. Applied patch lib/ethdev/ethdev_driver.h cleanly. Applied patch lib/ethdev/meson.build cleanly. Applying patch lib/ethdev/version.map with 1 reject... Rejected hunk #1. diff a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c (rejected hunks) @@ -1916,28 +1916,6 @@ afxdp_mp_send_fds(const struct rte_mp_msg *request, const void *peer) return 0; } -/* Secondary process rx function. RX is disabled because memory mapping of the - * rings being assigned by the kernel in the primary process only. - */ -static uint16_t -eth_af_xdp_rx_noop(void *queue __rte_unused, - struct rte_mbuf **bufs __rte_unused, - uint16_t nb_pkts __rte_unused) -{ - return 0; -} - -/* Secondary process tx function. TX is disabled because memory mapping of the - * rings being assigned by the kernel in the primary process only. - */ -static uint16_t -eth_af_xdp_tx_noop(void *queue __rte_unused, - struct rte_mbuf **bufs __rte_unused, - uint16_t nb_pkts __rte_unused) -{ - return 0; -} - static int rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) { @@ -1961,8 +1939,8 @@ rte_pmd_af_xdp_probe(struct rte_vdev_device *dev) } eth_dev->dev_ops = &ops; eth_dev->device = &dev->device; - eth_dev->rx_pkt_burst = eth_af_xdp_rx_noop; - eth_dev->tx_pkt_burst = eth_af_xdp_tx_noop; + eth_dev->rx_pkt_burst = rte_eth_pkt_burst_dummy; + eth_dev->tx_pkt_burst = rte_eth_pkt_burst_dummy; eth_dev->process_private = (struct pmd_process_private *) rte_zmalloc_socket(name, sizeof(struct pmd_process_private), diff a/lib/ethdev/version.map b/lib/ethdev/version.map (rejected hunks) @@ -289,6 +289,7 @@ INTERNAL { rte_eth_hairpin_queue_peer_unbind; rte_eth_hairpin_queue_peer_update; rte_eth_ip_reassembly_dynfield_register; + rte_eth_pkt_burst_dummy; rte_eth_representor_id_get; rte_eth_switch_domain_alloc; rte_eth_switch_domain_free; Checking patch lib/ethdev/ethdev_driver.c... error: lib/ethdev/ethdev_driver.c: does not exist in index Checking patch lib/ethdev/ethdev_private.c... .git/rebase-apply/patch:931: new blank line at EOF. + Checking patch lib/ethdev/ethdev_private.h... Checking patch lib/ethdev/rte_ethdev.c... Hunk #13 succeeded at 5717 (offset 2 lines). error: while searching for: (*dev->dev_ops->ip_reassembly_conf_set)(dev, conf)); } int rte_eth_ip_reassembly_dynfield_register(int *field_offset, int *flag_offset) { static const struct rte_mbuf_dynfield field_desc = { .name = RTE_MBUF_DYNFIELD_IP_REASSEMBLY_NAME, .size = sizeof(rte_eth_ip_reassembly_dynfield_t), .align = __alignof__(rte_eth_ip_reassembly_dynfield_t), }; static const struct rte_mbuf_dynflag ip_reassembly_dynflag = { .name = RTE_MBUF_DYNFLAG_IP_REASSEMBLY_INCOMPLETE_NAME, }; int offset; offset = rte_mbuf_dynfield_register(&field_desc); if (offset < 0) return -1; if (field_offset != NULL) *field_offset = offset; offset = rte_mbuf_dynflag_register(&ip_reassembly_dynflag); if (offset < 0) return -1; if (flag_offset != NULL) *flag_offset = offset; return 0; } int rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) { error: patch failed: lib/ethdev/rte_ethdev.c:6722 Applied patch lib/ethdev/ethdev_private.c cleanly. Applied patch lib/ethdev/ethdev_private.h cleanly. Applying patch lib/ethdev/rte_ethdev.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. Rejected hunk #14. diff a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c (rejected hunks) @@ -6722,34 +5849,6 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id, (*dev->dev_ops->ip_reassembly_conf_set)(dev, conf)); } -int -rte_eth_ip_reassembly_dynfield_register(int *field_offset, int *flag_offset) -{ - static const struct rte_mbuf_dynfield field_desc = { - .name = RTE_MBUF_DYNFIELD_IP_REASSEMBLY_NAME, - .size = sizeof(rte_eth_ip_reassembly_dynfield_t), - .align = __alignof__(rte_eth_ip_reassembly_dynfield_t), - }; - static const struct rte_mbuf_dynflag ip_reassembly_dynflag = { - .name = RTE_MBUF_DYNFLAG_IP_REASSEMBLY_INCOMPLETE_NAME, - }; - int offset; - - offset = rte_mbuf_dynfield_register(&field_desc); - if (offset < 0) - return -1; - if (field_offset != NULL) - *field_offset = offset; - - offset = rte_mbuf_dynflag_register(&ip_reassembly_dynflag); - if (offset < 0) - return -1; - if (flag_offset != NULL) - *flag_offset = offset; - - return 0; -} - int rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) { https://lab.dpdk.org/results/dashboard/patchsets/21042/ UNH-IOL DPDK Community Lab