samples/bpf: xdpsock: add time-out for cleaning Tx

elvinongbl · Nobody · commit 9f7dfb1e2b93 · 2021-11-30T11:07:44.000-08:00
When user sets tx-pkt-count and in case where there are invalid Tx frame,
the complete_tx_only_all() process polls indefinitely. So, this patch
adds a time-out mechanism into the process so that the application
can terminate automatically after it retries 3*polling interval duration.

 sock0@enp0s29f1:2 txonly xdp-drv
                   pps            pkts           1.00
rx                 0              0
tx                 136383         1000000
rx dropped         0              0
rx invalid         0              0
tx invalid         35             245
rx queue full      0              0
fill ring empty    0              1
tx ring empty      957            7011

 sock0@enp0s29f1:2 txonly xdp-drv
                   pps            pkts           1.00
rx                 0              0
tx                 0              1000000
rx dropped         0              0
rx invalid         0              0
tx invalid         0              245
rx queue full      0              0
fill ring empty    0              1
tx ring empty      1              7012

 sock0@enp0s29f1:2 txonly xdp-drv
                   pps            pkts           1.00
rx                 0              0
tx                 0              1000000
rx dropped         0              0
rx invalid         0              0
tx invalid         0              245
rx queue full      0              0
fill ring empty    0              1
tx ring empty      1              7013

 sock0@enp0s29f1:2 txonly xdp-drv
                   pps            pkts           1.00
rx                 0              0
tx                 0              1000000
rx dropped         0              0
rx invalid         0              0
tx invalid         0              245
rx queue full      0              0
fill ring empty    0              1
tx ring empty      1              7014

 sock0@enp0s29f1:2 txonly xdp-drv
                   pps            pkts           1.00
rx                 0              0
tx                 0              1000000
rx dropped         0              0
rx invalid         0              0
tx invalid         0              245
rx queue full      0              0
fill ring empty    0              1
tx ring empty      0              7014

 sock0@enp0s29f1:2 txonly xdp-drv
                   pps            pkts           0.00
rx                 0              0
tx                 0              1000000
rx dropped         0              0
rx invalid         0              0
tx invalid         0              245
rx queue full      0              0
fill ring empty    0              1
tx ring empty      0              7014

Signed-off-by: Ong Boon Leong &lt;boon.leong.ong@intel.com&gt;
diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
@@ -1410,6 +1410,7 @@ static inline int get_batch_size(int pkt_cnt)
 
 static void complete_tx_only_all(void)
 {
+	u32 retries = 3;
 	bool pending;
 	int i;
 
@@ -1421,7 +1422,8 @@ static void complete_tx_only_all(void)
 				pending = !!xsks[i]->outstanding_tx;
 			}
 		}
-	} while (pending);
+		sleep(opt_interval);
+	} while (pending && retries-- > 0);
 }
 
 static void tx_only_all(void)

Original file line number	Diff line number	Diff line change
`@@ -1410,6 +1410,7 @@ static inline int get_batch_size(int pkt_cnt)`
`1410`	`1410`
`1411`	`1411`	`static void complete_tx_only_all(void)`
`1412`	`1412`	`{`
	`1413`	`+ u32 retries = 3;`
`1413`	`1414`	`bool pending;`
`1414`	`1415`	`int i;`
`1415`	`1416`
`@@ -1421,7 +1422,8 @@ static void complete_tx_only_all(void)`
`1421`	`1422`	`pending = !!xsks[i]->outstanding_tx;`
`1422`	`1423`	`}`
`1423`	`1424`	`}`
`1424`		`- } while (pending);`
	`1425`	`+ sleep(opt_interval);`
	`1426`	`+ } while (pending && retries-- > 0);`
`1425`	`1427`	`}`
`1426`	`1428`
`1427`	`1429`	`static void tx_only_all(void)`