Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104775/?format=api
{ "id": 104775, "url": "http://patchwork.dpdk.org/api/patches/104775/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20211130064147.1023321-2-rkudurumalla@marvell.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": "<20211130064147.1023321-2-rkudurumalla@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211130064147.1023321-2-rkudurumalla@marvell.com", "date": "2021-11-30T06:41:47", "name": "[2/2] common/cnxk: update meter algorithm in band profile", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ffdcd840dc5377ba75902e000b99a7dac350fd7e", "submitter": { "id": 2289, "url": "http://patchwork.dpdk.org/api/people/2289/?format=api", "name": "Rakesh Kudurumalla", "email": "rkudurumalla@marvell.com" }, "delegate": { "id": 310, "url": "http://patchwork.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20211130064147.1023321-2-rkudurumalla@marvell.com/mbox/", "series": [ { "id": 20813, "url": "http://patchwork.dpdk.org/api/series/20813/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=20813", "date": "2021-11-30T06:41:46", "name": "[1/2] net/cnxk: update meter bpf ID in rq", "version": 1, "mbox": "http://patchwork.dpdk.org/series/20813/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/104775/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/104775/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 5EBC8A0C58;\n\tTue, 30 Nov 2021 07:42:30 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4BA0240DF7;\n\tTue, 30 Nov 2021 07:42:30 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173])\n by mails.dpdk.org (Postfix) with ESMTP id 59DA14068B\n for <dev@dpdk.org>; Tue, 30 Nov 2021 07:42:29 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id\n 1AU3f6EC017637\n for <dev@dpdk.org>; Mon, 29 Nov 2021 22:42:28 -0800", "from dc5-exch01.marvell.com ([199.233.59.181])\n by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3cmtkpmw5u-2\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Mon, 29 Nov 2021 22:42:28 -0800", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Mon, 29 Nov 2021 22:42:25 -0800", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Mon, 29 Nov 2021 22:42:25 -0800", "from localhost.localdomain (unknown [10.28.48.103])\n by maili.marvell.com (Postfix) with ESMTP id 14E4F3F7061;\n Mon, 29 Nov 2021 22:42:23 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=iznZdd8ubPZ3iarm6fApstuSjmaaB7zAr+phnsH+vjY=;\n b=EoOdwztbpTAdaymrndqdFuSIvZM6gbrfZZb6MaXbqOKgNQq3C0X8Xw5BsPSS9ryNGmh5\n aLQQIbEpndaUjsh3m6c538Tkr0GClRFRm5G/hwf/ttpEikcCsg3PbUPHM6c3gyrxs+7G\n RBKPWkc4rsmTh/Y0pEk/BPBRgDDSNKm0C4iMtxYYJXP8ABV3LQV3cE5bqTXKTKqI+K57\n 1lzjQaG5SQSK21Bpt5vt5cEI/+sK++kkM9WKYCD7s9k4pOng9YlycFOjARizbhRyyJ/S\n p0gTiCNzVzC9SurbCslFWihbvj4Gr3wkzgsN2XbDgU4edm7FtGXR8pfyeEj0mNM0oTj3 hA==", "From": "Rakesh Kudurumalla <rkudurumalla@marvell.com>", "To": "Nithin Dabilpuram <ndabilpuram@marvell.com>, Kiran Kumar K\n <kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao\n <skoteshwar@marvell.com>", "CC": "<dev@dpdk.org>, Rakesh Kudurumalla <rkudurumalla@marvell.com>", "Subject": "[PATCH 2/2] common/cnxk: update meter algorithm in band profile", "Date": "Tue, 30 Nov 2021 12:11:47 +0530", "Message-ID": "<20211130064147.1023321-2-rkudurumalla@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211130064147.1023321-1-rkudurumalla@marvell.com>", "References": "<20211130064147.1023321-1-rkudurumalla@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "KCva1GysQwcoZkbF2wmyfK1U3EA1LW5T", "X-Proofpoint-ORIG-GUID": "KCva1GysQwcoZkbF2wmyfK1U3EA1LW5T", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475\n definitions=2021-11-30_05,2021-11-28_01,2020-04-07_01", "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": "Patch updates meter algorithm in nix band profile\nstructure\n\nSigned-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>\n---\n drivers/common/cnxk/hw/nix.h | 5 ---\n drivers/common/cnxk/roc_nix_bpf.c | 61 +++++++++----------------------\n 2 files changed, 17 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h\nindex dd2ebecc6a..6931f1d1d2 100644\n--- a/drivers/common/cnxk/hw/nix.h\n+++ b/drivers/common/cnxk/hw/nix.h\n@@ -2133,11 +2133,6 @@ struct nix_lso_format {\n \t((NIX_BPF_RATE_CONST * ((256 + (mantissa)) << (exponent))) / \\\n \t (((1ull << (div_exp)) * 256 * policer_timeunit)))\n \n-/* Meter rate limits in Bits/Sec */\n-#define NIX_BPF_RATE_MIN NIX_BPF_RATE(1000000000, 0, 0, 0)\n-#define NIX_BPF_RATE_MAX \\\n-\tNIX_BPF_RATE(1, NIX_BPF_MAX_RATE_EXPONENT, NIX_BPF_MAX_RATE_MANTISSA, 0)\n-\n #define NIX_BPF_DEFAULT_ADJUST_MANTISSA 511\n #define NIX_BPF_DEFAULT_ADJUST_EXPONENT 0\n \ndiff --git a/drivers/common/cnxk/roc_nix_bpf.c b/drivers/common/cnxk/roc_nix_bpf.c\nindex 6996a54be0..46ed91e87b 100644\n--- a/drivers/common/cnxk/roc_nix_bpf.c\n+++ b/drivers/common/cnxk/roc_nix_bpf.c\n@@ -38,48 +38,23 @@ meter_rate_to_nix(uint64_t value, uint64_t *exponent_p, uint64_t *mantissa_p,\n \t\t uint64_t *div_exp_p, uint32_t timeunit_p)\n {\n \tuint64_t div_exp, exponent, mantissa;\n-\tuint32_t time_us = timeunit_p;\n+\tuint32_t time_ns = timeunit_p;\n \n \t/* Boundary checks */\n-\tif (value < NIX_BPF_RATE_MIN || value > NIX_BPF_RATE_MAX)\n+\tif (value < NIX_BPF_RATE(time_ns, 0, 0, 0) ||\n+\t value > NIX_BPF_RATE(time_ns, NIX_BPF_MAX_RATE_EXPONENT,\n+\t\t\t\t NIX_BPF_MAX_RATE_MANTISSA, 0))\n \t\treturn 0;\n \n-\tif (value <= NIX_BPF_RATE(time_us, 0, 0, 0)) {\n-\t\t/* Calculate rate div_exp and mantissa using\n-\t\t * the following formula:\n-\t\t *\n-\t\t * value = (2E6 * (256 + mantissa)\n-\t\t * / ((1 << div_exp) * 256))\n-\t\t */\n-\t\tdiv_exp = 0;\n-\t\texponent = 0;\n-\t\tmantissa = NIX_BPF_MAX_RATE_MANTISSA;\n-\n-\t\twhile (value < (NIX_BPF_RATE_CONST / (1 << div_exp)))\n-\t\t\tdiv_exp += 1;\n-\n-\t\twhile (value < ((NIX_BPF_RATE_CONST * (256 + mantissa)) /\n-\t\t\t\t((1 << div_exp) * 256)))\n-\t\t\tmantissa -= 1;\n-\t} else {\n-\t\t/* Calculate rate exponent and mantissa using\n-\t\t * the following formula:\n-\t\t *\n-\t\t * value = (2E6 * ((256 + mantissa) << exponent)) / 256\n-\t\t *\n-\t\t */\n-\t\tdiv_exp = 0;\n-\t\texponent = NIX_BPF_MAX_RATE_EXPONENT;\n-\t\tmantissa = NIX_BPF_MAX_RATE_MANTISSA;\n-\n-\t\twhile (value < (NIX_BPF_RATE_CONST * (1 << exponent)))\n-\t\t\texponent -= 1;\n-\n-\t\twhile (value <\n-\t\t ((NIX_BPF_RATE_CONST * ((256 + mantissa) << exponent)) /\n-\t\t\t256))\n-\t\t\tmantissa -= 1;\n-\t}\n+\tdiv_exp = 0;\n+\texponent = NIX_BPF_MAX_RATE_EXPONENT;\n+\tmantissa = NIX_BPF_MAX_RATE_MANTISSA;\n+\n+\twhile (value < (NIX_BPF_RATE(time_ns, exponent, 0, 0)))\n+\t\texponent -= 1;\n+\n+\twhile (value < (NIX_BPF_RATE(time_ns, exponent, mantissa, 0)))\n+\t\tmantissa -= 1;\n \n \tif (div_exp > NIX_BPF_MAX_RATE_DIV_EXP ||\n \t exponent > NIX_BPF_MAX_RATE_EXPONENT ||\n@@ -94,7 +69,7 @@ meter_rate_to_nix(uint64_t value, uint64_t *exponent_p, uint64_t *mantissa_p,\n \t\t*mantissa_p = mantissa;\n \n \t/* Calculate real rate value */\n-\treturn NIX_BPF_RATE(time_us, exponent, mantissa, div_exp);\n+\treturn NIX_BPF_RATE(time_ns, exponent, mantissa, div_exp);\n }\n \n static inline uint64_t\n@@ -195,11 +170,7 @@ nix_precolor_conv_table_write(struct roc_nix *roc_nix, uint64_t val,\n \tint64_t *addr;\n \n \taddr = PLT_PTR_ADD(nix->base, off);\n-\t/* FIXME: Currently writing to this register throwing kernel dump.\n-\t * plt_write64(val, addr);\n-\t */\n-\tPLT_SET_USED(val);\n-\tPLT_SET_USED(addr);\n+\tplt_write64(val, addr);\n }\n \n static uint8_t\n@@ -665,6 +636,7 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,\n \n \taq->prof.lmode = cfg->lmode;\n \taq->prof.icolor = cfg->icolor;\n+\taq->prof.meter_algo = cfg->alg;\n \taq->prof.pc_mode = cfg->pc_mode;\n \taq->prof.tnl_ena = cfg->tnl_ena;\n \taq->prof.gc_action = cfg->action[ROC_NIX_BPF_COLOR_GREEN];\n@@ -673,6 +645,7 @@ roc_nix_bpf_config(struct roc_nix *roc_nix, uint16_t id,\n \n \taq->prof_mask.lmode = ~(aq->prof_mask.lmode);\n \taq->prof_mask.icolor = ~(aq->prof_mask.icolor);\n+\taq->prof_mask.meter_algo = ~(aq->prof_mask.meter_algo);\n \taq->prof_mask.pc_mode = ~(aq->prof_mask.pc_mode);\n \taq->prof_mask.tnl_ena = ~(aq->prof_mask.tnl_ena);\n \taq->prof_mask.gc_action = ~(aq->prof_mask.gc_action);\n", "prefixes": [ "2/2" ] }