Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/108318

_apply patch failure_

Submitter: Akhil Goyal <gakhil@marvell.com>
Date: Thursday, February 24 2022 17:28:07 
Applied on: CommitID:ee05a93e1e6633d0fdec409faf09f12a2e05b991
Apply patch set 108318-108319 failed:

Checking patch drivers/common/cnxk/cnxk_security.c...
error: while searching for:
	if (rc)
		return rc;

	/* ESN */
	sa->w2.s.esn_en = !!ipsec_xfrm->options.esn;
	if (ipsec_xfrm->options.udp_encap) {

error: patch failed: drivers/common/cnxk/cnxk_security.c:339
Checking patch drivers/common/cnxk/roc_nix_inl.c...
error: while searching for:
	return (sa_base + ((spi & mask) * sz));
}

int
roc_nix_inl_inb_init(struct roc_nix *roc_nix)
{

error: patch failed: drivers/common/cnxk/roc_nix_inl.c:231
Checking patch drivers/common/cnxk/roc_nix_inl.h...
Hunk #2 succeeded at 150 (offset -7 lines).
Checking patch drivers/common/cnxk/version.map...
Hunk #1 succeeded at 206 (offset -3 lines).
Applying patch drivers/common/cnxk/cnxk_security.c with 1 reject...
Rejected hunk #1.
Applying patch drivers/common/cnxk/roc_nix_inl.c with 1 reject...
Rejected hunk #1.
Applied patch drivers/common/cnxk/roc_nix_inl.h cleanly.
Applied patch drivers/common/cnxk/version.map cleanly.
diff a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c	(rejected hunks)
@@ -339,6 +339,16 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 	if (rc)
 		return rc;
 
+	/* Default options for pkt_out and pkt_fmt are with
+	 * second pass meta and no defrag.
+	 */
+	sa->w0.s.pkt_format = ROC_IE_OT_SA_PKT_FMT_META;
+	sa->w0.s.pkt_output = ROC_IE_OT_SA_PKT_OUTPUT_NO_FRAG;
+	sa->w0.s.pkind = ROC_IE_OT_CPT_PKIND;
+
+	if (ipsec_xfrm->options.ip_reassembly_en)
+		sa->w0.s.pkt_output = ROC_IE_OT_SA_PKT_OUTPUT_HW_BASED_DEFRAG;
+
 	/* ESN */
 	sa->w2.s.esn_en = !!ipsec_xfrm->options.esn;
 	if (ipsec_xfrm->options.udp_encap) {
diff a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c	(rejected hunks)
@@ -231,6 +231,29 @@ roc_nix_inl_inb_sa_get(struct roc_nix *roc_nix, bool inb_inl_dev, uint32_t spi)
 	return (sa_base + ((spi & mask) * sz));
 }
 
+int
+roc_nix_reassembly_configure(uint32_t max_wait_time, uint16_t max_frags)
+{
+	struct idev_cfg *idev = idev_get_cfg();
+	struct roc_cpt *roc_cpt;
+	struct roc_cpt_rxc_time_cfg cfg;
+
+	PLT_SET_USED(max_frags);
+	roc_cpt = idev->cpt;
+	if (!roc_cpt) {
+		plt_err("Cannot support inline inbound, cryptodev not probed");
+		return -ENOTSUP;
+	}
+
+	cfg.step = (max_wait_time * 1000 / ROC_NIX_INL_REAS_ACTIVE_LIMIT);
+	cfg.zombie_limit = ROC_NIX_INL_REAS_ZOMBIE_LIMIT;
+	cfg.zombie_thres = ROC_NIX_INL_REAS_ZOMBIE_THRESHOLD;
+	cfg.active_limit = ROC_NIX_INL_REAS_ACTIVE_LIMIT;
+	cfg.active_thres = ROC_NIX_INL_REAS_ACTIVE_THRESHOLD;
+
+	return roc_cpt_rxc_time_cfg(roc_cpt, &cfg);
+}
+
 int
 roc_nix_inl_inb_init(struct roc_nix *roc_nix)
 {
.git/rebase-apply/patch:3048: trailing whitespace.
 
Checking patch drivers/event/cnxk/cn10k_worker.h...
Hunk #1 succeeded at 162 (offset -7 lines).
Hunk #2 succeeded at 232 (offset -6 lines).
Hunk #3 succeeded at 404 (offset -9 lines).
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c...
Checking patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c...
Checking patch drivers/net/cnxk/cn10k_ethdev.c...
Hunk #1 succeeded at 295 (offset -9 lines).
Hunk #2 succeeded at 452 (offset -51 lines).
error: while searching for:
		cn10k_nix_rx_metadata_negotiate;
	cnxk_eth_dev_ops.timesync_read_tx_timestamp =
		cn10k_nix_timesync_read_tx_timestamp;
}

static void

error: patch failed: drivers/net/cnxk/cn10k_ethdev.c:522
Checking patch drivers/net/cnxk/cn10k_ethdev.h...
Checking patch drivers/net/cnxk/cn10k_ethdev_sec.c...
error: while searching for:
	if (rte_security_dynfield_register() < 0)
		return -ENOTSUP;

	ipsec = &conf->ipsec;
	crypto = conf->crypto_xform;
	inbound = !!(ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS);

error: patch failed: drivers/net/cnxk/cn10k_ethdev_sec.c:336
Hunk #2 succeeded at 355 (offset -95 lines).
Checking patch drivers/net/cnxk/cn10k_rx.h...
error: while searching for:
	} while (0)
#endif

union mbuf_initializer {
	struct {
		uint16_t data_off;

error: patch failed: drivers/net/cnxk/cn10k_rx.h:53
Hunk #3 succeeded at 87 (offset -45 lines).
Hunk #4 succeeded at 442 (offset -45 lines).
Hunk #5 succeeded at 469 (offset -51 lines).
Hunk #6 succeeded at 493 (offset -51 lines).
Hunk #7 succeeded at 696 (offset -57 lines).
Hunk #8 succeeded at 762 (offset -54 lines).
error: while searching for:
	if (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)
		ol_flags = nix_update_match_id(rx->match_id, ol_flags, mbuf);

	mbuf->ol_flags = ol_flags;
	mbuf->pkt_len = len;
	mbuf->data_len = len;
	*(uint64_t *)(&mbuf->rearm_data) = val;

	if (flag & NIX_RX_MULTI_SEG_F)
		/*
		 * For multi segment packets, mbuf length correction according

error: patch failed: drivers/net/cnxk/cn10k_rx.h:401
error: while searching for:
		 * Hence, flag argument is not required.
		 */
		nix_cqe_xtract_mseg(rx, mbuf, val, 0);
	else
		mbuf->next = NULL;
}

static inline uint16_t

error: patch failed: drivers/net/cnxk/cn10k_rx.h:414
Hunk #11 succeeded at 866 (offset -96 lines).
Hunk #12 succeeded at 1136 (offset -196 lines).
Hunk #13 succeeded at 1592 (offset -229 lines).
Hunk #14 succeeded at 1601 (offset -229 lines).
Hunk #15 succeeded at 1611 (offset -229 lines).
Checking patch drivers/net/cnxk/cn10k_rx_select.c...
Hunk #1 succeeded at 37 (offset -4 lines).
Hunk #2 succeeded at 63 (offset -4 lines).
Checking patch drivers/net/cnxk/cnxk_ethdev.h...
Hunk #1 succeeded at 404 (offset -15 lines).
Checking patch drivers/net/cnxk/rx/cn10k/rx_0_15.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_112_127.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_16_31.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_32_47.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_48_63.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_64_79.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_80_95.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_96_111.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c...
Checking patch drivers/net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c...
Applied patch drivers/event/cnxk/cn10k_worker.h cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c cleanly.
Applied patch drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c cleanly.
Applying patch drivers/net/cnxk/cn10k_ethdev.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch drivers/net/cnxk/cn10k_ethdev.h cleanly.
Applying patch drivers/net/cnxk/cn10k_ethdev_sec.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applying patch drivers/net/cnxk/cn10k_rx.h with 3 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
Rejected hunk #9.
Rejected hunk #10.
Hunk #11 applied cleanly.
Hunk #12 applied cleanly.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Hunk #15 applied cleanly.
Applied patch drivers/net/cnxk/cn10k_rx_select.c cleanly.
Applied patch drivers/net/cnxk/cnxk_ethdev.h cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_0_15.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_112_127.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_16_31.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_32_47.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_48_63.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_64_79.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_80_95.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_96_111.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c cleanly.
Applied patch drivers/net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c cleanly.
diff a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c	(rejected hunks)
@@ -522,6 +569,10 @@ nix_eth_dev_ops_override(void)
 		cn10k_nix_rx_metadata_negotiate;
 	cnxk_eth_dev_ops.timesync_read_tx_timestamp =
 		cn10k_nix_timesync_read_tx_timestamp;
+	cnxk_eth_dev_ops.ip_reassembly_capability_get =
+			cn10k_nix_reassembly_capability_get;
+	cnxk_eth_dev_ops.ip_reassembly_conf_get = cn10k_nix_reassembly_conf_get;
+	cnxk_eth_dev_ops.ip_reassembly_conf_set = cn10k_nix_reassembly_conf_set;
 }
 
 static void
diff a/drivers/net/cnxk/cn10k_ethdev_sec.c b/drivers/net/cnxk/cn10k_ethdev_sec.c	(rejected hunks)
@@ -336,6 +336,14 @@ cn10k_eth_sec_session_create(void *device,
 	if (rte_security_dynfield_register() < 0)
 		return -ENOTSUP;
 
+	if (conf->ipsec.options.ip_reassembly_en &&
+			dev->reass_dynfield_off < 0) {
+		if (rte_eth_ip_reassembly_dynfield_register(
+					&dev->reass_dynfield_off,
+					&dev->reass_dynflag_bit) < 0)
+			return -rte_errno;
+	}
+
 	ipsec = &conf->ipsec;
 	crypto = conf->crypto_xform;
 	inbound = !!(ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS);
diff a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h	(rejected hunks)
@@ -53,6 +54,17 @@
 	} while (0)
 #endif
 
+#define NIX_RX_SEC_REASSEMBLY_F \
+	(NIX_RX_REAS_F | NIX_RX_OFFLOAD_SECURITY_F)
+
+static inline rte_eth_ip_reassembly_dynfield_t *
+cnxk_ip_reassembly_dynfield(struct rte_mbuf *mbuf,
+		int ip_reassembly_dynfield_offset)
+{
+	return RTE_MBUF_DYNFIELD(mbuf, ip_reassembly_dynfield_offset,
+				 rte_eth_ip_reassembly_dynfield_t *);
+}
+
 union mbuf_initializer {
 	struct {
 		uint16_t data_off;
@@ -401,11 +835,16 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
 	if (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)
 		ol_flags = nix_update_match_id(rx->match_id, ol_flags, mbuf);
 
-	mbuf->ol_flags = ol_flags;
-	mbuf->pkt_len = len;
-	mbuf->data_len = len;
-	*(uint64_t *)(&mbuf->rearm_data) = val;
-
+	/* Packet data length and ol flags is already updated for sec */
+	if (flag & NIX_RX_SEC_REASSEMBLY_F && w1 & BIT_ULL(11)) {
+		mbuf->ol_flags |= ol_flags;
+	} else {
+		mbuf->ol_flags = ol_flags;
+		mbuf->pkt_len = len;
+		mbuf->data_len = len;
+		*(uint64_t *)(&mbuf->rearm_data) = val;
+	}
+ 
 	if (flag & NIX_RX_MULTI_SEG_F)
 		/*
 		 * For multi segment packets, mbuf length correction according
@@ -414,8 +853,6 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
 		 * Hence, flag argument is not required.
 		 */
 		nix_cqe_xtract_mseg(rx, mbuf, val, 0);
-	else
-		mbuf->next = NULL;
 }
 
 static inline uint16_t

https://lab.dpdk.org/results/dashboard/patchsets/21266/

UNH-IOL DPDK Community Lab