|WARNING| pw128163 [PATCH] net/cnxk: add atomic fc check in poll mode Tx path

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali at marvell.com>
Date: Tuesday, June 06 2023 06:12:49 
Applied on: CommitID:38689022f609a290645c7027084aee720c1fcf91
Apply patch set 128163 failed:

Checking patch drivers/net/cnxk/cn10k_ethdev.c...
Checking patch drivers/net/cnxk/cn10k_rxtx.h...
Checking patch drivers/net/cnxk/cn10k_tx.h...
error: while searching for:
	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena)
		handle_tx_completion_pkts(txq, flags & NIX_TX_VWQE_F);

	if (!(flags & NIX_TX_VWQE_F)) {
		NIX_XMIT_FC_OR_RETURN(txq, pkts);
		/* Reduce the cached count */
		txq->fc_cache_pkts -= pkts;
	}
	/* Get cmd skeleton */
	cn10k_nix_tx_skeleton(txq, cmd, flags, !(flags & NIX_TX_VWQE_F));


error: patch failed: drivers/net/cnxk/cn10k_tx.h:1174
error: while searching for:
	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena)
		handle_tx_completion_pkts(txq, flags & NIX_TX_VWQE_F);

	if (!(flags & NIX_TX_VWQE_F)) {
		NIX_XMIT_FC_OR_RETURN(txq, pkts);
		/* Reduce the cached count */
		txq->fc_cache_pkts -= pkts;
	}
	/* Get cmd skeleton */
	cn10k_nix_tx_skeleton(txq, cmd, flags, !(flags & NIX_TX_VWQE_F));


error: patch failed: drivers/net/cnxk/cn10k_tx.h:1323
error: while searching for:
		handle_tx_completion_pkts(txq, flags & NIX_TX_VWQE_F);

	if (!(flags & NIX_TX_VWQE_F)) {
		NIX_XMIT_FC_OR_RETURN(txq, pkts);
		scalar = pkts & (NIX_DESCS_PER_LOOP - 1);
		pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
		/* Reduce the cached count */
		txq->fc_cache_pkts -= pkts;
	} else {
		scalar = pkts & (NIX_DESCS_PER_LOOP - 1);
		pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);

error: patch failed: drivers/net/cnxk/cn10k_tx.h:1879
Applied patch drivers/net/cnxk/cn10k_ethdev.c cleanly.
Applied patch drivers/net/cnxk/cn10k_rxtx.h cleanly.
Applying patch drivers/net/cnxk/cn10k_tx.h with 3 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h	(rejected hunks)
@@ -1174,11 +1215,9 @@ cn10k_nix_xmit_pkts(void *tx_queue, uint64_t *ws, struct rte_mbuf **tx_pkts,
 	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena)
 		handle_tx_completion_pkts(txq, flags & NIX_TX_VWQE_F);
 
-	if (!(flags & NIX_TX_VWQE_F)) {
-		NIX_XMIT_FC_OR_RETURN(txq, pkts);
-		/* Reduce the cached count */
-		txq->fc_cache_pkts -= pkts;
-	}
+	if (!(flags & NIX_TX_VWQE_F))
+		NIX_XMIT_FC_CHECK_RETURN(txq, pkts);
+
 	/* Get cmd skeleton */
 	cn10k_nix_tx_skeleton(txq, cmd, flags, !(flags & NIX_TX_VWQE_F));
 
@@ -1323,11 +1362,9 @@ cn10k_nix_xmit_pkts_mseg(void *tx_queue, uint64_t *ws,
 	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena)
 		handle_tx_completion_pkts(txq, flags & NIX_TX_VWQE_F);
 
-	if (!(flags & NIX_TX_VWQE_F)) {
-		NIX_XMIT_FC_OR_RETURN(txq, pkts);
-		/* Reduce the cached count */
-		txq->fc_cache_pkts -= pkts;
-	}
+	if (!(flags & NIX_TX_VWQE_F))
+		NIX_XMIT_FC_CHECK_RETURN(txq, pkts);
+
 	/* Get cmd skeleton */
 	cn10k_nix_tx_skeleton(txq, cmd, flags, !(flags & NIX_TX_VWQE_F));
 
@@ -1879,11 +1916,9 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
 		handle_tx_completion_pkts(txq, flags & NIX_TX_VWQE_F);
 
 	if (!(flags & NIX_TX_VWQE_F)) {
-		NIX_XMIT_FC_OR_RETURN(txq, pkts);
 		scalar = pkts & (NIX_DESCS_PER_LOOP - 1);
 		pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
-		/* Reduce the cached count */
-		txq->fc_cache_pkts -= pkts;
+		NIX_XMIT_FC_CHECK_RETURN(txq, pkts);
 	} else {
 		scalar = pkts & (NIX_DESCS_PER_LOOP - 1);
 		pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);

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

UNH-IOL DPDK Community Lab