Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 105139,
    "url": "http://patches.dpdk.org/api/patches/105139/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211214141242.3383831-11-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-11-ronan.randles@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20211214141242.3383831-11-ronan.randles@intel.com",
    "date": "2021-12-14T14:12:40",
    "name": "[10/12] examples/generator: telemetry support",
    "commit_ref": null,
    "pull_url": null,
    "state": "not-applicable",
    "archived": true,
    "hash": "cc42f22e14e06904505c7ae00a650cb13521b082",
    "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-11-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/105139/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/105139/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 C0CFFA00C3;\n\tTue, 14 Dec 2021 15:13:51 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5DC594116D;\n\tTue, 14 Dec 2021 15:13:13 +0100 (CET)",
            "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id BF2144113E\n for <dev@dpdk.org>; Tue, 14 Dec 2021 15:13:11 +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:10 -0800",
            "from silpixa00401120.ir.intel.com ([10.55.129.95])\n by orsmga006.jf.intel.com with ESMTP; 14 Dec 2021 06:13:00 -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=1639491192; x=1671027192;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=blrv1Ml9lglykgpd1bZI3k3TjycHzHs86fbrdnx7Lu0=;\n b=KS2QSKhkgsNv/Uhncu9OPqgO8CJfyRCOQrmql88+T05vAc7v04+dyCHZ\n 0Ch4WvNG7vEOCkAF3C/cW90EOBV2PEWukYu5zRM8hhJVTGS7gAuFBpIVi\n Dgl1PzYsvH0PqeA1hqw0FQqTOc+f02fH+woWS/NRAwe8YVc743LXznx54\n HzCjxQ9S2t3ckDty6KOXwS5W+/5QVqJOLev2qdMNTVGpkD5GosZfRXM98\n pndV8RaJV+r/ppOiFTsbEE0U/iwn3X11r4rHeZiAvwpjeM8Vf9vEdgHTG\n qajbifYhCgBiDPNlhH5VPf5RX1YsU0NxcfhTTCbbmNA9BV7v9zP2csfTH Q==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6200,9189,10197\"; a=\"263123883\"",
            "E=Sophos;i=\"5.88,205,1635231600\"; d=\"scan'208\";a=\"263123883\"",
            "E=Sophos;i=\"5.88,205,1635231600\"; d=\"scan'208\";a=\"465104177\""
        ],
        "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 10/12] examples/generator: telemetry support",
        "Date": "Tue, 14 Dec 2021 14:12:40 +0000",
        "Message-Id": "<20211214141242.3383831-11-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 adds telemetry introducing the callback functions\nand returning measured values\n\nSigned-off-by: Ronan Randles <ronan.randles@intel.com>\n---\n examples/generator/main.c | 159 ++++++++++++++++++++++++++++++++------\n 1 file changed, 135 insertions(+), 24 deletions(-)",
    "diff": "diff --git a/examples/generator/main.c b/examples/generator/main.c\nindex 1ddf4c1603..2525d34b6e 100644\n--- a/examples/generator/main.c\n+++ b/examples/generator/main.c\n@@ -13,6 +13,7 @@\n #include <rte_lcore.h>\n #include <rte_mbuf.h>\n #include <rte_gen.h>\n+#include <rte_telemetry.h>\n \n #define RX_RING_SIZE 1024\n #define TX_RING_SIZE 1024\n@@ -32,6 +33,29 @@ static volatile int done;\n static struct rte_mempool *mbuf_pool;\n struct rte_gen *gen;\n \n+struct gen_args {\n+\t/* Inputs */\n+\tstruct rte_gen *gen;\n+\n+\t/* Outputs */\n+\tuint64_t tx_total_packets;\n+\tuint64_t rx_total_packets;\n+\tuint64_t rx_missed_total;\n+\tuint64_t tx_failed;\n+\tuint64_t last_tx_total;\n+\tuint64_t measured_tx_pps;\n+\n+\n+} __rte_cache_aligned;\n+/* Expose a struct as a global so the telemetry callbacks can access the\n+ * data required to provide stats etc.\n+ */\n+struct telemetry_userdata {\n+\tstruct gen_args *prod;\n+\tstruct gen_args *cons;\n+};\n+static struct telemetry_userdata telemetry_userdata;\n+\n static void handle_sigint(int sig);\n \n /* Initializes a given port using global settings and with the RX buffers\n@@ -123,10 +147,11 @@ port_init(uint16_t port, struct rte_mempool *mbuf_pool)\n  * an input port and writing to an output port.\n  */\n static int\n-lcore_producer(__rte_unused void *arg)\n+lcore_producer(void *arg)\n {\n+\tstruct gen_args *args = arg;\n+\tstruct rte_gen *gen = args->gen;\n \tuint16_t port;\n-\n \t/* Check that the port is on the same NUMA node as the polling thread\n \t * for best performance.\n \t */\n@@ -138,25 +163,34 @@ lcore_producer(__rte_unused void *arg)\n \t\t\t\t\t\"polling thread.\\n\\tPerformance will \"\n \t\t\t\t\t\"not be optimal.\\n\", port);\n \n+\tuint64_t tsc_hz = rte_get_tsc_hz();\n+\tuint64_t last_tsc_reading = 0;\n+\tuint64_t last_tx_total = 0;\n+\n \t/* Run until the application is quit or killed. */\n \twhile (!done) {\n \t\tstruct rte_mbuf *bufs[BURST_SIZE];\n-\t\tint i;\n+\t\tuint16_t nb_tx = 0;\n \t\t/* Receive packets from gen and then tx them over port */\n \t\tRTE_ETH_FOREACH_DEV(port) {\n-\t\t\tint nb_recieved = rte_gen_rx_burst(gen, bufs,\n+\t\t\tint nb_generated = rte_gen_rx_burst(gen, bufs,\n \t\t\t\t\t\t\tBURST_SIZE);\n-\t\t\tfor (i = 0; i < nb_recieved; i++) {\n-\t\t\t\tbufs[i]->pkt_len = 64;\n-\t\t\t\tbufs[i]->data_len = 64;\n-\t\t\t}\n \n-\t\t\tuint16_t nb_tx = rte_eth_tx_burst(port, 0, bufs,\n-\t\t\t\t\t\t\tnb_recieved);\n-\t\t\tif (nb_tx != nb_recieved)\n-\t\t\t\trte_pktmbuf_free_bulk(&bufs[nb_tx],\n-\t\t\t\t\t\t\t(nb_recieved - nb_tx));\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\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\t}\n \t\t\tif (unlikely(nb_tx == 0))\n \t\t\t\tcontinue;\n \n@@ -169,10 +203,11 @@ lcore_producer(__rte_unused void *arg)\n  * an input port and writing to an output port.\n  */\n static int\n-lcore_consumer(__rte_unused void *arg)\n+lcore_consumer(void *arg)\n {\n+\tstruct gen_args *args = arg;\n+\tstruct rte_gen *gen = args->gen;\n \tuint16_t port;\n-\n \t/* Check that the port is on the same NUMA node as the polling thread\n \t * for best performance.\n \t */\n@@ -195,16 +230,16 @@ lcore_consumer(__rte_unused void *arg)\n \t\t\tuint64_t latency[BURST_SIZE];\n \t\t\tuint16_t nb_rx = rte_eth_rx_burst(port, 0, bufs,\n \t\t\t\t\t\t\tBURST_SIZE);\n-\t\t\trte_gen_tx_burst(gen, bufs, latency, nb_rx);\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 \t\t\t\t\t\t\tlatency, nb_rx);\n \t\t\tif (nb_sent != nb_rx)\n \t\t\t\trte_panic(\"invalid tx quantity\\n\");\n \n-\t\t\tif (unlikely(nb_rx == 0))\n-\t\t\t\tcontinue;\n-\n \t\t}\n \t}\n \treturn 0;\n@@ -217,6 +252,58 @@ void handle_sigint(int sig)\n \tdone = 1;\n }\n \n+static int\n+tele_gen_packet(const char *cmd, const char *params, struct rte_tel_data *d)\n+{\n+\tRTE_SET_USED(cmd);\n+\tRTE_SET_USED(params);\n+\tRTE_SET_USED(d);\n+\n+\trte_tel_data_string(d, \"Ether()/IP()\");\n+\treturn 0;\n+}\n+\n+static int\n+tele_gen_mpps(const char *cmd, const char *params, struct rte_tel_data *d)\n+{\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}\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+\treturn 0;\n+}\n+\n+static int\n+tele_gen_stats(const char *cmd, const char *params, struct rte_tel_data *d)\n+{\n+\tRTE_SET_USED(cmd);\n+\tRTE_SET_USED(params);\n+\n+\tstruct gen_args *args_prod = telemetry_userdata.prod;\n+\tstruct gen_args *args_cons = telemetry_userdata.cons;\n+\trte_tel_data_start_dict(d);\n+\tstatic const char * const stats[] = {\n+\t\t\"tx_total_packets\",\n+\t\t\"rx_total_packets\",\n+\t\t\"measured_tx_pps\"\n+\t};\n+\n+\tuint64_t values[RTE_DIM(stats)] = {0};\n+\tvalues[0] = args_prod->tx_total_packets;\n+\tvalues[1] = args_cons->rx_total_packets;\n+\tvalues[2] = args_prod->measured_tx_pps;\n+\n+\tuint32_t i;\n+\tfor (i = 0; i < RTE_DIM(stats); i++)\n+\t\trte_tel_data_add_dict_int(d, stats[i], values[i]);\n+\n+\treturn 0;\n+}\n /* The main function, which does initialization and calls the per-lcore\n  * functions.\n  */\n@@ -224,6 +311,10 @@ int\n main(int argc, char *argv[])\n {\n \tsignal(SIGINT, handle_sigint);\n+\n+\t#define CORE_COUNT 2\n+\tstruct gen_args core_launch_args[CORE_COUNT];\n+\n \tunsigned int nb_ports;\n \tuint16_t portid;\n \n@@ -253,7 +344,7 @@ main(int argc, char *argv[])\n \t\t\trte_exit(EXIT_FAILURE, \"Cannot init port %\"PRIu16 \"\\n\",\n \t\t\t\t\tportid);\n \n-\tgen = rte_gen_create(mbuf_pool);\n+\tstruct rte_gen *gen = rte_gen_create(mbuf_pool);\n \tif (!gen)\n \t\trte_panic(\"Gen failed to initialize\\n\");\n \n@@ -261,19 +352,39 @@ main(int argc, char *argv[])\n \tif (err)\n \t\trte_panic(\"Failed to parse input args\");\n \n+\tmemset(core_launch_args, 0, sizeof(struct gen_args) * CORE_COUNT);\n \t/* launch lcore functions */\n \tuint32_t lcore_count = 0;\n \tuint32_t lcore_id = 0;\n \tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n-\t\tif (lcore_count == 0)\n-\t\t\trte_eal_remote_launch(lcore_producer, NULL, lcore_id);\n-\t\telse if (lcore_count == 1)\n-\t\t\trte_eal_remote_launch(lcore_consumer, NULL, lcore_id);\n+\t\tcore_launch_args[lcore_count].gen = gen;\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\trte_eal_remote_launch(lcore_producer,\n+\t\t\t\t\t      telemetry_userdata.prod,\n+\t\t\t\t\t      lcore_id);\n+\t\t} else if (lcore_count == 1) {\n+\t\t\ttelemetry_userdata.cons =\n+\t\t\t\t\t\t&core_launch_args[lcore_count];\n+\t\t\trte_eal_remote_launch(lcore_consumer,\n+\t\t\t\t\t      telemetry_userdata.cons,\n+\t\t\t\t\t      lcore_id);\n+\t\t}\n \t\telse\n \t\t\tbreak;\n \n \t\tlcore_count++;\n \t}\n+\n+\t/* Export stats via Telemetry */\n+\trte_telemetry_register_cmd(\"/gen/stats\", tele_gen_stats,\n+\t\t\t\"Return statistics of the Gen instance.\");\n+\trte_telemetry_register_cmd(\"/gen/packet\", tele_gen_packet,\n+\t\t\t\"Return the Gen string packet being sent.\");\n+\trte_telemetry_register_cmd(\"/gen/mpps\", tele_gen_mpps,\n+\t\t\t\"Get/Set the mpps rate\");\n+\n \t/* Stall the main thread until all other threads have returned. */\n \trte_eal_mp_wait_lcore();\n \n",
    "prefixes": [
        "10/12"
    ]
}