Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105141/?format=api
{ "id": 105141, "url": "http://patches.dpdk.org/api/patches/105141/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211214141242.3383831-13-ronan.randles@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20211214141242.3383831-13-ronan.randles@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211214141242.3383831-13-ronan.randles@intel.com", "date": "2021-12-14T14:12:42", "name": "[12/12] examples/generator: line rate limiting", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "08e5d3fceee2396481ef1bc636026ddc2c16f53b", "submitter": { "id": 2439, "url": "http://patches.dpdk.org/api/people/2439/?format=api", "name": "Ronan Randles", "email": "ronan.randles@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20211214141242.3383831-13-ronan.randles@intel.com/mbox/", "series": [ { "id": 20944, "url": "http://patches.dpdk.org/api/series/20944/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20944", "date": "2021-12-14T14:12:30", "name": "add packet generator library and example app", "version": 1, "mbox": "http://patches.dpdk.org/series/20944/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/105141/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/105141/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BAA6BA00C3;\n\tTue, 14 Dec 2021 15:14:03 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 55C9E41165;\n\tTue, 14 Dec 2021 15:13:16 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id 433204113E\n for <dev@dpdk.org>; Tue, 14 Dec 2021 15:13:13 +0100 (CET)", "from orsmga006.jf.intel.com ([10.7.209.51])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 14 Dec 2021 06:13:11 -0800", "from silpixa00401120.ir.intel.com ([10.55.129.95])\n by orsmga006.jf.intel.com with ESMTP; 14 Dec 2021 06:13:02 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=simple/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1639491193; x=1671027193;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=CdycJcAYeHM3OgHS/fagPgCLHQVDaTX4QYJINF2j4I0=;\n b=ZGqfstuqs/SM3qt0Cvl0BbqQhz3SeWS//w/bdMqn8CTcU6k4WkIYjcG0\n Mb/6KZnLKajPTO+5uF+ZD5xDNbZtTroeVv6RCxg6P0Ug63BttRiu4PO0d\n 8m2RLpo0KurXM04ANPIB0R6sts9sC1G/z0jFyshoout5od6tgWES65pNc\n Ejw0/xYrRR6/gDMXipu4iyPM9ej8MM2DZc6Cu7eRIAxBhg1rZnVSHpZjZ\n Nuk0/Q2Pbc1DFqdid/v4zkX4V+sepmBeXHeiuzpEQ7d9c28e5Ix6Qro0N\n MN+yPp8WRkqqoRsrzIWNMJZwhPeYVy1j7rWEpx/J47NIgYld9al555cT4 g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10197\"; a=\"263123889\"", "E=Sophos;i=\"5.88,205,1635231600\"; d=\"scan'208\";a=\"263123889\"", "E=Sophos;i=\"5.88,205,1635231600\"; d=\"scan'208\";a=\"465104210\"" ], "X-ExtLoop1": "1", "From": "Ronan Randles <ronan.randles@intel.com>", "To": "dev@dpdk.org", "Cc": "harry.van.haaren@intel.com,\n\tRonan Randles <ronan.randles@intel.com>", "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", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "This commit introduces line rate limiting using a token passing method.\nThe target traffic rate default is currently hard coded, this can be set\nusing telemetry.\n\nSigned-off-by: Ronan Randles <ronan.randles@intel.com>\n---\n examples/generator/main.c | 77 +++++++++++++++++++++++++--------------\n 1 file changed, 49 insertions(+), 28 deletions(-)", "diff": "diff --git a/examples/generator/main.c b/examples/generator/main.c\nindex f11110e528..3847cde755 100644\n--- a/examples/generator/main.c\n+++ b/examples/generator/main.c\n@@ -40,6 +40,7 @@ struct rte_gen *gen;\n struct gen_args {\n \t/* Inputs */\n \tstruct rte_gen *gen;\n+\tuint64_t target_tx_pps;\n \n \t/* Outputs */\n \tuint64_t tx_total_packets;\n@@ -205,9 +206,11 @@ lcore_producer(void *arg)\n \t\t\t\t\t\"not be optimal.\\n\", port);\n \n \tuint64_t tsc_hz = rte_get_tsc_hz();\n+\tfloat tsc_hz_f = (float)tsc_hz;\n \tuint64_t last_tsc_reading = 0;\n \tuint64_t last_tx_total = 0;\n \tuint16_t nb_tx = 0;\n+\tfloat tokens = 0;\n \n \t/* Ensure all available ports are up before generating packets */\n \tuint16_t nb_eth_ports = rte_eth_dev_count_avail();\n@@ -221,34 +224,52 @@ lcore_producer(void *arg)\n \tif (!done)\n \t\tprintf(\"Generating packets...\\n\");\n \n+\tuint64_t token_last_add_tsc = rte_rdtsc();\n+\n \t/* Run until the application is quit or killed. */\n \twhile (!done) {\n-\n \t\tstruct rte_mbuf *bufs[BURST_SIZE];\n-\t\t/* Receive packets from gen and then tx them over port */\n-\n-\t\tRTE_ETH_FOREACH_DEV(port) {\n-\t\t\tint nb_generated = rte_gen_rx_burst(gen, bufs,\n-\t\t\t\t\t\t\tBURST_SIZE);\n-\n-\t\t\tuint64_t start_tsc = rte_rdtsc();\n-\t\t\tif (start_tsc > last_tsc_reading + tsc_hz) {\n-\t\t\t\targs->measured_tx_pps = args->tx_total_packets -\n-\t\t\t\t\t\t\t\tlast_tx_total;\n-\t\t\t\tlast_tx_total = args->tx_total_packets;\n-\t\t\t\tlast_tsc_reading = start_tsc;\n+\t\t/* Track time since last token add and calculate number\n+\t\t * of tokens to give per second to implement line rate limiting\n+\t\t */\n+\t\tuint64_t now = rte_rdtsc();\n+\t\tuint64_t tsc_delta = now - token_last_add_tsc;\n+\t\tfloat token_scalar = (float)tsc_delta / tsc_hz_f;\n+\t\tfloat add_tokens = args->target_tx_pps * token_scalar;\n+\t\t/* If there are tokens to be added and we haven't exceeded\n+\t\t * the target rate then we add tokens\n+\t\t */\n+\t\tif (add_tokens > 1.f) {\n+\t\t\tif (tokens < args->target_tx_pps) {\n+\t\t\t\ttokens += add_tokens;\n+\t\t\t\ttoken_last_add_tsc = now;\n \t\t\t}\n-\t\t\tnb_tx = rte_eth_tx_burst(port, 0, bufs, nb_generated);\n-\t\t\targs->tx_total_packets += nb_tx;\n-\n-\t\t\tuint64_t tx_failed = nb_generated - nb_tx;\n-\t\t\tif (nb_tx != nb_generated) {\n-\t\t\t\trte_pktmbuf_free_bulk(&bufs[nb_tx], tx_failed);\n-\t\t\t\targs->tx_failed += tx_failed;\n+\t\t}\n+\t\t/* Receive packets from gen and then tx them over port */\n+\t\tif (tokens >= BURST_SIZE) {\n+\t\t\tRTE_ETH_FOREACH_DEV(port) {\n+\t\t\t\tint nb_generated = rte_gen_rx_burst(gen, bufs,\n+\t\t\t\t\t\t\t\tBURST_SIZE);\n+\n+\t\t\t\tuint64_t start_tsc = rte_rdtsc();\n+\t\t\t\tif (start_tsc > last_tsc_reading + tsc_hz) {\n+\t\t\t\t\targs->measured_tx_pps =\n+\t\t\t\t\targs->tx_total_packets - last_tx_total;\n+\t\t\t\t\tlast_tx_total = args->tx_total_packets;\n+\t\t\t\t\tlast_tsc_reading = start_tsc;\n+\t\t\t\t}\n+\t\t\t\tnb_tx = rte_eth_tx_burst(port, 0, bufs,\n+\t\t\t\t\t\t\t\tnb_generated);\n+\t\t\t\targs->tx_total_packets += nb_tx;\n+\t\t\t\ttokens -= nb_tx;\n+\n+\t\t\t\tuint64_t tx_failed = nb_generated - nb_tx;\n+\t\t\t\tif (nb_tx != nb_generated) {\n+\t\t\t\t\trte_pktmbuf_free_bulk(&bufs[nb_tx],\n+\t\t\t\t\t\t\t\ttx_failed);\n+\t\t\t\t\targs->tx_failed += tx_failed;\n+\t\t\t\t}\n \t\t\t}\n-\t\t\tif (unlikely(nb_tx == 0))\n-\t\t\t\tcontinue;\n-\n \t\t}\n \t}\n \treturn 0;\n@@ -298,7 +319,6 @@ lcore_consumer(void *arg)\n \t\t\t\t\t\t\tBURST_SIZE);\n \t\t\tif (unlikely(nb_rx == 0))\n \t\t\t\tcontinue;\n-\n \t\t\targs->rx_total_packets += nb_rx;\n \n \t\t\tint nb_sent = rte_gen_tx_burst(gen, bufs,\n@@ -333,12 +353,11 @@ tele_gen_mpps(const char *cmd, const char *params, struct rte_tel_data *d)\n \tstruct gen_args *args = telemetry_userdata.prod;\n \tRTE_SET_USED(cmd);\n \tif (params) {\n-\t\trte_tel_data_add_dict_int(d, \"TEST\",\n-\t\t\t\t\t(args->measured_tx_pps/1000000));\n+\t\targs->target_tx_pps = atoi(params) * 1000000;\n+\t\tprintf(\"Packet rate set: %li\\n\", args->target_tx_pps);\n \t}\n \trte_tel_data_start_dict(d);\n-\trte_tel_data_add_dict_int(d, \"mpps\",\n-\t\t\t\t\t(args->measured_tx_pps/1000000));\n+\trte_tel_data_add_dict_int(d, \"mpps\", args->target_tx_pps);\n \treturn 0;\n }\n \n@@ -425,6 +444,8 @@ main(int argc, char *argv[])\n \t\tif (lcore_count == 0) {\n \t\t\ttelemetry_userdata.prod =\n \t\t\t\t\t\t&core_launch_args[lcore_count];\n+\t\t\t/* Default traffic rate */\n+\t\t\ttelemetry_userdata.prod->target_tx_pps = 20000000;\n \t\t\trte_eal_remote_launch(lcore_producer,\n \t\t\t\t\t telemetry_userdata.prod,\n \t\t\t\t\t lcore_id);\n", "prefixes": [ "12/12" ] }