|WARNING| pw115177-115179 [PATCH] [3/3] event/cnxk: update event vector Tx routine

|WARNING| pw115177-115179 [PATCH] [3/3] event/cnxk: update event vector Tx routine

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3311 bytes --]

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

_apply patch failure_

Submitter: Pavan Nikhilesh Bhagavatula <pbhagavatula@marvell.com>
Date: Tuesday, August 16 2022 15:49:32 
Applied on: CommitID:72206323a5dd3182b13f61b25a64abdddfee595c
Apply patch set 115177-115179 failed:

Checking patch drivers/event/cnxk/cn10k_worker.h...
error: while searching for:
						   (meta >> 48)] &
					  (BIT_ULL(48) - 1));

			cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws, mbufs,
						   meta & 0xFFFF, cmd,
						   flags | NIX_TX_VWQE_F);
		} else {
			cn10k_sso_vwqe_split_tx(
				ws, mbufs, meta & 0xFFFF, cmd, lmt_id, lmt_addr,
				ev->sched_type, txq_data, flags);
		}
		rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec);
		rte_prefetch0(ws);
		return 1;
	}

	m = ev->mbuf;
	txq = cn10k_sso_hws_xtract_meta(m, txq_data);
	if (((txq->nb_sqb_bufs_adj -
	      __atomic_load_n((int16_t *)txq->fc_mem, __ATOMIC_RELAXED))
	     << txq->sqes_per_sqb_log2) <= 0)
		return 0;
	cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type, txq_data,
			 flags);

	return 1;
}

#define T(name, sz, flags)                                                     \

error: patch failed: drivers/event/cnxk/cn10k_worker.h:641
Applying patch drivers/event/cnxk/cn10k_worker.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
diff a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h	(rejected hunks)
@@ -641,29 +680,32 @@ cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev,
 						   (meta >> 48)] &
 					  (BIT_ULL(48) - 1));

-			cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws, mbufs,
-						   meta & 0xFFFF, cmd,
+			/* Transmit based on queue depth */
+			space = cn10k_sso_sq_depth(txq);
+			if (space <= 0)
+				return 0;
+			nb_pkts = nb_pkts < space ? nb_pkts : (uint16_t)space;
+			cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws,
+						   mbufs + offset, nb_pkts, cmd,
 						   flags | NIX_TX_VWQE_F);
 		} else {
-			cn10k_sso_vwqe_split_tx(
-				ws, mbufs, meta & 0xFFFF, cmd, lmt_id, lmt_addr,
-				ev->sched_type, txq_data, flags);
+			nb_pkts = cn10k_sso_vwqe_split_tx(
+				ws, mbufs + offset, nb_pkts, cmd, lmt_id,
+				lmt_addr, ev->sched_type, txq_data, flags);
 		}
-		rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec);
+		if (!((meta & 0xFFFF) - nb_pkts - offset))
+			rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec);
+		else
+			*(uint64_t *)ev->vec = (meta & ~0xFFF0000UL) |
+					       ((uint32_t)nb_pkts + offset)
+						       << 16;
 		rte_prefetch0(ws);
-		return 1;
+		return !((meta & 0xFFFF) - nb_pkts - offset);
 	}

 	m = ev->mbuf;
-	txq = cn10k_sso_hws_xtract_meta(m, txq_data);
-	if (((txq->nb_sqb_bufs_adj -
-	      __atomic_load_n((int16_t *)txq->fc_mem, __ATOMIC_RELAXED))
-	     << txq->sqes_per_sqb_log2) <= 0)
-		return 0;
-	cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type, txq_data,
-			 flags);
-
-	return 1;
+	return cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type,
+				txq_data, flags);
 }

 #define T(name, sz, flags)                                                     \

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

UNH-IOL DPDK Community Lab