From: Ronan Randles <ronan.randles@intel.com>
To: dev@dpdk.org
Cc: Ronan Randles <ronan.randles@intel.com>
Subject: [PATCH v2 12/15] examples/generator: line rate limiting
Date: Fri, 21 Jan 2022 10:31:19 +0000 [thread overview]
Message-ID: <20220121103122.2926856-13-ronan.randles@intel.com> (raw)
In-Reply-To: <20220121103122.2926856-1-ronan.randles@intel.com>
This commit introduces line rate limiting using a token passing method.
The target traffic rate default is currently hard coded, this can be set
using telemetry.
Signed-off-by: Ronan Randles <ronan.randles@intel.com>
---
examples/generator/main.c | 79 +++++++++++++++++++++++++--------------
1 file changed, 51 insertions(+), 28 deletions(-)
diff --git a/examples/generator/main.c b/examples/generator/main.c
index 0834a094a4..16292f06db 100644
--- a/examples/generator/main.c
+++ b/examples/generator/main.c
@@ -40,6 +40,7 @@ struct rte_gen *gen;
struct gen_args {
/* Inputs */
struct rte_gen *gen;
+ uint64_t target_tx_pps;
/* Outputs */
uint64_t tx_total_packets;
@@ -195,7 +196,6 @@ gen_wait_for_links_up(void)
rte_delay_us_block(100);
}
}
-
/* The lcore main. This is the main thread that does the work, reading from
* an input port and writing to an output port.
*/
@@ -217,43 +217,63 @@ lcore_producer(void *arg)
"not be optimal.\n", port);
uint64_t tsc_hz = rte_get_tsc_hz();
+ float tsc_hz_f = (float)tsc_hz;
uint64_t last_tsc_reading = 0;
uint64_t last_tx_total = 0;
uint16_t nb_tx = 0;
+ float tokens = 0;
/* Wait for links to come up before generating packets */
gen_wait_for_links_up();
if (!done)
printf("Generating packets...\n");
+ uint64_t token_last_add_tsc = rte_rdtsc();
+
/* Run until the application is quit or killed. */
while (!done) {
-
struct rte_mbuf *bufs[BURST_SIZE];
- /* Receive packets from gen and then tx them over port */
-
- RTE_ETH_FOREACH_DEV(port) {
- int nb_generated = rte_gen_rx_burst(gen, bufs,
- BURST_SIZE);
-
- uint64_t start_tsc = rte_rdtsc();
- if (start_tsc > last_tsc_reading + tsc_hz) {
- args->measured_tx_pps = args->tx_total_packets -
- last_tx_total;
- last_tx_total = args->tx_total_packets;
- last_tsc_reading = start_tsc;
+ /* Track time since last token add and calculate number
+ * of tokens to give per second to implement line rate limiting
+ */
+ uint64_t now = rte_rdtsc();
+ uint64_t tsc_delta = now - token_last_add_tsc;
+ float token_scalar = (float)tsc_delta / tsc_hz_f;
+ float add_tokens = args->target_tx_pps * token_scalar;
+ /* If there are tokens to be added and we haven't exceeded
+ * the target rate then we add tokens
+ */
+ if (add_tokens > 1.f) {
+ if (tokens < args->target_tx_pps) {
+ tokens += add_tokens;
+ token_last_add_tsc = now;
}
- nb_tx = rte_eth_tx_burst(port, 0, bufs, nb_generated);
- args->tx_total_packets += nb_tx;
-
- uint64_t tx_failed = nb_generated - nb_tx;
- if (nb_tx != nb_generated) {
- rte_pktmbuf_free_bulk(&bufs[nb_tx], tx_failed);
- args->tx_failed += tx_failed;
+ }
+ /* Receive packets from gen and then tx them over port */
+ if (tokens >= BURST_SIZE) {
+ RTE_ETH_FOREACH_DEV(port) {
+ int nb_generated = rte_gen_rx_burst(gen, bufs,
+ BURST_SIZE);
+
+ uint64_t start_tsc = rte_rdtsc();
+ if (start_tsc > last_tsc_reading + tsc_hz) {
+ args->measured_tx_pps =
+ args->tx_total_packets - last_tx_total;
+ last_tx_total = args->tx_total_packets;
+ last_tsc_reading = start_tsc;
+ }
+ nb_tx = rte_eth_tx_burst(port, 0, bufs,
+ nb_generated);
+ args->tx_total_packets += nb_tx;
+ tokens -= nb_tx;
+
+ uint64_t tx_failed = nb_generated - nb_tx;
+ if (nb_tx != nb_generated) {
+ rte_pktmbuf_free_bulk(&bufs[nb_tx],
+ tx_failed);
+ args->tx_failed += tx_failed;
+ }
}
- if (unlikely(nb_tx == 0))
- continue;
-
}
}
return 0;
@@ -296,7 +316,6 @@ lcore_consumer(void *arg)
BURST_SIZE);
if (unlikely(nb_rx == 0))
continue;
-
args->rx_total_packets += nb_rx;
int nb_sent = rte_gen_tx_burst(gen, bufs,
@@ -320,12 +339,14 @@ static int
tele_gen_mpps(const char *cmd, const char *params, struct rte_tel_data *d)
{
RTE_SET_USED(cmd);
- RTE_SET_USED(params);
struct gen_args *args = telemetry_userdata.prod;
+ if (params) {
+ args->target_tx_pps = atoi(params) * 1000000;
+ printf("Packet rate set: %li\n", args->target_tx_pps);
+ }
rte_tel_data_start_dict(d);
- rte_tel_data_add_dict_int(d, "pps",
- (args->measured_tx_pps));
+ rte_tel_data_add_dict_int(d, "pps", args->target_tx_pps);
return 0;
}
@@ -412,6 +433,8 @@ main(int argc, char *argv[])
if (lcore_count == 0) {
telemetry_userdata.prod =
&core_launch_args[lcore_count];
+ /* Default traffic rate */
+ telemetry_userdata.prod->target_tx_pps = 20000000;
rte_eal_remote_launch(lcore_producer,
telemetry_userdata.prod,
lcore_id);
--
2.25.1
next prev parent reply other threads:[~2022-01-21 10:32 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 14:12 [PATCH 00/12] add packet generator library and example app Ronan Randles
2021-12-14 14:12 ` [PATCH 01/12] net: add string to IPv4 parse function Ronan Randles
2021-12-14 17:31 ` Morten Brørup
2021-12-15 9:27 ` Bruce Richardson
2021-12-15 9:35 ` Morten Brørup
2021-12-15 10:11 ` Bruce Richardson
2022-01-19 14:20 ` Thomas Monjalon
2021-12-14 14:12 ` [PATCH 02/12] net: add function to pretty print IPv4 Ronan Randles
2021-12-14 16:08 ` Stephen Hemminger
2021-12-14 17:42 ` Morten Brørup
2021-12-14 17:31 ` Morten Brørup
2021-12-15 1:06 ` Ananyev, Konstantin
2021-12-15 3:20 ` Stephen Hemminger
2021-12-15 7:23 ` Morten Brørup
2021-12-15 13:06 ` Ananyev, Konstantin
2022-01-19 14:24 ` Thomas Monjalon
2022-01-19 14:41 ` Van Haaren, Harry
2021-12-14 14:12 ` [PATCH 03/12] gen: add files for initial traffic generation library Ronan Randles
2021-12-14 14:12 ` [PATCH 04/12] gen: add basic Rx and Tx routines and tests Ronan Randles
2021-12-14 14:12 ` [PATCH 05/12] gen: add raw packet data API " Ronan Randles
2021-12-15 12:40 ` Jerin Jacob
2021-12-17 11:40 ` Van Haaren, Harry
2021-12-17 16:19 ` Thomas Monjalon
2021-12-20 10:21 ` Van Haaren, Harry
2022-01-19 14:56 ` Thomas Monjalon
2022-01-20 10:21 ` Van Haaren, Harry
2022-01-21 10:45 ` Van Haaren, Harry
2021-12-20 13:21 ` Jerin Jacob
2022-01-21 14:20 ` Xueming(Steven) Li
2021-12-14 14:12 ` [PATCH 06/12] gen: add parsing infrastructure and Ether protocol Ronan Randles
2021-12-14 14:12 ` [PATCH 07/12] gen: add gen IP parsing Ronan Randles
2021-12-14 14:12 ` [PATCH 08/12] examples/generator: import code from basicfwd.c Ronan Randles
2021-12-14 14:12 ` [PATCH 09/12] examples/generator: enable gen library for traffic gen Ronan Randles
2021-12-14 14:12 ` [PATCH 10/12] examples/generator: telemetry support Ronan Randles
2021-12-14 14:12 ` [PATCH 11/12] examples/generator: link status check added Ronan Randles
2021-12-14 14:12 ` [PATCH 12/12] examples/generator: line rate limiting Ronan Randles
2021-12-14 16:10 ` Stephen Hemminger
2021-12-14 14:57 ` [PATCH 00/12] add packet generator library and example app Bruce Richardson
2021-12-14 15:59 ` Randles, Ronan
2022-01-12 16:18 ` Morten Brørup
2021-12-15 12:31 ` Jerin Jacob
2021-12-15 14:07 ` Bruce Richardson
2022-01-21 10:31 ` [PATCH v2 00/15] " Ronan Randles
2022-01-21 10:31 ` [PATCH v2 01/15] net: add string to IPv4 parse function Ronan Randles
2022-01-21 10:31 ` [PATCH v2 02/15] net: add function to pretty print IPv4 Ronan Randles
2022-01-21 16:20 ` Stephen Hemminger
2022-01-21 10:31 ` [PATCH v2 03/15] gen: add files for initial traffic generation library Ronan Randles
2022-01-21 10:31 ` [PATCH v2 04/15] gen: add basic Rx and Tx routines and tests Ronan Randles
2022-01-21 10:31 ` [PATCH v2 05/15] gen: add raw packet data API " Ronan Randles
2022-01-21 10:31 ` [PATCH v2 06/15] gen: add parsing infrastructure and Ether protocol Ronan Randles
2022-01-21 10:31 ` [PATCH v2 07/15] gen: add gen IP parsing Ronan Randles
2022-01-21 10:31 ` [PATCH v2 08/15] examples/generator: import code from basicfwd.c Ronan Randles
2022-01-21 10:31 ` [PATCH v2 09/15] examples/generator: enable gen library for traffic gen Ronan Randles
2022-01-21 10:31 ` [PATCH v2 10/15] examples/generator: telemetry support Ronan Randles
2022-01-21 10:31 ` [PATCH v2 11/15] examples/generator: link status check added Ronan Randles
2022-01-21 10:31 ` Ronan Randles [this message]
2022-01-21 10:31 ` [PATCH v2 13/15] gen: add UDP support Ronan Randles
2022-01-21 10:31 ` [PATCH v2 14/15] net/vxlan: instance flag endianness refactored Ronan Randles
2022-01-21 10:31 ` [PATCH v2 15/15] gen: add VXLAN support Ronan Randles
2022-01-21 14:44 ` [PATCH 00/12] add packet generator library and example app Xueming(Steven) Li
2022-01-21 15:24 ` Van Haaren, Harry
2022-01-24 10:48 ` Ananyev, Konstantin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220121103122.2926856-13-ronan.randles@intel.com \
--to=ronan.randles@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).