Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/118780 _apply patch failure_ Submitter: Tejasree Kondoj Date: Thursday, October 20 2022 11:14:53 Applied on: CommitID:a74b1b25136a592c275afbfa6b70771469750aee Apply patch set 118780-118785 failed: Checking patch drivers/common/cnxk/cnxk_security.c... error: while searching for: struct roc_ie_on_sa_ctl *ctl; struct rte_ipv6_hdr *ip6; struct rte_ipv4_hdr *ip4; const uint8_t *auth_key; uint16_t sport, dport; int auth_key_len = 0; size_t ctx_len; int ret; error: patch failed: drivers/common/cnxk/cnxk_security.c:1218 Hunk #3 succeeded at 1337 (offset -8 lines). Hunk #4 succeeded at 1369 (offset -8 lines). Hunk #5 succeeded at 1398 (offset -8 lines). Checking patch drivers/common/cnxk/roc_cpt.c... Hunk #1 succeeded at 997 (offset -82 lines). Checking patch drivers/common/cnxk/roc_cpt.h... Checking patch drivers/common/cnxk/roc_hash.c... Checking patch drivers/common/cnxk/roc_hash.h... Checking patch drivers/common/cnxk/roc_ie_on.h... Checking patch drivers/common/cnxk/roc_nix_inl.c... Checking patch drivers/common/cnxk/version.map... Checking patch drivers/crypto/cnxk/cn9k_ipsec.c... error: while searching for: ctx_len = ret; egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE]; ret = roc_on_cpt_ctx_write(&qp->lf, (uintptr_t)sa, false, ctx_len, egrp); if (ret) return ret; w4.u64 = 0; w4.s.opcode_major = ROC_IE_ON_MAJOR_OP_PROCESS_OUTBOUND_IPSEC | ROC_IE_ON_INPLACE_BIT; error: patch failed: drivers/crypto/cnxk/cn9k_ipsec.c:81 error: while searching for: ctx_len = ret; egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE]; ret = roc_on_cpt_ctx_write(&qp->lf, (uint64_t)sa, true, ctx_len, egrp); if (ret) return ret; w4.u64 = 0; w4.s.opcode_major = ROC_IE_ON_MAJOR_OP_PROCESS_INBOUND_IPSEC | ROC_IE_ON_INPLACE_BIT; error: patch failed: drivers/crypto/cnxk/cn9k_ipsec.c:169 Checking patch drivers/net/cnxk/cn9k_ethdev_sec.c... Applying patch drivers/common/cnxk/cnxk_security.c with 1 reject... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Applied patch drivers/common/cnxk/roc_cpt.c cleanly. Applied patch drivers/common/cnxk/roc_cpt.h cleanly. Applied patch drivers/common/cnxk/roc_hash.c cleanly. Applied patch drivers/common/cnxk/roc_hash.h cleanly. Applied patch drivers/common/cnxk/roc_ie_on.h cleanly. Applied patch drivers/common/cnxk/roc_nix_inl.c cleanly. Applied patch drivers/common/cnxk/version.map cleanly. Applying patch drivers/crypto/cnxk/cn9k_ipsec.c with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applied patch drivers/net/cnxk/cn9k_ethdev_sec.c cleanly. diff a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c (rejected hunks) @@ -1218,9 +1222,7 @@ cnxk_on_ipsec_outb_sa_create(struct rte_security_ipsec_xform *ipsec, struct roc_ie_on_sa_ctl *ctl; struct rte_ipv6_hdr *ip6; struct rte_ipv4_hdr *ip4; - const uint8_t *auth_key; uint16_t sport, dport; - int auth_key_len = 0; size_t ctx_len; int ret; diff a/drivers/crypto/cnxk/cn9k_ipsec.c b/drivers/crypto/cnxk/cn9k_ipsec.c (rejected hunks) @@ -81,10 +81,6 @@ cn9k_ipsec_outb_sa_create(struct cnxk_cpt_qp *qp, ctx_len = ret; egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE]; - ret = roc_on_cpt_ctx_write(&qp->lf, (uintptr_t)sa, false, ctx_len, egrp); - - if (ret) - return ret; w4.u64 = 0; w4.s.opcode_major = ROC_IE_ON_MAJOR_OP_PROCESS_OUTBOUND_IPSEC | ROC_IE_ON_INPLACE_BIT; @@ -169,9 +165,6 @@ cn9k_ipsec_inb_sa_create(struct cnxk_cpt_qp *qp, ctx_len = ret; egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE]; - ret = roc_on_cpt_ctx_write(&qp->lf, (uint64_t)sa, true, ctx_len, egrp); - if (ret) - return ret; w4.u64 = 0; w4.s.opcode_major = ROC_IE_ON_MAJOR_OP_PROCESS_INBOUND_IPSEC | ROC_IE_ON_INPLACE_BIT; Checking patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c... error: while searching for: if (unlikely(seq == 0)) return IPSEC_ANTI_REPLAY_FAILED; ret = cnxk_on_anti_replay_check(seq, &sess->ar, win_sz); if (esn && !ret) { esn_low = rte_be_to_cpu_32(common_sa->seq_t.tl); error: patch failed: drivers/crypto/cnxk/cn9k_cryptodev_ops.c:500 Hunk #2 succeeded at 515 (offset 4 lines). Applying patch drivers/crypto/cnxk/cn9k_cryptodev_ops.c with 1 reject... Rejected hunk #1. Hunk #2 applied cleanly. diff a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c (rejected hunks) @@ -500,6 +500,7 @@ ipsec_antireplay_check(struct cn9k_sec_session *sess, uint32_t win_sz, if (unlikely(seq == 0)) return IPSEC_ANTI_REPLAY_FAILED; + rte_spinlock_lock(&sess->ar.lock); ret = cnxk_on_anti_replay_check(seq, &sess->ar, win_sz); if (esn && !ret) { esn_low = rte_be_to_cpu_32(common_sa->seq_t.tl); Checking patch drivers/crypto/cnxk/cnxk_se.h... error: while searching for: offset_ctrl = rte_cpu_to_be_64(((uint64_t)encr_offset << 16) | ((uint64_t)iv_offset << 8) | ((uint64_t)auth_offset)); /* * In cn9k, cn10k since we have a limitation of * IV & Offset control word not part of instruction * and need to be part of Data Buffer, we check if * head room is there and then only do the Direct mode processing */ if (likely((flags & ROC_SE_SINGLE_BUF_INPLACE) && (flags & ROC_SE_SINGLE_BUF_HEADROOM))) { void *dm_vaddr = fc_params->bufs[0].vaddr; /* Use Direct mode */ error: patch failed: drivers/crypto/cnxk/cnxk_se.h:1177 error: while searching for: offset_ctrl = rte_cpu_to_be_64(((uint64_t)encr_offset << 16) | ((uint64_t)iv_offset << 8) | ((uint64_t)auth_offset)); /* * In cn9k, cn10k since we have a limitation of * IV & Offset control word not part of instruction * and need to be part of Data Buffer, we check if * head room is there and then only do the Direct mode processing */ if (likely((flags & ROC_SE_SINGLE_BUF_INPLACE) && (flags & ROC_SE_SINGLE_BUF_HEADROOM))) { void *dm_vaddr = fc_params->bufs[0].vaddr; /* Use Direct mode */ error: patch failed: drivers/crypto/cnxk/cnxk_se.h:1336 Hunk #3 succeeded at 1060 (offset -325 lines). Hunk #4 succeeded at 1125 (offset -325 lines). Hunk #5 succeeded at 1151 (offset -325 lines). Hunk #6 succeeded at 1368 (offset -328 lines). Hunk #7 succeeded at 2834 (offset -33 lines). Applying patch drivers/crypto/cnxk/cnxk_se.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. diff a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h (rejected hunks) @@ -1177,14 +1177,7 @@ cpt_enc_hmac_prep(uint32_t flags, uint64_t d_offs, uint64_t d_lens, offset_ctrl = rte_cpu_to_be_64(((uint64_t)encr_offset << 16) | ((uint64_t)iv_offset << 8) | ((uint64_t)auth_offset)); - /* - * In cn9k, cn10k since we have a limitation of - * IV & Offset control word not part of instruction - * and need to be part of Data Buffer, we check if - * head room is there and then only do the Direct mode processing - */ - if (likely((flags & ROC_SE_SINGLE_BUF_INPLACE) && - (flags & ROC_SE_SINGLE_BUF_HEADROOM))) { + if (likely(fc_params->meta_buf.vaddr == NULL)) { void *dm_vaddr = fc_params->bufs[0].vaddr; /* Use Direct mode */ @@ -1336,13 +1329,7 @@ cpt_dec_hmac_prep(uint32_t flags, uint64_t d_offs, uint64_t d_lens, offset_ctrl = rte_cpu_to_be_64(((uint64_t)encr_offset << 16) | ((uint64_t)iv_offset << 8) | ((uint64_t)auth_offset)); - /* - * In cn9k, cn10k since we have a limitation of - * IV & Offset control word not part of instruction - * and need to be part of Data Buffer, we check if - * head room is there and then only do the Direct mode processing - */ - if (likely((flags & ROC_SE_SINGLE_BUF_INPLACE) && (flags & ROC_SE_SINGLE_BUF_HEADROOM))) { + if (likely(fc_params->meta_buf.vaddr == NULL)) { void *dm_vaddr = fc_params->bufs[0].vaddr; /* Use Direct mode */ Checking patch drivers/crypto/cnxk/cnxk_se.h... error: drivers/crypto/cnxk/cnxk_se.h: does not match index Checking patch drivers/crypto/cnxk/cnxk_se.h... error: drivers/crypto/cnxk/cnxk_se.h: does not match index https://lab.dpdk.org/results/dashboard/patchsets/24106/ UNH-IOL DPDK Community Lab