Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/118574 _apply patch failure_ Submitter: Tejasree Kondoj Date: Wednesday, October 19 2022 14:15:07 Applied on: CommitID:a74b1b25136a592c275afbfa6b70771469750aee Apply patch set 118574-118579 failed: Checking patch drivers/common/cnxk/roc_ie_on.h... Checking patch drivers/common/cnxk/roc_ie_ot.h... Checking patch drivers/crypto/cnxk/cn10k_ipsec.c... Hunk #1 succeeded at 101 (offset 2 lines). Hunk #2 succeeded at 197 (offset 4 lines). Checking patch drivers/crypto/cnxk/cn10k_ipsec_la_ops.h... Hunk #1 succeeded at 88 (offset 5 lines). error: while searching for: inst->w4.u64 = sess->inst.w4 | rte_pktmbuf_pkt_len(m_src); dptr = rte_pktmbuf_mtod(m_src, uint64_t); inst->dptr = dptr; inst->rptr = dptr; return 0; } error: patch failed: drivers/crypto/cnxk/cn10k_ipsec_la_ops.h:99 Checking patch drivers/crypto/cnxk/cn9k_ipsec.c... Hunk #2 succeeded at 176 (offset 2 lines). Checking patch drivers/crypto/cnxk/cn9k_ipsec_la_ops.h... error: while searching for: /* Prepare CPT instruction */ inst->w4.u64 = sess->inst.w4 | dlen; inst->dptr = PLT_U64_CAST(hdr); inst->rptr = PLT_U64_CAST(hdr); inst->w7.u64 = sess->inst.w7; return 0; error: patch failed: drivers/crypto/cnxk/cn9k_ipsec_la_ops.h:82 error: while searching for: /* Prepare CPT instruction */ inst->w4.u64 = sess->inst.w4 | rte_pktmbuf_pkt_len(m_src); inst->dptr = inst->rptr = rte_pktmbuf_mtod(m_src, uint64_t); inst->w7.u64 = sess->inst.w7; } #endif /* __CN9K_IPSEC_LA_OPS_H__ */ error: patch failed: drivers/crypto/cnxk/cn9k_ipsec_la_ops.h:96 Applied patch drivers/common/cnxk/roc_ie_on.h cleanly. Applied patch drivers/common/cnxk/roc_ie_ot.h cleanly. Applied patch drivers/crypto/cnxk/cn10k_ipsec.c cleanly. Applying patch drivers/crypto/cnxk/cn10k_ipsec_la_ops.h with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Applied patch drivers/crypto/cnxk/cn9k_ipsec.c cleanly. Applying patch drivers/crypto/cnxk/cn9k_ipsec_la_ops.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. diff a/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h (rejected hunks) @@ -99,7 +98,6 @@ process_inb_sa(struct rte_crypto_op *cop, struct cn10k_sec_session *sess, struct inst->w4.u64 = sess->inst.w4 | rte_pktmbuf_pkt_len(m_src); dptr = rte_pktmbuf_mtod(m_src, uint64_t); inst->dptr = dptr; - inst->rptr = dptr; return 0; } diff a/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h (rejected hunks) @@ -82,7 +82,6 @@ process_outb_sa(struct rte_crypto_op *cop, struct cn9k_sec_session *sess, struct /* Prepare CPT instruction */ inst->w4.u64 = sess->inst.w4 | dlen; inst->dptr = PLT_U64_CAST(hdr); - inst->rptr = PLT_U64_CAST(hdr); inst->w7.u64 = sess->inst.w7; return 0; @@ -96,7 +95,7 @@ process_inb_sa(struct rte_crypto_op *cop, struct cn9k_sec_session *sess, struct /* Prepare CPT instruction */ inst->w4.u64 = sess->inst.w4 | rte_pktmbuf_pkt_len(m_src); - inst->dptr = inst->rptr = rte_pktmbuf_mtod(m_src, uint64_t); + inst->dptr = rte_pktmbuf_mtod(m_src, uint64_t); inst->w7.u64 = sess->inst.w7; } #endif /* __CN9K_IPSEC_LA_OPS_H__ */ Checking patch drivers/common/cnxk/hw/cpt.h... Checking patch drivers/common/cnxk/roc_se.h... Checking patch drivers/crypto/cnxk/cn10k_cryptodev.c... Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c... Hunk #2 succeeded at 97 (offset 3 lines). error: while searching for: w7 = sec_sess->inst.w7; } else if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { sess = CRYPTODEV_GET_SYM_SESS_PRIV(sym_op->session); ret = cpt_sym_inst_fill(qp, op, sess, infl_req, &inst[0]); if (unlikely(ret)) return 0; w7 = sess->cpt_inst_w7; error: patch failed: drivers/crypto/cnxk/cn10k_cryptodev_ops.c:126 Hunk #4 succeeded at 142 (offset 4 lines). Hunk #5 succeeded at 180 (offset 4 lines). Hunk #6 succeeded at 226 (offset 4 lines). Hunk #7 succeeded at 270 (offset 4 lines). Hunk #8 succeeded at 341 (offset 7 lines). Hunk #9 succeeded at 531 (offset 8 lines). Hunk #10 succeeded at 650 (offset 8 lines). Hunk #11 succeeded at 703 (offset 8 lines). Hunk #12 succeeded at 719 (offset 8 lines). Hunk #13 succeeded at 781 (offset 8 lines). Hunk #14 succeeded at 1043 (offset 8 lines). Checking patch drivers/crypto/cnxk/cn10k_cryptodev_ops.h... Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... Hunk #1 succeeded at 93 (offset 2 lines). Hunk #2 succeeded at 104 (offset 2 lines). Checking patch drivers/crypto/cnxk/cnxk_se.h... Checking patch drivers/crypto/cnxk/version.map... Checking patch drivers/event/cnxk/cn10k_eventdev.c... Applied patch drivers/common/cnxk/hw/cpt.h cleanly. Applied patch drivers/common/cnxk/roc_se.h cleanly. Applied patch drivers/crypto/cnxk/cn10k_cryptodev.c cleanly. Applying patch drivers/crypto/cnxk/cn10k_cryptodev_ops.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. 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. Applied patch drivers/crypto/cnxk/cn10k_cryptodev_ops.h cleanly. Applied patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c cleanly. Applied patch drivers/crypto/cnxk/cnxk_se.h cleanly. Applied patch drivers/crypto/cnxk/version.map cleanly. Applied patch drivers/event/cnxk/cn10k_eventdev.c cleanly. diff a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c (rejected hunks) @@ -126,8 +127,7 @@ cn10k_cpt_fill_inst(struct cnxk_cpt_qp *qp, struct rte_crypto_op *ops[], w7 = sec_sess->inst.w7; } else if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { sess = CRYPTODEV_GET_SYM_SESS_PRIV(sym_op->session); - ret = cpt_sym_inst_fill(qp, op, sess, infl_req, - &inst[0]); + ret = cpt_sym_inst_fill(qp, op, sess, infl_req, &inst[0], is_sg_ver2); if (unlikely(ret)) return 0; w7 = sess->cpt_inst_w7; Checking patch drivers/crypto/cnxk/cn9k_ipsec.c... error: drivers/crypto/cnxk/cn9k_ipsec.c: does not match index Checking patch drivers/crypto/cnxk/cn9k_ipsec_la_ops.h... error: while searching for: ipsec_po_out_rlen_get(struct cn9k_sec_session *sess, uint32_t plen) { uint32_t enc_payload_len; enc_payload_len = RTE_ALIGN_CEIL(plen + sess->rlens.roundup_len, sess->rlens.roundup_byte); return sess->custom_hdr_len + sess->rlens.partial_len + enc_payload_len; } static __rte_always_inline int error: patch failed: drivers/crypto/cnxk/cn9k_ipsec_la_ops.h:16 Applying patch drivers/crypto/cnxk/cn9k_ipsec_la_ops.h with 1 reject... Rejected hunk #1. diff a/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h (rejected hunks) @@ -16,11 +16,15 @@ static __rte_always_inline int32_t ipsec_po_out_rlen_get(struct cn9k_sec_session *sess, uint32_t plen) { uint32_t enc_payload_len; + int adj_len = 0; - enc_payload_len = RTE_ALIGN_CEIL(plen + sess->rlens.roundup_len, - sess->rlens.roundup_byte); + if (sess->sa.out_sa.common_sa.ctl.ipsec_mode == ROC_IE_SA_MODE_TRANSPORT) + adj_len = ROC_CPT_TUNNEL_IPV4_HDR_LEN; - return sess->custom_hdr_len + sess->rlens.partial_len + enc_payload_len; + enc_payload_len = + RTE_ALIGN_CEIL(plen + sess->rlens.roundup_len - adj_len, sess->rlens.roundup_byte); + + return sess->custom_hdr_len + sess->rlens.partial_len + enc_payload_len + adj_len; } static __rte_always_inline int https://lab.dpdk.org/results/dashboard/patchsets/24075/ UNH-IOL DPDK Community Lab