Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104779/?format=api
{ "id": 104779, "url": "http://patchwork.dpdk.org/api/patches/104779/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20211130144226.40575-1-lance.richardson@broadcom.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20211130144226.40575-1-lance.richardson@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211130144226.40575-1-lance.richardson@broadcom.com", "date": "2021-11-30T14:42:26", "name": "net/bnxt: fix xstats get names implementation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ef20c2e33cbb851bd1fae3b34359f33731251bdf", "submitter": { "id": 1323, "url": "http://patchwork.dpdk.org/api/people/1323/?format=api", "name": "Lance Richardson", "email": "lance.richardson@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patchwork.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20211130144226.40575-1-lance.richardson@broadcom.com/mbox/", "series": [ { "id": 20816, "url": "http://patchwork.dpdk.org/api/series/20816/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=20816", "date": "2021-11-30T14:42:26", "name": "net/bnxt: fix xstats get names implementation", "version": 1, "mbox": "http://patchwork.dpdk.org/series/20816/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/104779/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/104779/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 4E72FA0C4C;\n\tTue, 30 Nov 2021 15:42:35 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A256341168;\n\tTue, 30 Nov 2021 15:42:34 +0100 (CET)", "from mail-pj1-f52.google.com (mail-pj1-f52.google.com\n [209.85.216.52]) by mails.dpdk.org (Postfix) with ESMTP id 230B741142\n for <dev@dpdk.org>; Tue, 30 Nov 2021 15:42:33 +0100 (CET)", "by mail-pj1-f52.google.com with SMTP id\n j5-20020a17090a318500b001a6c749e697so13975797pjb.1\n for <dev@dpdk.org>; Tue, 30 Nov 2021 06:42:33 -0800 (PST)", "from localhost.localdomain ([192.19.11.250])\n by smtp.gmail.com with ESMTPSA id c3sm22397738pfv.67.2021.11.30.06.42.31\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 30 Nov 2021 06:42:31 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com;\n s=google;\n h=from:to:cc:subject:date:message-id:mime-version;\n bh=NOyWU3H1HExDRg+UHDrjt9v3YY2RbK5lg9U+ujtFmGs=;\n b=JO9ezwrW5vEFB1U/1XFuzpUQDuFfk6O/4V6uoXlA2ZPyxGEejiJC5J0H1gKa8FlAqV\n 53Q4eaV1nFxjbUYtkiYzpsSXTDAjX1vLC+IImuUZvNfsnRTu2VNkEnGs5kiCLNvb3rEi\n ipy3QupYLYniEsfrB1ymgYxgeF1rgGXcAQhVw=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version;\n bh=NOyWU3H1HExDRg+UHDrjt9v3YY2RbK5lg9U+ujtFmGs=;\n b=MPLEhHsvNsqOr5t80xzeT9nl2fBx3Vq4upPhtXU0b19AFvsGznJe2zxSxJ+v3Rz3WO\n dK4YmgD2T5D00XCCb7tbhdA1YGgPUaF2vt4s4RkcPccz1f4Syt6qTc1VQbovrf+g0x+Z\n rJNC0gGCjEhEkqiwxijTEC5lWzzNII3WqOnHVXjBjNocvQXH0/rPqbqPw5ZpIgFzNYtV\n wQpiQ6Z3JPfrOfWWn2s1+t+UErl9KrZV7bOtXHYtrubvsNSWccD8lt5BKNykvVIrRiA6\n e8HdCpX2jm0qjL18wgMicOP0e5VtOhVtDp/MyYEEjuBsYRVgPVWMw1Ziq+XQ9m/ceP9w\n GC9g==", "X-Gm-Message-State": "AOAM5329jmRBgFRBA+7llsCcPQ1IGO2T9xiC49hJ9EqnXjriqR2E4q2l\n Bl62QEtJAC8lwHdCCS8Xrc40WQ==", "X-Google-Smtp-Source": "\n ABdhPJz865OhfGLVdDc6zvoKiw0rct/xVigONjMYDHDcazlazqOCL2JCBOjiVHHcs5LGBgpf+sw9Gw==", "X-Received": "by 2002:a17:902:a5c5:b0:143:c3cf:739b with SMTP id\n t5-20020a170902a5c500b00143c3cf739bmr68033929plq.9.1638283352127;\n Tue, 30 Nov 2021 06:42:32 -0800 (PST)", "From": "Lance Richardson <lance.richardson@broadcom.com>", "To": "Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>", "Cc": "dev@dpdk.org,\n\tstable@dpdk.org", "Subject": "[PATCH] net/bnxt: fix xstats get names implementation", "Date": "Tue, 30 Nov 2021 09:42:26 -0500", "Message-Id": "<20211130144226.40575-1-lance.richardson@broadcom.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Type": "multipart/signed; protocol=\"application/pkcs7-signature\";\n micalg=sha-256; boundary=\"00000000000043c4db05d2029196\"", "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": "When the xstats_names parameter to rte_eth_xstats_get_names()\nis non-NULL and the size parameter is less than the required\nnumber of entries, the driver must return the required size\nwithout modifying (and over-running) the caller's xstats_names\narray.\n\nUpdate bnxt_dev_xstats_get_names_op() in accordance with this\nrequirement.\n\nFixes: bfb9c2260be2 (\"net/bnxt: support xstats get/reset\")\nCc: stable@dpdk.org\nSigned-off-by: Lance Richardson <lance.richardson@broadcom.com>\n---\n drivers/net/bnxt/bnxt_stats.c | 93 +++++++++++++++++------------------\n 1 file changed, 46 insertions(+), 47 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c\nindex 991eafc644..197fd7c02b 100644\n--- a/drivers/net/bnxt/bnxt_stats.c\n+++ b/drivers/net/bnxt/bnxt_stats.c\n@@ -846,7 +846,7 @@ int bnxt_flow_stats_cnt(struct bnxt *bp)\n \n int bnxt_dev_xstats_get_names_op(struct rte_eth_dev *eth_dev,\n \t\tstruct rte_eth_xstat_name *xstats_names,\n-\t\t__rte_unused unsigned int limit)\n+\t\tunsigned int size)\n {\n \tstruct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;\n \tconst unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) +\n@@ -862,63 +862,62 @@ int bnxt_dev_xstats_get_names_op(struct rte_eth_dev *eth_dev,\n \tif (rc)\n \t\treturn rc;\n \n-\tif (xstats_names != NULL) {\n-\t\tcount = 0;\n+\tif (xstats_names == NULL || size < stat_cnt)\n+\t\treturn stat_cnt;\n \n-\t\tfor (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) {\n-\t\t\tstrlcpy(xstats_names[count].name,\n-\t\t\t\tbnxt_rx_stats_strings[i].name,\n-\t\t\t\tsizeof(xstats_names[count].name));\n-\t\t\tcount++;\n-\t\t}\n+\tfor (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) {\n+\t\tstrlcpy(xstats_names[count].name,\n+\t\t\tbnxt_rx_stats_strings[i].name,\n+\t\t\tsizeof(xstats_names[count].name));\n+\t\tcount++;\n+\t}\n \n-\t\tfor (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) {\n-\t\t\tstrlcpy(xstats_names[count].name,\n-\t\t\t\tbnxt_tx_stats_strings[i].name,\n-\t\t\t\tsizeof(xstats_names[count].name));\n-\t\t\tcount++;\n-\t\t}\n+\tfor (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) {\n+\t\tstrlcpy(xstats_names[count].name,\n+\t\t\tbnxt_tx_stats_strings[i].name,\n+\t\t\tsizeof(xstats_names[count].name));\n+\t\tcount++;\n+\t}\n \n-\t\tfor (i = 0; i < RTE_DIM(bnxt_func_stats_strings); i++) {\n-\t\t\tstrlcpy(xstats_names[count].name,\n-\t\t\t\tbnxt_func_stats_strings[i].name,\n-\t\t\t\tsizeof(xstats_names[count].name));\n-\t\t\tcount++;\n-\t\t}\n+\tfor (i = 0; i < RTE_DIM(bnxt_func_stats_strings); i++) {\n+\t\tstrlcpy(xstats_names[count].name,\n+\t\t\tbnxt_func_stats_strings[i].name,\n+\t\t\tsizeof(xstats_names[count].name));\n+\t\tcount++;\n+\t}\n \n-\t\tfor (i = 0; i < RTE_DIM(bnxt_rx_ext_stats_strings); i++) {\n-\t\t\tstrlcpy(xstats_names[count].name,\n-\t\t\t\tbnxt_rx_ext_stats_strings[i].name,\n-\t\t\t\tsizeof(xstats_names[count].name));\n+\tfor (i = 0; i < RTE_DIM(bnxt_rx_ext_stats_strings); i++) {\n+\t\tstrlcpy(xstats_names[count].name,\n+\t\t\tbnxt_rx_ext_stats_strings[i].name,\n+\t\t\tsizeof(xstats_names[count].name));\n \n-\t\t\tcount++;\n-\t\t}\n+\t\tcount++;\n+\t}\n \n-\t\tfor (i = 0; i < RTE_DIM(bnxt_tx_ext_stats_strings); i++) {\n-\t\t\tstrlcpy(xstats_names[count].name,\n-\t\t\t\tbnxt_tx_ext_stats_strings[i].name,\n-\t\t\t\tsizeof(xstats_names[count].name));\n+\tfor (i = 0; i < RTE_DIM(bnxt_tx_ext_stats_strings); i++) {\n+\t\tstrlcpy(xstats_names[count].name,\n+\t\t\tbnxt_tx_ext_stats_strings[i].name,\n+\t\t\tsizeof(xstats_names[count].name));\n \n-\t\t\tcount++;\n-\t\t}\n+\t\tcount++;\n+\t}\n \n-\t\tif (bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_COUNTERS &&\n-\t\t bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_MGMT &&\n-\t\t BNXT_FLOW_XSTATS_EN(bp)) {\n-\t\t\tfor (i = 0; i < bp->max_l2_ctx; i++) {\n-\t\t\t\tchar buf[RTE_ETH_XSTATS_NAME_SIZE];\n+\tif (bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_COUNTERS &&\n+\t bp->fw_cap & BNXT_FW_CAP_ADV_FLOW_MGMT &&\n+\t BNXT_FLOW_XSTATS_EN(bp)) {\n+\t\tfor (i = 0; i < bp->max_l2_ctx; i++) {\n+\t\t\tchar buf[RTE_ETH_XSTATS_NAME_SIZE];\n \n-\t\t\t\tsprintf(buf, \"flow_%d_bytes\", i);\n-\t\t\t\tstrlcpy(xstats_names[count].name, buf,\n-\t\t\t\t\tsizeof(xstats_names[count].name));\n-\t\t\t\tcount++;\n+\t\t\tsprintf(buf, \"flow_%d_bytes\", i);\n+\t\t\tstrlcpy(xstats_names[count].name, buf,\n+\t\t\t\tsizeof(xstats_names[count].name));\n+\t\t\tcount++;\n \n-\t\t\t\tsprintf(buf, \"flow_%d_packets\", i);\n-\t\t\t\tstrlcpy(xstats_names[count].name, buf,\n-\t\t\t\t\tsizeof(xstats_names[count].name));\n+\t\t\tsprintf(buf, \"flow_%d_packets\", i);\n+\t\t\tstrlcpy(xstats_names[count].name, buf,\n+\t\t\t\tsizeof(xstats_names[count].name));\n \n-\t\t\t\tcount++;\n-\t\t\t}\n+\t\t\tcount++;\n \t\t}\n \t}\n \n", "prefixes": [] }