Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/106058 _apply patch failure_ Submitter: Pavan Nikhilesh Bhagavatula Date: Wednesday, January 19 2022 07:13:23 Applied on: CommitID:cadb255e25d690d719d6f159e0a63f8be60650a5 Apply patch set 106058-106061 failed: Checking patch drivers/common/cnxk/roc_io.h... Checking patch drivers/common/cnxk/roc_io_generic.h... Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... Checking patch drivers/crypto/cnxk/cn9k_ipsec.c... Checking patch drivers/event/cnxk/cn10k_eventdev.c... Hunk #1 succeeded at 63 (offset 13 lines). Hunk #2 succeeded at 271 (offset 13 lines). Hunk #3 succeeded at 713 (offset -11 lines). Checking patch drivers/event/cnxk/cn10k_worker.h... error: while searching for: } static __rte_always_inline struct cn10k_eth_txq * cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT]) { return (struct cn10k_eth_txq *) txq_data[m->port][rte_event_eth_tx_adapter_txq_get(m)]; } static __rte_always_inline void cn10k_sso_tx_one(struct rte_mbuf *m, uint64_t *cmd, uint16_t lmt_id, uintptr_t lmt_addr, uint8_t sched_type, uintptr_t base, const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT], const uint32_t flags) { uint8_t lnum = 0, loff = 0, shft = 0; struct cn10k_eth_txq *txq; error: patch failed: drivers/event/cnxk/cn10k_worker.h:457 Hunk #2 succeeded at 409 (offset -69 lines). Hunk #3 succeeded at 434 (offset -69 lines). Hunk #4 succeeded at 473 (offset -69 lines). Hunk #5 succeeded at 490 (offset -69 lines). Hunk #6 succeeded at 514 (offset -69 lines). Hunk #7 succeeded at 534 (offset -69 lines). error: while searching for: \ RTE_SET_USED(nb_events); \ return cn10k_sso_hws_event_tx( \ ws, &ev[0], cmd, \ (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ ws->tx_adptr_data, \ flags); \ } error: patch failed: drivers/event/cnxk/cn10k_worker.h:631 error: while searching for: \ RTE_SET_USED(nb_events); \ return cn10k_sso_hws_event_tx( \ ws, &ev[0], cmd, \ (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ ws->tx_adptr_data, \ (flags) | NIX_TX_MULTI_SEG_F); \ } error: patch failed: drivers/event/cnxk/cn10k_worker.h:646 Checking patch drivers/event/cnxk/cn9k_eventdev.c... Hunk #1 succeeded at 271 (offset 12 lines). Hunk #2 succeeded at 289 (offset 12 lines). Hunk #3 succeeded at 962 (offset -38 lines). Checking patch drivers/event/cnxk/cn9k_worker.h... Hunk #1 succeeded at 464 (offset -139 lines). Hunk #2 succeeded at 527 (offset -139 lines). Hunk #3 succeeded at 614 (offset -139 lines). Hunk #4 succeeded at 631 (offset -139 lines). Hunk #5 succeeded at 654 (offset -139 lines). Hunk #6 succeeded at 668 (offset -139 lines). error: while searching for: uint64_t cmd[sz]; \ \ RTE_SET_USED(nb_events); \ return cn9k_sso_hws_event_tx( \ ws->base, &ev[0], cmd, \ (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ ws->tx_adptr_data, \ flags); \ } #define SSO_TX_SEG(fn, sz, flags) \ error: patch failed: drivers/event/cnxk/cn9k_worker.h:858 error: while searching for: struct cn9k_sso_hws *ws = port; \ \ RTE_SET_USED(nb_events); \ return cn9k_sso_hws_event_tx( \ ws->base, &ev[0], cmd, \ (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ ws->tx_adptr_data, \ (flags) | NIX_TX_MULTI_SEG_F); \ } #define SSO_DUAL_TX(fn, sz, flags) \ error: patch failed: drivers/event/cnxk/cn9k_worker.h:873 error: while searching for: uint64_t cmd[sz]; \ \ RTE_SET_USED(nb_events); \ return cn9k_sso_hws_event_tx( \ ws->base[!ws->vws], &ev[0], cmd, \ (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ ws->tx_adptr_data, \ flags); \ } #define SSO_DUAL_TX_SEG(fn, sz, flags) \ error: patch failed: drivers/event/cnxk/cn9k_worker.h:888 error: while searching for: struct cn9k_sso_hws_dual *ws = port; \ \ RTE_SET_USED(nb_events); \ return cn9k_sso_hws_event_tx( \ ws->base[!ws->vws], &ev[0], cmd, \ (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ ws->tx_adptr_data, \ (flags) | NIX_TX_MULTI_SEG_F); \ } #endif error: patch failed: drivers/event/cnxk/cn9k_worker.h:903 Checking patch drivers/event/cnxk/cnxk_eventdev.h... Checking patch drivers/event/cnxk/cnxk_eventdev_adptr.c... Checking patch drivers/net/cnxk/cn10k_ethdev.c... Checking patch drivers/net/cnxk/cn10k_ethdev.h... Checking patch drivers/net/cnxk/cn10k_tx.h... Hunk #1 succeeded at 185 (offset -1 lines). Hunk #2 succeeded at 720 (offset -1 lines). Hunk #3 succeeded at 831 (offset -1 lines). Hunk #4 succeeded at 853 (offset -1 lines). Hunk #5 succeeded at 898 (offset -1 lines). Hunk #6 succeeded at 956 (offset -1 lines). Hunk #7 succeeded at 976 (offset -1 lines). Hunk #8 succeeded at 1028 (offset -1 lines). Hunk #9 succeeded at 1041 (offset -1 lines). Hunk #10 succeeded at 1462 (offset -1 lines). Hunk #11 succeeded at 1514 (offset -1 lines). Hunk #12 succeeded at 2582 (offset -1 lines). Hunk #13 succeeded at 2645 (offset -1 lines). Hunk #14 succeeded at 2657 (offset -1 lines). error: while searching for: if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ return cn10k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd, 0, \ flags); \ } error: patch failed: drivers/net/cnxk/cn10k_tx.h:2896 error: while searching for: if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ return cn10k_nix_xmit_pkts_mseg(tx_queue, tx_pkts, pkts, cmd, \ 0, \ flags | NIX_TX_MULTI_SEG_F); \ } error: patch failed: drivers/net/cnxk/cn10k_tx.h:2910 error: while searching for: if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ return cn10k_nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, \ cmd, 0, (flags)); \ } #define NIX_TX_XMIT_VEC_MSEG(fn, sz, flags) \ error: patch failed: drivers/net/cnxk/cn10k_tx.h:2925 error: while searching for: !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ return cn10k_nix_xmit_pkts_vector( \ tx_queue, tx_pkts, pkts, cmd, 0, \ (flags) | NIX_TX_MULTI_SEG_F); \ } error: patch failed: drivers/net/cnxk/cn10k_tx.h:2940 Checking patch drivers/net/cnxk/cn9k_ethdev.c... Checking patch drivers/net/cnxk/cn9k_ethdev.h... Checking patch drivers/net/cnxk/cn9k_tx.h... Hunk #1 succeeded at 57 (offset -1 lines). Hunk #2 succeeded at 158 (offset -1 lines). Hunk #3 succeeded at 309 (offset -1 lines). Hunk #4 succeeded at 387 (offset -1 lines). Hunk #5 succeeded at 394 (offset -1 lines). Hunk #6 succeeded at 451 (offset -1 lines). Hunk #7 succeeded at 507 (offset -1 lines). Hunk #8 succeeded at 525 (offset -1 lines). Hunk #9 succeeded at 549 (offset -1 lines). Hunk #10 succeeded at 568 (offset -1 lines). Hunk #11 succeeded at 896 (offset -1 lines). Applied patch drivers/common/cnxk/roc_io.h cleanly. Applied patch drivers/common/cnxk/roc_io_generic.h cleanly. Applied patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c cleanly. Applied patch drivers/crypto/cnxk/cn9k_ipsec.c cleanly. Applied patch drivers/event/cnxk/cn10k_eventdev.c cleanly. Applying patch drivers/event/cnxk/cn10k_worker.h with 3 rejects... Rejected hunk #1. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Rejected hunk #8. Rejected hunk #9. Applied patch drivers/event/cnxk/cn9k_eventdev.c cleanly. Applying patch drivers/event/cnxk/cn9k_worker.h with 4 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Rejected hunk #7. Rejected hunk #8. Rejected hunk #9. Rejected hunk #10. Applied patch drivers/event/cnxk/cnxk_eventdev.h cleanly. Applied patch drivers/event/cnxk/cnxk_eventdev_adptr.c cleanly. Applied patch drivers/net/cnxk/cn10k_ethdev.c cleanly. Applied patch drivers/net/cnxk/cn10k_ethdev.h cleanly. Applying patch drivers/net/cnxk/cn10k_tx.h with 4 rejects... 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. Rejected hunk #16. Rejected hunk #17. Rejected hunk #18. Applied patch drivers/net/cnxk/cn9k_ethdev.c cleanly. Applied patch drivers/net/cnxk/cn9k_ethdev.h cleanly. Applied patch drivers/net/cnxk/cn9k_tx.h cleanly. diff a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h (rejected hunks) @@ -457,18 +457,18 @@ NIX_RX_FASTPATH_MODES } static __rte_always_inline struct cn10k_eth_txq * -cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, - const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT]) +cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, const uint64_t *txq_data) { - return (struct cn10k_eth_txq *) - txq_data[m->port][rte_event_eth_tx_adapter_txq_get(m)]; + return (struct cn10k_eth_txq + *)(txq_data[(txq_data[m->port] >> 48) + + rte_event_eth_tx_adapter_txq_get(m)] & + (BIT_ULL(48) - 1)); } static __rte_always_inline void -cn10k_sso_tx_one(struct rte_mbuf *m, uint64_t *cmd, uint16_t lmt_id, - uintptr_t lmt_addr, uint8_t sched_type, uintptr_t base, - const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT], - const uint32_t flags) +cn10k_sso_tx_one(struct cn10k_sso_hws *ws, struct rte_mbuf *m, uint64_t *cmd, + uint16_t lmt_id, uintptr_t lmt_addr, uint8_t sched_type, + const uint64_t *txq_data, const uint32_t flags) { uint8_t lnum = 0, loff = 0, shft = 0; struct cn10k_eth_txq *txq; @@ -631,9 +634,7 @@ NIX_TX_FASTPATH_MODES \ RTE_SET_USED(nb_events); \ return cn10k_sso_hws_event_tx( \ - ws, &ev[0], cmd, \ - (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ - ws->tx_adptr_data, \ + ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data, \ flags); \ } @@ -646,9 +647,7 @@ NIX_TX_FASTPATH_MODES \ RTE_SET_USED(nb_events); \ return cn10k_sso_hws_event_tx( \ - ws, &ev[0], cmd, \ - (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ - ws->tx_adptr_data, \ + ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data, \ (flags) | NIX_TX_MULTI_SEG_F); \ } diff a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h (rejected hunks) @@ -858,11 +854,9 @@ NIX_TX_FASTPATH_MODES uint64_t cmd[sz]; \ \ RTE_SET_USED(nb_events); \ - return cn9k_sso_hws_event_tx( \ - ws->base, &ev[0], cmd, \ - (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ - ws->tx_adptr_data, \ - flags); \ + return cn9k_sso_hws_event_tx(ws->base, &ev[0], cmd, \ + (uint64_t *)ws->tx_adptr_data, \ + flags); \ } #define SSO_TX_SEG(fn, sz, flags) \ @@ -873,11 +867,9 @@ NIX_TX_FASTPATH_MODES struct cn9k_sso_hws *ws = port; \ \ RTE_SET_USED(nb_events); \ - return cn9k_sso_hws_event_tx( \ - ws->base, &ev[0], cmd, \ - (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ - ws->tx_adptr_data, \ - (flags) | NIX_TX_MULTI_SEG_F); \ + return cn9k_sso_hws_event_tx(ws->base, &ev[0], cmd, \ + (uint64_t *)ws->tx_adptr_data, \ + (flags) | NIX_TX_MULTI_SEG_F); \ } #define SSO_DUAL_TX(fn, sz, flags) \ @@ -888,11 +880,9 @@ NIX_TX_FASTPATH_MODES uint64_t cmd[sz]; \ \ RTE_SET_USED(nb_events); \ - return cn9k_sso_hws_event_tx( \ - ws->base[!ws->vws], &ev[0], cmd, \ - (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ - ws->tx_adptr_data, \ - flags); \ + return cn9k_sso_hws_event_tx(ws->base[!ws->vws], &ev[0], cmd, \ + (uint64_t *)ws->tx_adptr_data, \ + flags); \ } #define SSO_DUAL_TX_SEG(fn, sz, flags) \ @@ -903,11 +893,9 @@ NIX_TX_FASTPATH_MODES struct cn9k_sso_hws_dual *ws = port; \ \ RTE_SET_USED(nb_events); \ - return cn9k_sso_hws_event_tx( \ - ws->base[!ws->vws], &ev[0], cmd, \ - (const uint64_t(*)[RTE_MAX_QUEUES_PER_PORT]) & \ - ws->tx_adptr_data, \ - (flags) | NIX_TX_MULTI_SEG_F); \ + return cn9k_sso_hws_event_tx(ws->base[!ws->vws], &ev[0], cmd, \ + (uint64_t *)ws->tx_adptr_data, \ + (flags) | NIX_TX_MULTI_SEG_F); \ } #endif diff a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h (rejected hunks) @@ -2896,7 +2901,7 @@ NIX_TX_FASTPATH_MODES if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ - return cn10k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd, 0, \ + return cn10k_nix_xmit_pkts(tx_queue, NULL, tx_pkts, pkts, cmd, \ flags); \ } @@ -2910,8 +2915,8 @@ NIX_TX_FASTPATH_MODES if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ - return cn10k_nix_xmit_pkts_mseg(tx_queue, tx_pkts, pkts, cmd, \ - 0, \ + return cn10k_nix_xmit_pkts_mseg(tx_queue, NULL, tx_pkts, pkts, \ + cmd, \ flags | NIX_TX_MULTI_SEG_F); \ } @@ -2925,8 +2930,8 @@ NIX_TX_FASTPATH_MODES if (((flags) & NIX_TX_OFFLOAD_TSO_F) && \ !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ - return cn10k_nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, \ - cmd, 0, (flags)); \ + return cn10k_nix_xmit_pkts_vector(tx_queue, NULL, tx_pkts, \ + pkts, cmd, (flags)); \ } #define NIX_TX_XMIT_VEC_MSEG(fn, sz, flags) \ @@ -2940,7 +2945,7 @@ NIX_TX_FASTPATH_MODES !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) \ return 0; \ return cn10k_nix_xmit_pkts_vector( \ - tx_queue, tx_pkts, pkts, cmd, 0, \ + tx_queue, NULL, tx_pkts, pkts, cmd, \ (flags) | NIX_TX_MULTI_SEG_F); \ } Checking patch drivers/common/cnxk/roc_sso.h... Checking patch drivers/event/cnxk/cn10k_worker.h... error: drivers/event/cnxk/cn10k_worker.h: does not match index Checking patch drivers/event/cnxk/cn9k_worker.h... error: drivers/event/cnxk/cn9k_worker.h: does not match index Checking patch drivers/event/cnxk/cnxk_eventdev.h... error: drivers/event/cnxk/cnxk_eventdev.h: does not match index Checking patch drivers/event/cnxk/cnxk_worker.h... Checking patch drivers/net/cnxk/cn10k_tx.h... error: drivers/net/cnxk/cn10k_tx.h: does not match index Applied patch drivers/common/cnxk/roc_sso.h cleanly. Applied patch drivers/event/cnxk/cnxk_worker.h cleanly. Checking patch drivers/event/cnxk/cn10k_eventdev.c... error: drivers/event/cnxk/cn10k_eventdev.c: does not match index Checking patch drivers/event/cnxk/cn9k_eventdev.c... error: drivers/event/cnxk/cn9k_eventdev.c: does not match index Checking patch drivers/event/cnxk/cn9k_worker.h... error: drivers/event/cnxk/cn9k_worker.h: does not match index Checking patch drivers/event/cnxk/cnxk_eventdev.c... Checking patch drivers/event/cnxk/cnxk_eventdev.h... error: drivers/event/cnxk/cnxk_eventdev.h: does not match index Applied patch drivers/event/cnxk/cnxk_eventdev.c cleanly. Checking patch drivers/event/cnxk/cn10k_worker.h... error: drivers/event/cnxk/cn10k_worker.h: does not match index Checking patch drivers/net/cnxk/cn10k_rx.h... Hunk #1 succeeded at 609 (offset -1 lines). Checking patch drivers/net/cnxk/cn9k_rx.h... Hunk #1 succeeded at 341 (offset -1 lines). Hunk #2 succeeded at 722 (offset -1 lines). Hunk #3 succeeded at 746 (offset -1 lines). Applied patch drivers/net/cnxk/cn10k_rx.h cleanly. Applied patch drivers/net/cnxk/cn9k_rx.h cleanly. https://lab.dpdk.org/results/dashboard/patchsets/20718/ UNH-IOL DPDK Community Lab