Patch Detail

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

{
    "id": 43815,
    "url": "http://patches.dpdk.org/api/patches/43815/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1535026093-101872-6-git-send-email-ciara.power@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": "<1535026093-101872-6-git-send-email-ciara.power@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1535026093-101872-6-git-send-email-ciara.power@intel.com",
    "date": "2018-08-23T12:08:07",
    "name": "[05/11] telemetry: update metrics before sending stats",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "82f0902a7814e1c904e8d06d0603154256a12e8f",
    "submitter": {
        "id": 978,
        "url": "http://patches.dpdk.org/api/people/978/?format=api",
        "name": "Power, Ciara",
        "email": "ciara.power@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/1535026093-101872-6-git-send-email-ciara.power@intel.com/mbox/",
    "series": [
        {
            "id": 1038,
            "url": "http://patches.dpdk.org/api/series/1038/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1038",
            "date": "2018-08-23T12:08:02",
            "name": "introduce telemetry library",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/1038/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/43815/comments/",
    "check": "fail",
    "checks": "http://patches.dpdk.org/api/patches/43815/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B097A4F98;\n\tThu, 23 Aug 2018 14:08:38 +0200 (CEST)",
            "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby dpdk.org (Postfix) with ESMTP id 3C6BA2C4F\n\tfor <dev@dpdk.org>; Thu, 23 Aug 2018 14:08:32 +0200 (CEST)",
            "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Aug 2018 05:08:31 -0700",
            "from silpixa00399503.ir.intel.com ([10.237.222.102])\n\tby fmsmga005.fm.intel.com with ESMTP; 23 Aug 2018 05:08:30 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.53,278,1531810800\"; d=\"scan'208\";a=\"256613854\"",
        "From": "Ciara Power <ciara.power@intel.com>",
        "To": "harry.van.haaren@intel.com, brian.archbold@intel.com,\n\temma.kenny@intel.com, ciara.power@intel.com",
        "Cc": "dev@dpdk.org",
        "Date": "Thu, 23 Aug 2018 13:08:07 +0100",
        "Message-Id": "<1535026093-101872-6-git-send-email-ciara.power@intel.com>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "<1535026093-101872-1-git-send-email-ciara.power@intel.com>",
        "References": "<1535026093-101872-1-git-send-email-ciara.power@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 05/11] telemetry: update metrics before sending\n\tstats",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "This patch adds functionality to update the statistics in\nthe metrics library with values from the ethdev stats.\n\nValues need to be updated before they are encoded into a JSON\nmessage and sent to the client that requested them. The JSON encoding\nwill be added in a subsequent patch.\n\nSigned-off-by: Ciara Power <ciara.power@intel.com>\nSigned-off-by: Brian Archbold <brian.archbold@intel.com>\n---\n lib/librte_telemetry/rte_telemetry.c          | 128 ++++++++++++++++++++++++++\n lib/librte_telemetry/rte_telemetry_internal.h |   4 +\n lib/librte_telemetry/rte_telemetry_parser.c   |  19 ++++\n 3 files changed, 151 insertions(+)",
    "diff": "diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c\nindex c6c6612..bd09374 100644\n--- a/lib/librte_telemetry/rte_telemetry.c\n+++ b/lib/librte_telemetry/rte_telemetry.c\n@@ -40,6 +40,74 @@ rte_telemetry_check_port_activity(int port_id)\n \treturn 0;\n }\n \n+static int32_t\n+rte_telemetry_update_metrics_ethdev(struct telemetry_impl *telemetry,\n+\tuint16_t port_id, int reg_start_index)\n+{\n+\tint ret, num_xstats, i;\n+\tstruct rte_eth_xstat *eth_xstats;\n+\n+\tif (!rte_eth_dev_is_valid_port(port_id)) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - port_id: %d is invalid\\n\", port_id);\n+\t\tret = rte_telemetry_send_error_response(telemetry, -EINVAL);\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\t\treturn -1;\n+\t}\n+\tret = rte_telemetry_check_port_activity(port_id);\n+\tif (ret < 1) {\n+\t\tret = rte_telemetry_send_error_response(telemetry, -EINVAL);\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\t\treturn -1;\n+\t}\n+\tnum_xstats = rte_eth_xstats_get(port_id, NULL, 0);\n+\tif (num_xstats < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - rte_eth_xstats_get(%u) failed:\"\n+\t\t\t\" %d\\n\", port_id, num_xstats);\n+\t\tret = rte_telemetry_send_error_response(telemetry, -EPERM);\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\t\treturn -1;\n+\t}\n+\teth_xstats = malloc(sizeof(struct rte_eth_xstat) * num_xstats);\n+\tif (eth_xstats == NULL) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Failed to malloc memory for \"\n+\t\t\t\"xstats\\n\");\n+\t\tret = rte_telemetry_send_error_response(telemetry, -ENOMEM);\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\t\treturn -1;\n+\t}\n+\tret = rte_eth_xstats_get(port_id, eth_xstats, num_xstats);\n+\tif (ret < 0 || ret > num_xstats) {\n+\t\tfree(eth_xstats);\n+\t\tTELEMETRY_LOG_ERR(\"Error - rte_eth_xstats_get(%u) len%i\"\n+\t\t\t\" failed: %d\\n\", port_id, num_xstats, ret);\n+\t\tret = rte_telemetry_send_error_response(telemetry, -EPERM);\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\t\treturn -1;\n+\t}\n+\tuint64_t xstats_values[num_xstats];\n+\n+\tfor (i = 0; i < num_xstats; i++)\n+\t\txstats_values[i] = eth_xstats[i].value;\n+\tret = rte_metrics_update_values(port_id, reg_start_index,\n+\t\t xstats_values, num_xstats);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Could not update metrics values\\n\");\n+\t\tret = rte_telemetry_send_error_response(telemetry, -EPERM);\n+\t\tif (ret < 0)\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\t\tfree(eth_xstats);\n+\t\treturn -1;\n+\t}\n+\n+\tfree(eth_xstats);\n+\treturn 0;\n+}\n+\n int32_t\n rte_telemetry_write_to_socket(struct telemetry_impl *telemetry,\n \tconst char *json_string)\n@@ -122,6 +190,66 @@ rte_telemetry_send_error_response(struct telemetry_impl *telemetry,\n \treturn 0;\n }\n \n+int32_t\n+rte_telemetry_send_ports_stats_values(uint32_t *metric_ids, int num_metric_ids,\n+\tuint32_t *port_ids, int num_port_ids, struct telemetry_impl *telemetry)\n+{\n+\tint ret;\n+\tif (!telemetry) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Invalid telemetry argument\\n\");\n+\t\treturn -1;\n+\t}\n+\tif (metric_ids == NULL) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Invalid metric_ids array\\n\");\n+\t\tgoto einval_fail;\n+\t}\n+\tif (num_metric_ids < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Invalid num_metric_ids, must be \"\n+\t\t\t\"positive\\n\");\n+\t\tgoto einval_fail;\n+\t}\n+\tif (port_ids == NULL) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Invalid port_ids array\\n\");\n+\t\tgoto einval_fail;\n+\t}\n+\tif (num_port_ids < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Invalid num_port_ids, must be \"\n+\t\t\t\"positive\\n\");\n+\t\tgoto einval_fail;\n+\t}\n+\n+\tint i;\n+\tfor (i = 0; i < num_port_ids; i++) {\n+\t\tif (!rte_eth_dev_is_valid_port(port_ids[i])) {\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - Port: %d invalid\\n\",\n+\t\t\t\tport_ids[i]);\n+\t\t\tgoto einval_fail;\n+\t\t}\n+\t\tret = rte_telemetry_update_metrics_ethdev(telemetry,\n+\t\t\tport_ids[i], telemetry->reg_index);\n+\t\tif (ret < 0) {\n+\t\t\tTELEMETRY_LOG_ERR(\"Error - failed to update ethdev \"\n+\t\t\t\t\"metrics\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t}\n+\n+\tchar *json_buffer = NULL;\n+\tret = rte_telemetry_write_to_socket(telemetry, json_buffer);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Could not write to socket\\n\");\n+\t\treturn -1;\n+\t}\n+\treturn 0;\n+\n+einval_fail:\n+\tret = rte_telemetry_send_error_response(telemetry, -EINVAL);\n+\tif (ret < 0)\n+\t\tTELEMETRY_LOG_ERR(\"Error - Could not send error\\n\");\n+\treturn -1;\n+}\n+\n+\n static int32_t\n rte_telemetry_reg_ethdev_to_metrics(uint16_t port_id)\n {\ndiff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h\nindex b057794..ef417f2 100644\n--- a/lib/librte_telemetry/rte_telemetry_internal.h\n+++ b/lib/librte_telemetry/rte_telemetry_internal.h\n@@ -61,4 +61,8 @@ rte_telemetry_unregister_client(struct telemetry_impl *telemetry,\n int32_t\n rte_telemetry_check_port_activity(int port_id);\n \n+int32_t\n+rte_telemetry_send_ports_stats_values(uint32_t *metric_ids, int num_metric_ids,\n+\tuint32_t *port_ids, int num_port_ids, struct telemetry_impl *telemetry);\n+\n #endif\ndiff --git a/lib/librte_telemetry/rte_telemetry_parser.c b/lib/librte_telemetry/rte_telemetry_parser.c\nindex 571c991..4c50e41 100644\n--- a/lib/librte_telemetry/rte_telemetry_parser.c\n+++ b/lib/librte_telemetry/rte_telemetry_parser.c\n@@ -327,8 +327,10 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,\n \tconst char *stat_names[num_metrics];\n \tuint32_t stat_ids[num_metrics];\n \tint p;\n+\tuint32_t port_ids[RTE_MAX_ETHPORTS];\n \n \tRTE_ETH_FOREACH_DEV(p) {\n+\t\tport_ids[num_port_ids] = p;\n \t\tnum_port_ids++;\n \t}\n \tif (!num_port_ids) {\n@@ -351,6 +353,14 @@ rte_telemetry_command_ports_all_stat_values(struct telemetry_impl *telemetry,\n \t\tTELEMETRY_LOG_ERR(\"Error - Could not convert stat names to IDs\\n\");\n \t\tgoto fail;\n \t}\n+\n+\tret = rte_telemetry_send_ports_stats_values(stat_ids, num_metrics,\n+\t\tport_ids, num_port_ids, telemetry);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Sending ports stats values failed\\n\");\n+\t\tgoto fail;\n+\t}\n+\n \treturn 0;\n \n fail:\n@@ -451,6 +461,15 @@ rte_telemetry_command_ports_stats_values_by_name(struct telemetry_impl\n \t\t\t\"IDs\\n\");\n \t\treturn -1;\n \t}\n+\n+\tret = rte_telemetry_send_ports_stats_values(stat_ids, num_stat_names,\n+\t\tport_ids, num_port_ids, telemetry);\n+\tif (ret < 0) {\n+\t\tTELEMETRY_LOG_ERR(\"Error - Sending ports stats values \"\n+\t\t\t\"failed\\n\");\n+\t\treturn -1;\n+\t}\n+\n \treturn 0;\n }\n \n",
    "prefixes": [
        "05/11"
    ]
}