Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/67858/?format=api
{ "id": 67858, "url": "http://patches.dpdk.org/api/patches/67858/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200406085855.25773-3-i.dyukov@samsung.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": "<20200406085855.25773-3-i.dyukov@samsung.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200406085855.25773-3-i.dyukov@samsung.com", "date": "2020-04-06T08:58:00", "name": "[v9,2/5] net/virtio: add link speed devarg", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e7525f2f91e1034acd4f97c9f7970542a6e52633", "submitter": { "id": 783, "url": "http://patches.dpdk.org/api/people/783/?format=api", "name": "Ivan Dyukov", "email": "i.dyukov@samsung.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200406085855.25773-3-i.dyukov@samsung.com/mbox/", "series": [ { "id": 9208, "url": "http://patches.dpdk.org/api/series/9208/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9208", "date": "2020-04-06T08:57:58", "name": "net/virtio: add link speed devarg", "version": 9, "mbox": "http://patches.dpdk.org/series/9208/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/67858/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/67858/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 711F7A0577;\n\tMon, 6 Apr 2020 10:59:30 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id ECD981BEE1;\n\tMon, 6 Apr 2020 10:59:19 +0200 (CEST)", "from mailout1.w1.samsung.com (mailout1.w1.samsung.com\n [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 092D2F12\n for <dev@dpdk.org>; Mon, 6 Apr 2020 10:59:18 +0200 (CEST)", "from eucas1p1.samsung.com (unknown [182.198.249.206])\n by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id\n 20200406085917euoutp01bedbf78b28eadb33a99d171afa134791~DL1oKbSCb2568625686euoutp01n\n for <dev@dpdk.org>; Mon, 6 Apr 2020 08:59:17 +0000 (GMT)", "from eusmges3new.samsung.com (unknown [203.254.199.245]) by\n eucas1p2.samsung.com (KnoxPortal) with ESMTP id\n 20200406085917eucas1p2d19aa95ae67bd87941b9b66b04ab134c~DL1n1t4rg3059930599eucas1p2B;\n Mon, 6 Apr 2020 08:59:17 +0000 (GMT)", "from eucas1p2.samsung.com ( [182.198.249.207]) by\n eusmges3new.samsung.com (EUCPMTA) with SMTP id 14.56.60698.56FEA8E5; Mon, 6\n Apr 2020 09:59:17 +0100 (BST)", "from eusmtrp1.samsung.com (unknown [182.198.249.138]) by\n eucas1p1.samsung.com (KnoxPortal) with ESMTPA id\n 20200406085916eucas1p1e4b9a43f89e63e71aa877adca6046dc4~DL1nOTwM31458014580eucas1p1N;\n Mon, 6 Apr 2020 08:59:16 +0000 (GMT)", "from eusmgms1.samsung.com (unknown [182.198.249.179]) by\n eusmtrp1.samsung.com (KnoxPortal) with ESMTP id\n 20200406085916eusmtrp141172e0006755435036d54bc9315ed27~DL1nNmLus1258512585eusmtrp1B;\n Mon, 6 Apr 2020 08:59:16 +0000 (GMT)", "from eusmtip2.samsung.com ( [203.254.199.222]) by\n eusmgms1.samsung.com (EUCPMTA) with SMTP id 6B.FC.08375.46FEA8E5; Mon, 6\n Apr 2020 09:59:16 +0100 (BST)", "from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by\n eusmtip2.samsung.com (KnoxPortal) with ESMTPA id\n 20200406085915eusmtip21cb8f17e54c97864652b8d617f0a3841~DL1mr6Bl_2530225302eusmtip2W;\n Mon, 6 Apr 2020 08:59:15 +0000 (GMT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com\n 20200406085917euoutp01bedbf78b28eadb33a99d171afa134791~DL1oKbSCb2568625686euoutp01n", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;\n s=mail20170921; t=1586163557;\n bh=kjCql4u9252iZaMyyvDdJSv8maEhw1BXsfy/eMO+iD0=;\n h=From:To:Subject:Date:In-Reply-To:References:From;\n b=LlOtVcmou7ZUxxCmMgHVcvC1TOIX046LlrrYBYtwAhFWthJ+miPaB23gw7mFoaRwo\n oYIv5Y9WeWqFMhROGMgi6O57Z/feqfBfbj4h4yzyJLx7TwFol6haHcXslOgkTYYiDf\n oefCYDYnEx0cMiuHXhKQBTsO/U4Oli8bRoqW947M=", "X-AuditID": "cbfec7f5-a29ff7000001ed1a-b0-5e8aef65dfd6", "From": "Ivan Dyukov <i.dyukov@samsung.com>", "To": "dev@dpdk.org, maxime.coquelin@redhat.com, i.dyukov@samsung.com,\n v.kuramshin@samsung.com, amorenoz@redhat.com, zhihong.wang@intel.com,\n xiaolong.ye@intel.com, mb@smartsharesystems.com", "Date": "Mon, 6 Apr 2020 11:58:00 +0300", "Message-Id": "<20200406085855.25773-3-i.dyukov@samsung.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200406085855.25773-1-i.dyukov@samsung.com>", "X-Brightmail-Tracker": [ "\n H4sIAAAAAAAAA+NgFnrPIsWRmVeSWpSXmKPExsWy7djP87qp77viDLrPM1u07njAYvHu03Ym\n i1mXmtgtjnXuYbHo+3WV0eL0zc3sFn/emFpsvjiJyYHD49eCpawei/e8ZPJ4v+8qm0ffllWM\n HqcedTMHsEZx2aSk5mSWpRbp2yVwZSy/c5a1YJ5lxby/MxgbGLfodTFyckgImEh8vXKSrYuR\n i0NIYAWjRNOLi4wQzhdGiUefXrGDVAkJfGaU+HDXF6Zj0t8l7BBFy4HiC9uYIJyvjBK96zsZ\n QarYBDQkTnfMYwKxRQT2MkocO1PQxcjOISxgKTHXGCTKIqAqcXTRJVYQmxcoevN5KxPEfHmJ\n 1RsOMIPYnAJWElP2/GUBGS8h8J5N4uiqZqgiF4lnnxayQtjCEq+Ob2GHsGUkTk/uYYGwqyX2\n dL1lh2juYJT42rCVESJhL7Hl9TmgBAcHs4CmxPpd+iCmhICjxJlTThAmn8SNt4IgxcxA5qRt\n 05khwrwSHW1CEDOUJA6cvAQVlpD4+5sHIuwh8XvRXiZIoO1hlJh9x2QCo9wshE0LGBlXMYqn\n lhbnpqcWG+ellusVJ+YWl+al6yXn525iBCaD0/+Of93BuO9P0iFGAQ5GJR5ehtudcUKsiWXF\n lbmHGCU4mJVEeKV6gUK8KYmVValF+fFFpTmpxYcYpTlYlMR5jRe9jBUSSE8sSc1OTS1ILYLJ\n MnFwSjUwxq9m09Q9LGots9Ju78TGQ6KBLu2ba4wnHla5yDHfTz/Z2t2o+WDlkicvLpzkypL7\n /VVK6dqdWZdP9qyquJra1XAiqilC13x5YNSmuzyLvNO27F6RYrQ7nX1/lEqh9xrhiZ1SD7/L\n 7ah7v06lUFVqX2Ft3t8PFVFeE2T3Bt3PYO26fe/a5wtJSizFGYmGWsxFxYkAKp8kkQIDAAA=", "\n H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7op77viDBrWyFm07njAYvHu03Ym\n i1mXmtgtjnXuYbHo+3WV0eL0zc3sFn/emFpsvjiJyYHD49eCpawei/e8ZPJ4v+8qm0ffllWM\n HqcedTMHsEbp2RTll5akKmTkF5fYKkUbWhjpGVpa6BmZWOoZGpvHWhmZKunb2aSk5mSWpRbp\n 2yXoZSy/c5a1YJ5lxby/MxgbGLfodTFyckgImEhM+ruEvYuRi0NIYCmjxMV/Dxi7GDmAEhIS\n r58wQ9QIS/y51sUGYgsJfGaU6H4qAWKzCWhInO6YxwTSKyJwnFGid9Z/IIedQ1jAUmKuMUgJ\n i4CqxNFFl1hBbF6g6M3nrUwQI+UlVm84ADaeU8BKYsqevywgW4UEMiQ2PsybwMi7gJFhFaNI\n amlxbnpusaFecWJucWleul5yfu4mRmB4bjv2c/MOxksbgw8xCnAwKvHwMtzujBNiTSwrrsw9\n xCjBwawkwivVCxTiTUmsrEotyo8vKs1JLT7EaAp000RmKdHkfGDs5JXEG5oamltYGpobmxub\n WSiJ83YIHIwREkhPLEnNTk0tSC2C6WPi4JRqYGzrX8NxP7RYaobJi1tXV3TYT/xg9m356SXZ\n 7fEG51cYXLrTKX7lklfe5PNxfPUvzRO1TD4sOnfO4LEvx/LZD5P1xdNklryZ9uPa5HN57teC\n 3tyxlz2zrO63n5vSQuX3L7eWbmzx/MJ51nb+Ut7wbvnyy6+iHtleCl2osbFLkzGpQfuYUvDH\n GjElluKMREMt5qLiRADfmTIhZQIAAA==" ], "X-CMS-MailID": "20200406085916eucas1p1e4b9a43f89e63e71aa877adca6046dc4", "X-Msg-Generator": "CA", "Content-Type": "text/plain; charset=\"utf-8\"", "X-RootMTR": "20200406085916eucas1p1e4b9a43f89e63e71aa877adca6046dc4", "X-EPHeader": "CA", "CMS-TYPE": "201P", "X-CMS-RootMailID": "20200406085916eucas1p1e4b9a43f89e63e71aa877adca6046dc4", "References": "<20191212085012.9170-1-i.dyukov@samsung.com>\n <20200406085855.25773-1-i.dyukov@samsung.com>\n <CGME20200406085916eucas1p1e4b9a43f89e63e71aa877adca6046dc4@eucas1p1.samsung.com>", "Subject": "[dpdk-dev] [PATCH v9 2/5] net/virtio: add link speed devarg", "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 <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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Some applications like pktgen use link speed to calculate\ntransmission rate. It limits outcome traffic to hardcoded 10G.\n\nThis patch adds speed devarg which allows to configure\nlink speed of virtio device.\n\nSigned-off-by: Ivan Dyukov <i.dyukov@samsung.com>\n---\n doc/guides/nics/virtio.rst | 7 ++\n drivers/net/virtio/virtio_ethdev.c | 108 ++++++++++++++++++++++++-----\n drivers/net/virtio/virtio_pci.h | 1 +\n 3 files changed, 100 insertions(+), 16 deletions(-)", "diff": "diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst\nindex d1f5fb898..e579c6aa9 100644\n--- a/doc/guides/nics/virtio.rst\n+++ b/doc/guides/nics/virtio.rst\n@@ -356,6 +356,13 @@ Below devargs are supported by the PCI virtio driver:\n a virtio device needs to work in vDPA mode.\n (Default: 0 (disabled))\n \n+#. ``speed``:\n+\n+ It is used to specify link speed of virtio device, in units of 1Mb.\n+ Link speed is a part of link status structure. It could be requested\n+ by application using rte_eth_link_get_nowait function.\n+ (Default: 10000 (10G))\n+\n Below devargs are supported by the virtio-user vdev:\n \n #. ``path``:\ndiff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 870ff7801..eb46a5a11 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -45,6 +45,10 @@ static int virtio_dev_promiscuous_enable(struct rte_eth_dev *dev);\n static int virtio_dev_promiscuous_disable(struct rte_eth_dev *dev);\n static int virtio_dev_allmulticast_enable(struct rte_eth_dev *dev);\n static int virtio_dev_allmulticast_disable(struct rte_eth_dev *dev);\n+static uint32_t virtio_dev_speed_capa_get(uint32_t speed);\n+static int virtio_dev_devargs_parse(struct rte_devargs *devargs,\n+\tint *vdpa,\n+\tuint32_t *speed);\n static int virtio_dev_info_get(struct rte_eth_dev *dev,\n \t\t\t\tstruct rte_eth_dev_info *dev_info);\n static int virtio_dev_link_update(struct rte_eth_dev *dev,\n@@ -1861,6 +1865,7 @@ int\n eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n {\n \tstruct virtio_hw *hw = eth_dev->data->dev_private;\n+\tuint32_t speed = ETH_SPEED_NUM_10G;\n \tint ret;\n \n \tif (sizeof(struct virtio_net_hdr_mrg_rxbuf) > RTE_PKTMBUF_HEADROOM) {\n@@ -1886,7 +1891,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \n \t\treturn 0;\n \t}\n-\n+\tret = virtio_dev_devargs_parse(eth_dev->device->devargs,\n+\t\t NULL, &speed);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\thw->speed = speed;\n \t/*\n \t * Pass the information to the rte_eth_dev_close() that it should also\n \t * release the private port resources.\n@@ -1956,6 +1965,7 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)\n \treturn 0;\n }\n \n+\n static int vdpa_check_handler(__rte_unused const char *key,\n \t\tconst char *value, void *ret_val)\n {\n@@ -1967,33 +1977,100 @@ static int vdpa_check_handler(__rte_unused const char *key,\n \treturn 0;\n }\n \n+\n+static uint32_t\n+virtio_dev_speed_capa_get(uint32_t speed)\n+{\n+\tstruct speed_caps {\n+\t\tuint32_t min_speed;\n+\t\tuint32_t speed_capa;\n+\t};\n+\tstruct speed_caps caps[] = {\n+\t\t{ETH_SPEED_NUM_10M, ETH_LINK_SPEED_10M},\n+\t\t{ETH_SPEED_NUM_100M, ETH_LINK_SPEED_100M},\n+\t\t{ETH_SPEED_NUM_1G, ETH_LINK_SPEED_1G},\n+\t\t{ETH_SPEED_NUM_2_5G, ETH_LINK_SPEED_2_5G},\n+\t\t{ETH_SPEED_NUM_5G, ETH_LINK_SPEED_5G},\n+\t\t{ETH_SPEED_NUM_10G, ETH_LINK_SPEED_10G},\n+\t\t{ETH_SPEED_NUM_20G, ETH_LINK_SPEED_20G},\n+\t\t{ETH_SPEED_NUM_25G, ETH_LINK_SPEED_25G},\n+\t\t{ETH_SPEED_NUM_40G, ETH_LINK_SPEED_40G},\n+\t\t{ETH_SPEED_NUM_50G, ETH_LINK_SPEED_50G},\n+\t\t{ETH_SPEED_NUM_56G, ETH_LINK_SPEED_56G},\n+\t\t{ETH_SPEED_NUM_100G, ETH_LINK_SPEED_100G}\n+\t};\n+\tconst uint32_t caps_size = sizeof(caps) / sizeof(struct speed_caps);\n+\tuint32_t speed_capa = ETH_LINK_SPEED_AUTONEG;\n+\tif (speed != ETH_SPEED_NUM_UNKNOWN) {\n+\t\t/* find maximum suitable speed capability */\n+\t\tfor (uint32_t i = 0; i < caps_size; i++) {\n+\t\t\tif (speed >= caps[i].min_speed)\n+\t\t\t\tspeed_capa = caps[i].speed_capa;\n+\t\t}\n+\t}\n+\treturn speed_capa;\n+}\n+\n+\n+#define VIRTIO_ARG_SPEED \"speed\"\n+#define VIRTIO_ARG_VDPA \"vdpa\"\n+\n+\n+static int\n+link_speed_handler(const char *key __rte_unused,\n+\t\tconst char *value, void *ret_val)\n+{\n+\tuint32_t val;\n+\tif (!value || !ret_val)\n+\t\treturn -EINVAL;\n+\terrno = 0;\n+\tval = strtoul(value, NULL, 0);\n+\t/* validate input */\n+\tif (errno != 0)\n+\t\treturn -EINVAL;\n+\t*(uint32_t *)ret_val = val;\n+\n+\treturn 0;\n+}\n+\n+\n static int\n-virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa)\n+virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa,\n+\tuint32_t *speed)\n {\n \tstruct rte_kvargs *kvlist;\n-\tconst char *key = \"vdpa\";\n \tint ret = 0;\n \n \tif (devargs == NULL)\n \t\treturn 0;\n \n \tkvlist = rte_kvargs_parse(devargs->args, NULL);\n-\tif (kvlist == NULL)\n+\tif (kvlist == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"error when parsing param\");\n \t\treturn 0;\n-\n-\tif (!rte_kvargs_count(kvlist, key))\n-\t\tgoto exit;\n-\n-\tif (vdpa) {\n+\t}\n+\tif (vdpa && rte_kvargs_count(kvlist, VIRTIO_ARG_VDPA) == 1) {\n \t\t/* vdpa mode selected when there's a key-value pair:\n \t\t * vdpa=1\n \t\t */\n-\t\tret = rte_kvargs_process(kvlist, key,\n+\t\tret = rte_kvargs_process(kvlist, VIRTIO_ARG_VDPA,\n \t\t\t\tvdpa_check_handler, vdpa);\n-\t\tif (ret < 0)\n+\t\tif (ret < 0) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to parse %s\",\n+\t\t\t\tVIRTIO_ARG_VDPA);\n \t\t\tgoto exit;\n+\t\t}\n+\t}\n+\tif (speed && rte_kvargs_count(kvlist, VIRTIO_ARG_SPEED) == 1) {\n+\t\tret = rte_kvargs_process(kvlist,\n+\t\t\t\t\tVIRTIO_ARG_SPEED,\n+\t\t\t\t\tlink_speed_handler, speed);\n+\t\tif (ret < 0) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to parse %s\",\n+\t\t\t\t\tVIRTIO_ARG_SPEED);\n+\t\t\tgoto exit;\n+\t\t}\n \t}\n-\n \n exit:\n \trte_kvargs_free(kvlist);\n@@ -2006,7 +2083,7 @@ static int eth_virtio_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \tint vdpa = 0;\n \tint ret = 0;\n \n-\tret = virtio_dev_devargs_parse(pci_dev->device.devargs, &vdpa);\n+\tret = virtio_dev_devargs_parse(pci_dev->device.devargs, &vdpa, NULL);\n \tif (ret < 0) {\n \t\tPMD_INIT_LOG(ERR, \"devargs parsing is failed\");\n \t\treturn ret;\n@@ -2385,7 +2462,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet\n \n \tmemset(&link, 0, sizeof(link));\n \tlink.link_duplex = ETH_LINK_FULL_DUPLEX;\n-\tlink.link_speed = ETH_SPEED_NUM_10G;\n+\tlink.link_speed = hw->speed;\n \tlink.link_autoneg = ETH_LINK_FIXED;\n \n \tif (!hw->started) {\n@@ -2440,8 +2517,7 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n {\n \tuint64_t tso_mask, host_features;\n \tstruct virtio_hw *hw = dev->data->dev_private;\n-\n-\tdev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */\n+\tdev_info->speed_capa = virtio_dev_speed_capa_get(hw->speed);\n \n \tdev_info->max_rx_queues =\n \t\tRTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES);\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 7433d2f08..ed98e11c3 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -259,6 +259,7 @@ struct virtio_hw {\n \tuint16_t port_id;\n \tuint8_t mac_addr[RTE_ETHER_ADDR_LEN];\n \tuint32_t notify_off_multiplier;\n+\tuint32_t speed; /* link speed in MB */\n \tuint8_t *isr;\n \tuint16_t *notify_base;\n \tstruct virtio_pci_common_cfg *common_cfg;\n", "prefixes": [ "v9", "2/5" ] }