Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/67316/?format=api
{ "id": 67316, "url": "http://patches.dpdk.org/api/patches/67316/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200329144308.5103-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": "<20200329144308.5103-3-i.dyukov@samsung.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200329144308.5103-3-i.dyukov@samsung.com", "date": "2020-03-29T14:42:48", "name": "[v7,2/5] net/virtio: add link speed devarg", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2563c35ffbd655b32b82d27332755b30df00e41e", "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/20200329144308.5103-3-i.dyukov@samsung.com/mbox/", "series": [ { "id": 9083, "url": "http://patches.dpdk.org/api/series/9083/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9083", "date": "2020-03-29T14:42:46", "name": "net/virtio: add link speed devarg", "version": 7, "mbox": "http://patches.dpdk.org/series/9083/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/67316/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/67316/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 E209EA0562;\n\tSun, 29 Mar 2020 16:44:06 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F27CC1BFDC;\n\tSun, 29 Mar 2020 16:43:39 +0200 (CEST)", "from mailout2.w1.samsung.com (mailout2.w1.samsung.com\n [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id DA45A1BF9D\n for <dev@dpdk.org>; Sun, 29 Mar 2020 16:43:36 +0200 (CEST)", "from eucas1p1.samsung.com (unknown [182.198.249.206])\n by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id\n 20200329144336euoutp020035b39d72915bb787d98b6fbb34c037~AzX_EM5Re1301113011euoutp02c\n for <dev@dpdk.org>; Sun, 29 Mar 2020 14:43:36 +0000 (GMT)", "from eusmges2new.samsung.com (unknown [203.254.199.244]) by\n eucas1p2.samsung.com (KnoxPortal) with ESMTP id\n 20200329144336eucas1p29f5e5aad14617be3c703fb855d58cd56~AzX97Nlne0654106541eucas1p2l;\n Sun, 29 Mar 2020 14:43:36 +0000 (GMT)", "from eucas1p2.samsung.com ( [182.198.249.207]) by\n eusmges2new.samsung.com (EUCPMTA) with SMTP id 41.A3.60679.814B08E5; Sun, 29\n Mar 2020 15:43:36 +0100 (BST)", "from eusmtrp1.samsung.com (unknown [182.198.249.138]) by\n eucas1p1.samsung.com (KnoxPortal) with ESMTPA id\n 20200329144335eucas1p1b3962cf40116e2da679b99c26f3f8ed7~AzX9cIhJ71502915029eucas1p1r;\n Sun, 29 Mar 2020 14:43:35 +0000 (GMT)", "from eusmgms1.samsung.com (unknown [182.198.249.179]) by\n eusmtrp1.samsung.com (KnoxPortal) with ESMTP id\n 20200329144335eusmtrp1d1d102ce0a60bb5a29ee95e0cd079288~AzX9bJD5Z1668216682eusmtrp1b;\n Sun, 29 Mar 2020 14:43:35 +0000 (GMT)", "from eusmtip1.samsung.com ( [203.254.199.221]) by\n eusmgms1.samsung.com (EUCPMTA) with SMTP id 9D.D6.08375.714B08E5; Sun, 29\n Mar 2020 15:43:35 +0100 (BST)", "from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by\n eusmtip1.samsung.com (KnoxPortal) with ESMTPA id\n 20200329144335eusmtip10bada5fa0d36f53d6a51d1b983e62bcf~AzX820Ruk0278902789eusmtip1L;\n Sun, 29 Mar 2020 14:43:35 +0000 (GMT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com\n 20200329144336euoutp020035b39d72915bb787d98b6fbb34c037~AzX_EM5Re1301113011euoutp02c", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;\n s=mail20170921; t=1585493016;\n bh=ZbN59GHW4ffE3sG8tYnOAPv/kl6HquKSHf4JmyUTkGE=;\n h=From:To:Subject:Date:In-Reply-To:References:From;\n b=k4Sq9p29rb5PnFDfkiZNC3OvsTnCxFazMOuheiOOEeUfCWiQC0C1ik3sE2Yd7hD94\n vfSmanR5kvLM7yxmzisiPErp2xoKrOx2fgw883xvn524rZKGyVbk9CRCUJhs+y8O1P\n CzP4VJJvybGp53V/jbxeUE93Fyl5RXomKVUCRVHg=", "X-AuditID": "cbfec7f4-0e5ff7000001ed07-6f-5e80b418093b", "From": "Ivan Dyukov <i.dyukov@samsung.com>", "To": "dev@dpdk.org, maxime.coquelin@redhat.com, i.dyukov@samsung.com,\n tiwei.bie@intel.com, amorenoz@redhat.com, zhihong.wang@intel.com,\n xiaolong.ye@intel.com", "Date": "Sun, 29 Mar 2020 17:42:48 +0300", "Message-Id": "<20200329144308.5103-3-i.dyukov@samsung.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200329144308.5103-1-i.dyukov@samsung.com>", "X-Brightmail-Tracker": [ "\n H4sIAAAAAAAAA0VSa0hTURz37N7dXZeT2xT8u8JgEJTQZmZ0g3AVi/ZN+xQEWktvU9qmbNOa\n EY1M02FlRlRDUirfaFrztTaZSyY6ULLMEZlZ4PKV5ANtabZ5J337Pc//fw6HxISzuIjM1hoY\n nVapFhN8vMP9e/gAWE3pCZ/H+XRR11ec/rnYyaEtIzd5tLvUjtPtpk0OvT53mH79roJznKfw\n V9dwFc/t0xzFQs8oobhrbUSp+Dn+sUxGnZ3P6KTJF/hZHf5hLNeRdHWgpRmZ0Pt4MwongUoC\n X28TbkZ8UkjVI/DYBrksWUbgcI6FyBKCwaq3+Hblwx17yKhDMNpcSbBkJUA67xPBFEHtA0/J\n U07QiKaqEAyULWFBI4o6Cou9dbwgxqm9UGMu3ioIKBrGP5Vx2BF7oKnVuZUPD+TLF8ZR8CCg\n Jgho3Wwh2JAcvHO/QjtFwUy/lcfi3eB5UBbSr4HdPM9jyyUIVkztiDVkYJ0dChgkiVH74aVN\n ysonwNQWvA4ZwJHgnd8ZlLEArOh4hLGyAEqKhWxaDM6BkZAMsPEngpUVMOO7HXrTNwh61sxY\n OYqz/J9VjVAjimHy9BoVo0/UMlckeqVGn6dVSTJyNK9Q4At4/vYvdyHb+kUXokgkjhAkGG+k\n C7nKfL1R40JAYuJoAZFiShcKMpXGAkaXc16Xp2b0LrSLxMUxgkPPptOElEppYC4zTC6j23Y5\n ZLjIhCTXbZOrEV+8Ral9Q1LCe7Zyo/aJu2HHUJvnZK1MtJYibY9Tr8qyM3wTFr/525H+j3L5\n mSmXTp3hTiuNbUqsh++38juNPQ33YhO7o8MG5YUOgyQ57rTvkh9FzmQ5+x6+kHkLDJYfE2OT\n jacmuWEOruqxaqJQJZ8SV4rI7iIxrs9SHozHdHrlP5JWX4n+AgAA", "\n H4sIAAAAAAAAA+NgFjrDLMWRmVeSWpSXmKPExsVy+t/xu7riWxriDObtVbFo3fGAxeLdp+1M\n FrMuNbFbHOvcw2KxteE/k8WfN6YWmy9OYnJg9/i1YCmrx+I9L5k83u+7yubRt2UVYwBLlJ5N\n UX5pSapCRn5xia1StKGFkZ6hpYWekYmlnqGxeayVkamSvp1NSmpOZllqkb5dgl7Gtl/nmQv2\n mlScXLeWsYHxslYXIyeHhICJxJXePaxdjFwcQgJLGSXW/PvC3MXIAZSQkHj9hBmiRljiz7Uu\n Noiaz4wSK1qWM4Ek2AQ0JE53zGMCSYgILGeU6L/cygaSEBawlPh0cDk7iM0ioCqxtKsNLM4r\n YCFx91YPE8RUeYnVGw6AbeAEqp/w/i4jiC0kkC5xcNcJpgmMvAsYGVYxiqSWFuem5xYb6hUn\n 5haX5qXrJefnbmIEhuS2Yz8372C8tDH4EKMAB6MSD69BZX2cEGtiWXFl7iFGCQ5mJRFeNv+G\n OCHelMTKqtSi/Pii0pzU4kOMpkBHTWSWEk3OB8ZLXkm8oamhuYWlobmxubGZhZI4b4fAwRig\n MxJLUrNTUwtSi2D6mDg4pRoYEyKrImvM4q4GcNULJCfFynR+kKmfJB4SvES+6vWhqPK8owcL\n lnwJUdkWNiGdY+dl1Z8++a6JDWz/mMNf/jZ+8TX6weGKk9bipx0mFVTbpk/PnCzTwLrpXJPs\n fOurL6pSbsU7ps5p/zpvSTqr84TPH4Me87A280y18Pl1bJUx+5aiOfcNJnxQYinOSDTUYi4q\n TgQAQBAU6V8CAAA=" ], "X-CMS-MailID": "20200329144335eucas1p1b3962cf40116e2da679b99c26f3f8ed7", "X-Msg-Generator": "CA", "Content-Type": "text/plain; charset=\"utf-8\"", "X-RootMTR": "20200329144335eucas1p1b3962cf40116e2da679b99c26f3f8ed7", "X-EPHeader": "CA", "CMS-TYPE": "201P", "X-CMS-RootMailID": "20200329144335eucas1p1b3962cf40116e2da679b99c26f3f8ed7", "References": "<20191212085012.9170-1-i.dyukov@samsung.com>\n <20200329144308.5103-1-i.dyukov@samsung.com>\n <CGME20200329144335eucas1p1b3962cf40116e2da679b99c26f3f8ed7@eucas1p1.samsung.com>", "Subject": "[dpdk-dev] [PATCH v7 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 | 97 +++++++++++++++++++++++++-----\n drivers/net/virtio/virtio_pci.h | 1 +\n 3 files changed, 89 insertions(+), 16 deletions(-)", "diff": "diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst\nindex d1f5fb898..0341907ef 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. Link speed is a part of\n+ link status structure. It could be requested by application using\n+ 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..fe0e292ef 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,89 @@ 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+\tswitch (speed) {\n+\tcase ETH_SPEED_NUM_10G:\n+\t\treturn ETH_LINK_SPEED_10G;\n+\tcase ETH_SPEED_NUM_20G:\n+\t\treturn ETH_LINK_SPEED_20G;\n+\tcase ETH_SPEED_NUM_25G:\n+\t\treturn ETH_LINK_SPEED_25G;\n+\tcase ETH_SPEED_NUM_40G:\n+\t\treturn ETH_LINK_SPEED_40G;\n+\tcase ETH_SPEED_NUM_50G:\n+\t\treturn ETH_LINK_SPEED_50G;\n+\tcase ETH_SPEED_NUM_56G:\n+\t\treturn ETH_LINK_SPEED_56G;\n+\tcase ETH_SPEED_NUM_100G:\n+\t\treturn ETH_LINK_SPEED_100G;\n+\tdefault:\n+\t\treturn 0;\n+\t}\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+\tval = strtoul(value, NULL, 0);\n+\t/* validate input */\n+\tif (virtio_dev_speed_capa_get(val) == 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 +2072,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 +2451,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 +2506,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": [ "v7", "2/5" ] }