Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/120197 _apply patch failure_ Submitter: Nithin Dabilpuram Date: Monday, November 28 2022 09:54:42 Applied on: CommitID:f262f16087ea6a77357a915cf4c0d10ddc7b6562 Apply patch set 120197-120207 failed: Checking patch doc/guides/nics/cnxk.rst... Checking patch drivers/event/cnxk/cn10k_worker.h... Checking patch drivers/event/cnxk/cn9k_worker.h... 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 597 (offset -46 lines). Hunk #2 succeeded at 672 (offset -46 lines). Hunk #3 succeeded at 865 (offset -46 lines). error: while searching for: } static __rte_always_inline uint16_t cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) { uint64_t prefree = 0, aura0, aura, nb_segs, segdw; struct nix_send_hdr_s *send_hdr; error: patch failed: drivers/net/cnxk/cn10k_tx.h:959 error: while searching for: /* Set invert df if buffer is not to be freed by H/W */ if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { prefree = cnxk_nix_prefree_seg(m); l_sg.i1 = prefree; } error: patch failed: drivers/net/cnxk/cn10k_tx.h:993 error: while searching for: if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { aura = roc_npa_aura_handle_to_aura(m->pool->pool_id); prefree = cnxk_nix_prefree_seg(m); is_sg2 = aura != aura0 && !prefree; } error: patch failed: drivers/net/cnxk/cn10k_tx.h:1035 Hunk #7 succeeded at 1038 (offset -105 lines). Hunk #8 succeeded at 1135 (offset -105 lines). Hunk #9 succeeded at 1328 (offset 43 lines). Hunk #10 succeeded at 1284 (offset -105 lines). Hunk #11 succeeded at 1180 (offset -258 lines). Hunk #12 succeeded at 1345 (offset -107 lines). error: while searching for: } static __rte_always_inline uint16_t cn10k_nix_prepare_mseg_vec_noff(struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0, uint64x2_t *cmd1, uint64x2_t *cmd2, uint64x2_t *cmd3, const uint32_t flags) error: patch failed: drivers/net/cnxk/cn10k_tx.h:1467 error: while searching for: vst1q_u64(cmd + 2, *cmd1); /* sg */ } segdw = cn10k_nix_prepare_mseg(m, cmd, flags); if (flags & NIX_TX_OFFLOAD_TSTAMP_F) vst1q_u64(cmd + segdw * 2 - 2, *cmd3); error: patch failed: drivers/net/cnxk/cn10k_tx.h:1482 Hunk #15 succeeded at 1591 (offset -98 lines). error: while searching for: lmt_addr += 16; off = 0; } off += cn10k_nix_prepare_mseg_vec_noff(mbufs[j], lmt_addr + off * 2, &cmd0[j], &cmd1[j], &cmd2[j], &cmd3[j], flags); } error: patch failed: drivers/net/cnxk/cn10k_tx.h:1599 error: while searching for: } static __rte_always_inline void cn10k_nix_xmit_store(struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr, uint64x2_t cmd0, uint64x2_t cmd1, uint64x2_t cmd2, uint64x2_t cmd3, const uint16_t flags) { uint8_t off; if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { cn10k_nix_prepare_mseg_vec_noff(mbuf, LMT_OFF(laddr, 0, 0), &cmd0, &cmd1, &cmd2, &cmd3, flags); return; error: patch failed: drivers/net/cnxk/cn10k_tx.h:1741 Hunk #18 succeeded at 1831 (offset -95 lines). Hunk #19 succeeded at 1849 (offset -95 lines). Hunk #20 succeeded at 2678 (offset -102 lines). Hunk #21 succeeded at 2689 (offset -102 lines). Hunk #22 succeeded at 2816 (offset -102 lines). Hunk #23 succeeded at 2832 (offset -102 lines). Hunk #24 succeeded at 2848 (offset -102 lines). Hunk #25 succeeded at 2864 (offset -102 lines). Hunk #26 succeeded at 2872 (offset -102 lines). Checking patch drivers/net/cnxk/cn9k_ethdev.c... Checking patch drivers/net/cnxk/cn9k_ethdev.h... Checking patch drivers/net/cnxk/cn9k_tx.h... Checking patch drivers/net/cnxk/cnxk_ethdev.c... Checking patch drivers/net/cnxk/cnxk_ethdev.h... Checking patch drivers/net/cnxk/cnxk_ethdev_devargs.c... Applied patch doc/guides/nics/cnxk.rst cleanly. Applied patch drivers/event/cnxk/cn10k_worker.h cleanly. Applied patch drivers/event/cnxk/cn9k_worker.h 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 7 rejects... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Rejected hunk #4. Rejected hunk #5. Rejected hunk #6. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Rejected hunk #13. Rejected hunk #14. Hunk #15 applied cleanly. Rejected hunk #16. Rejected hunk #17. Hunk #18 applied cleanly. Hunk #19 applied cleanly. Hunk #20 applied cleanly. Hunk #21 applied cleanly. Hunk #22 applied cleanly. Hunk #23 applied cleanly. Hunk #24 applied cleanly. Hunk #25 applied cleanly. Hunk #26 applied cleanly. 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. Applied patch drivers/net/cnxk/cnxk_ethdev.c cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev.h cleanly. Applied patch drivers/net/cnxk/cnxk_ethdev_devargs.c cleanly. diff a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h (rejected hunks) @@ -959,7 +982,8 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr, } static __rte_always_inline uint16_t -cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) +cn10k_nix_prepare_mseg(struct cn10k_eth_txq *txq, + struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) { uint64_t prefree = 0, aura0, aura, nb_segs, segdw; struct nix_send_hdr_s *send_hdr; @@ -993,7 +1017,7 @@ cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) /* Set invert df if buffer is not to be freed by H/W */ if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { - prefree = cnxk_nix_prefree_seg(m); + prefree = cn10k_nix_prefree_seg(m, txq, send_hdr); l_sg.i1 = prefree; } @@ -1035,7 +1059,7 @@ cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags) if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { aura = roc_npa_aura_handle_to_aura(m->pool->pool_id); - prefree = cnxk_nix_prefree_seg(m); + prefree = cn10k_nix_prefree_seg(m, txq, send_hdr); is_sg2 = aura != aura0 && !prefree; } @@ -1467,7 +1574,8 @@ cn10k_nix_prepare_tso(struct rte_mbuf *m, union nix_send_hdr_w1_u *w1, } static __rte_always_inline uint16_t -cn10k_nix_prepare_mseg_vec_noff(struct rte_mbuf *m, uint64_t *cmd, +cn10k_nix_prepare_mseg_vec_noff(struct cn10k_eth_txq *txq, + struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0, uint64x2_t *cmd1, uint64x2_t *cmd2, uint64x2_t *cmd3, const uint32_t flags) @@ -1482,7 +1590,7 @@ cn10k_nix_prepare_mseg_vec_noff(struct rte_mbuf *m, uint64_t *cmd, vst1q_u64(cmd + 2, *cmd1); /* sg */ } - segdw = cn10k_nix_prepare_mseg(m, cmd, flags); + segdw = cn10k_nix_prepare_mseg(txq, m, cmd, flags); if (flags & NIX_TX_OFFLOAD_TSTAMP_F) vst1q_u64(cmd + segdw * 2 - 2, *cmd3); @@ -1599,7 +1708,7 @@ cn10k_nix_prep_lmt_mseg_vector(struct rte_mbuf **mbufs, uint64x2_t *cmd0, lmt_addr += 16; off = 0; } - off += cn10k_nix_prepare_mseg_vec_noff(mbufs[j], + off += cn10k_nix_prepare_mseg_vec_noff(txq, mbufs[j], lmt_addr + off * 2, &cmd0[j], &cmd1[j], &cmd2[j], &cmd3[j], flags); } @@ -1741,14 +1850,15 @@ cn10k_nix_lmt_next(uint8_t dw, uintptr_t laddr, uint8_t *lnum, uint8_t *loff, } static __rte_always_inline void -cn10k_nix_xmit_store(struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr, +cn10k_nix_xmit_store(struct cn10k_eth_txq *txq, + struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr, uint64x2_t cmd0, uint64x2_t cmd1, uint64x2_t cmd2, uint64x2_t cmd3, const uint16_t flags) { uint8_t off; if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { - cn10k_nix_prepare_mseg_vec_noff(mbuf, LMT_OFF(laddr, 0, 0), + cn10k_nix_prepare_mseg_vec_noff(txq, mbuf, LMT_OFF(laddr, 0, 0), &cmd0, &cmd1, &cmd2, &cmd3, flags); return; Checking patch drivers/common/cnxk/hw/nix.h... Checking patch drivers/common/cnxk/roc_model.h... Checking patch drivers/common/cnxk/roc_nix_debug.c... Checking patch drivers/common/cnxk/roc_nix_irq.c... Checking patch drivers/common/cnxk/roc_nix_priv.h... Checking patch drivers/common/cnxk/roc_nix_queue.c... Checking patch drivers/net/cnxk/cnxk_ethdev.c... error: drivers/net/cnxk/cnxk_ethdev.c: does not match index Applied patch drivers/common/cnxk/hw/nix.h cleanly. Applied patch drivers/common/cnxk/roc_model.h cleanly. Applied patch drivers/common/cnxk/roc_nix_debug.c cleanly. Applied patch drivers/common/cnxk/roc_nix_irq.c cleanly. Applied patch drivers/common/cnxk/roc_nix_priv.h cleanly. Applied patch drivers/common/cnxk/roc_nix_queue.c cleanly. https://lab.dpdk.org/results/dashboard/patchsets/24578/ UNH-IOL DPDK Community Lab