From patchwork Tue Dec 14 14:12:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ronan Randles X-Patchwork-Id: 105141 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BAA6BA00C3; Tue, 14 Dec 2021 15:14:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55C9E41165; Tue, 14 Dec 2021 15:13:16 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 433204113E for ; Tue, 14 Dec 2021 15:13:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639491193; x=1671027193; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CdycJcAYeHM3OgHS/fagPgCLHQVDaTX4QYJINF2j4I0=; b=ZGqfstuqs/SM3qt0Cvl0BbqQhz3SeWS//w/bdMqn8CTcU6k4WkIYjcG0 Mb/6KZnLKajPTO+5uF+ZD5xDNbZtTroeVv6RCxg6P0Ug63BttRiu4PO0d 8m2RLpo0KurXM04ANPIB0R6sts9sC1G/z0jFyshoout5od6tgWES65pNc Ejw0/xYrRR6/gDMXipu4iyPM9ej8MM2DZc6Cu7eRIAxBhg1rZnVSHpZjZ Nuk0/Q2Pbc1DFqdid/v4zkX4V+sepmBeXHeiuzpEQ7d9c28e5Ix6Qro0N MN+yPp8WRkqqoRsrzIWNMJZwhPeYVy1j7rWEpx/J47NIgYld9al555cT4 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10197"; a="263123889" X-IronPort-AV: E=Sophos;i="5.88,205,1635231600"; d="scan'208";a="263123889" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2021 06:13:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,205,1635231600"; d="scan'208";a="465104210" Received: from silpixa00401120.ir.intel.com ([10.55.129.95]) by orsmga006.jf.intel.com with ESMTP; 14 Dec 2021 06:13:02 -0800 From: Ronan Randles To: dev@dpdk.org Cc: harry.van.haaren@intel.com, Ronan Randles Subject: [PATCH 12/12] examples/generator: line rate limiting Date: Tue, 14 Dec 2021 14:12:42 +0000 Message-Id: <20211214141242.3383831-13-ronan.randles@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214141242.3383831-1-ronan.randles@intel.com> References: <20211214141242.3383831-1-ronan.randles@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- examples/generator/main.c | 77 +++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/examples/generator/main.c b/examples/generator/main.c index f11110e528..3847cde755 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; @@ -205,9 +206,11 @@ 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; /* Ensure all available ports are up before generating packets */ uint16_t nb_eth_ports = rte_eth_dev_count_avail(); @@ -221,34 +224,52 @@ lcore_producer(void *arg) 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; @@ -298,7 +319,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, @@ -333,12 +353,11 @@ tele_gen_mpps(const char *cmd, const char *params, struct rte_tel_data *d) struct gen_args *args = telemetry_userdata.prod; RTE_SET_USED(cmd); if (params) { - rte_tel_data_add_dict_int(d, "TEST", - (args->measured_tx_pps/1000000)); + 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, "mpps", - (args->measured_tx_pps/1000000)); + rte_tel_data_add_dict_int(d, "mpps", args->target_tx_pps); return 0; } @@ -425,6 +444,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);