[dpdk-test-report] |WARNING| pw97121 [PATCH] app/testpmd: configurable number of flows in flowgen

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Zhihong Wang <wangzhihong.wzh at bytedance.com>
Date: Thursday, August 19 2021 12:35:41 
Applied on: CommitID:79b3d8cff9d9fae3b176cae3489537ed929e9f03
Apply patch set 97121 failed:

Checking patch app/test-pmd/flowgen.c...
Hunk #2 succeeded at 94 (offset 20 lines).
error: while searching for:
		}
		pkts_burst[nb_pkt] = pkt;

		if (++next_flow >= (int)cfg_n_flows)
			next_flow = 0;
	}


error: patch failed: app/test-pmd/flowgen.c:165
error: while searching for:
	fs->tx_packets += nb_tx;

	inc_tx_burst_stats(fs, nb_tx);
	if (unlikely(nb_tx < nb_pkt)) {
		/* Back out the flow counter. */
		next_flow -= (nb_pkt - nb_tx);
		while (next_flow < 0)
			next_flow += cfg_n_flows;

		fs->fwd_dropped += nb_pkt - nb_tx;
		do {
			rte_pktmbuf_free(pkts_burst[nb_tx]);
		} while (++nb_tx < nb_pkt);

error: patch failed: app/test-pmd/flowgen.c:184
Hunk #5 succeeded at 216 (offset 15 lines).
Checking patch app/test-pmd/parameters.c...
Checking patch app/test-pmd/testpmd.c...
Checking patch app/test-pmd/testpmd.h...
Checking patch doc/guides/testpmd_app_ug/run_app.rst...
Applying patch app/test-pmd/flowgen.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
Hunk #5 applied cleanly.
Applied patch app/test-pmd/parameters.c cleanly.
Applied patch app/test-pmd/testpmd.c cleanly.
Applied patch app/test-pmd/testpmd.h cleanly.
Applied patch doc/guides/testpmd_app_ug/run_app.rst cleanly.
diff a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c	(rejected hunks)
@@ -165,7 +164,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 		}
 		pkts_burst[nb_pkt] = pkt;
 
-		if (++next_flow >= (int)cfg_n_flows)
+		if (++next_flow >= nb_flows_flowgen)
 			next_flow = 0;
 	}
 
@@ -184,13 +183,14 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 	fs->tx_packets += nb_tx;
 
 	inc_tx_burst_stats(fs, nb_tx);
-	if (unlikely(nb_tx < nb_pkt)) {
+	nb_dropped = nb_pkt - nb_tx;
+	if (unlikely(nb_dropped > 0)) {
 		/* Back out the flow counter. */
-		next_flow -= (nb_pkt - nb_tx);
+		next_flow -= nb_dropped;
 		while (next_flow < 0)
-			next_flow += cfg_n_flows;
+			next_flow += nb_flows_flowgen;
 
-		fs->fwd_dropped += nb_pkt - nb_tx;
+		fs->fwd_dropped += nb_dropped;
 		do {
 			rte_pktmbuf_free(pkts_burst[nb_tx]);
 		} while (++nb_tx < nb_pkt);

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

UNH-IOL DPDK Community Lab