Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/66228/?format=api
{ "id": 66228, "url": "http://patches.dpdk.org/api/patches/66228/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200303182846.26109-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": "<20200303182846.26109-3-i.dyukov@samsung.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200303182846.26109-3-i.dyukov@samsung.com", "date": "2020-03-03T18:27:03", "name": "[v6,2/4] 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/20200303182846.26109-3-i.dyukov@samsung.com/mbox/", "series": [ { "id": 8768, "url": "http://patches.dpdk.org/api/series/8768/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8768", "date": "2020-03-03T18:27:01", "name": "net/virtio: add link speed devarg", "version": 6, "mbox": "http://patches.dpdk.org/series/8768/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/66228/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/66228/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 933DCA056A;\n\tTue, 3 Mar 2020 19:29:20 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CE77B1C01E;\n\tTue, 3 Mar 2020 19:29:08 +0100 (CET)", "from mailout2.w1.samsung.com (mailout2.w1.samsung.com\n [210.118.77.12]) by dpdk.org (Postfix) with ESMTP id 308861C00D\n for <dev@dpdk.org>; Tue, 3 Mar 2020 19:29:07 +0100 (CET)", "from eucas1p2.samsung.com (unknown [182.198.249.207])\n by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id\n 20200303182906euoutp0216f03b6a1eff8048fa8146921901ead0~43rcXxYEr0648806488euoutp02K\n for <dev@dpdk.org>; Tue, 3 Mar 2020 18:29:06 +0000 (GMT)", "from eusmges3new.samsung.com (unknown [203.254.199.245]) by\n eucas1p1.samsung.com (KnoxPortal) with ESMTP id\n 20200303182905eucas1p1dc2e0581074d2b44fc201b61128a780d~43rbYhFuK0540705407eucas1p1R;\n Tue, 3 Mar 2020 18:29:05 +0000 (GMT)", "from eucas1p1.samsung.com ( [182.198.249.206]) by\n eusmges3new.samsung.com (EUCPMTA) with SMTP id 63.C1.60698.1F1AE5E5; Tue, 3\n Mar 2020 18:29:05 +0000 (GMT)", "from eusmtrp2.samsung.com (unknown [182.198.249.139]) by\n eucas1p2.samsung.com (KnoxPortal) with ESMTPA id\n 20200303182905eucas1p2a39607c525e04492db830062b28cedd2~43rbKXgux2239622396eucas1p2Y;\n Tue, 3 Mar 2020 18:29:05 +0000 (GMT)", "from eusmgms2.samsung.com (unknown [182.198.249.180]) by\n eusmtrp2.samsung.com (KnoxPortal) with ESMTP id\n 20200303182905eusmtrp2485ca2bfefd164142f1db7e64fa8f3c9~43rbJzbzK0347103471eusmtrp2k;\n Tue, 3 Mar 2020 18:29:05 +0000 (GMT)", "from eusmtip1.samsung.com ( [203.254.199.221]) by\n eusmgms2.samsung.com (EUCPMTA) with SMTP id BA.A4.07950.1F1AE5E5; Tue, 3\n Mar 2020 18:29:05 +0000 (GMT)", "from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by\n eusmtip1.samsung.com (KnoxPortal) with ESMTPA id\n 20200303182905eusmtip111b10bcba8c365119a4d89ad47041b61~43raqUM0H0781607816eusmtip1a;\n Tue, 3 Mar 2020 18:29:05 +0000 (GMT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com\n 20200303182906euoutp0216f03b6a1eff8048fa8146921901ead0~43rcXxYEr0648806488euoutp02K", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;\n s=mail20170921; t=1583260147;\n bh=5nZc/m8zxjlfWjEgC7vErVyqdF3f5obuiAOahTkliJE=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=AHrze7wJZZpTqAUjgTVYCJMiRLyhPErcaQaj6N5beWw2jZ26k0dhddU9dntxmyaly\n 0Tbxj4foWH0f0prn+VmHGDBJHgGx/67Vc3eEyJPj4l1Hv8v6du9UVpoZTm9tdqZbPu\n mON8bEQl4l62Dk1X8vAR9FC20GH4C2jnsiGmFY1s=", "X-AuditID": "cbfec7f5-a0fff7000001ed1a-9f-5e5ea1f12462", "From": "Ivan Dyukov <i.dyukov@samsung.com>", "To": "dev@dpdk.org, maxime.coquelin@redhat.com, tiwei.bie@intel.com,\n amorenoz@redhat.com, zhihong.wang@intel.com, xiaolong.ye@intel.com", "Cc": "Ivan Dyukov <i.dyukov@samsung.com>", "Date": "Tue, 3 Mar 2020 21:27:03 +0300", "Message-Id": "<20200303182846.26109-3-i.dyukov@samsung.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200303182846.26109-1-i.dyukov@samsung.com>", "X-Brightmail-Tracker": [ "\n H4sIAAAAAAAAA+NgFvrKIsWRmVeSWpSXmKPExsWy7djPc7ofF8bFGXQ+MLVo3fGAxeLdp+1M\n FrMuNbFbHOvcw2KxteE/k8WfN6YWmy9OYnJg9/i1YCmrx+I9L5k83u+7yubRt2UVYwBLFJdN\n SmpOZllqkb5dAlfGmqcdLAV7TSqOTb3E0sB4WauLkYNDQsBEYvNiri5GLg4hgRWMEj3dL5kg\n nC+MEhMfvGWHcD4zSmyY0wDkcIJ1zPi7gA0isZxR4sabyVAtXxklzrWcYAWpYhPQkDjdMQ8s\n ISLQziixakoLC0iCWUBN4kPPezBbWMBS4tmaV2A2i4CqxPKvUxlBjuIFiu9rUofYJi+xesMB\n ZhCbU8BK4sSdNhaQmRICr9kklm1vY4YocpG4/WgCI4QtLPHq+BaoU2Uk/u+czwRhV0t833Sd\n HaK5g1Hi3qJWqCJ7iS2vz7GDLGYW0JRYv0sfIuwocXf/UXZIIPFJ3HgrCHE+n8SkbdOZIcK8\n Eh1tQhDVShIHTl6CCktI/P3NAxH2kPi64DwrJHiuMEpcWXaRZQKj/CyEXQsYGVcxiqeWFuem\n pxYb56WW6xUn5haX5qXrJefnbmIEJobT/45/3cG470/SIUYBDkYlHl4Jz7g4IdbEsuLK3EOM\n EhzMSiK8vpzRcUK8KYmVValF+fFFpTmpxYcYpTlYlMR5jRe9jBUSSE8sSc1OTS1ILYLJMnFw\n SjUwNsfprc5J/ceSfHfX5Iy7y1dV8bTabL9k863GT/DmheTtFzLcT97ILDy2u8rklVYix/80\n 439xr5VPtM8Wuzejtlh1yxcZe3Y7W8tpprcf2pYvsPr3tvGKALM7P4dUtHAbT/ntH1eOnlbW\n N/zifuqr68nvz2vDQ9Zo/ivz8JR+8jgy5VHB8m+FSizFGYmGWsxFxYkAHR+mLAgDAAA=", "\n H4sIAAAAAAAAA+NgFrrBLMWRmVeSWpSXmKPExsVy+t/xu7ofF8bFGay5pm7RuuMBi8W7T9uZ\n LGZdamK3ONa5h8Via8N/Jos/b0wtNl+cxOTA7vFrwVJWj8V7XjJ5vN93lc2jb8sqxgCWKD2b\n ovzSklSFjPziElulaEMLIz1DSws9IxNLPUNj81grI1MlfTublNSczLLUIn27BL2MNU87WAr2\n mlQcm3qJpYHxslYXIyeHhICJxIy/C9i6GLk4hASWMko03VrB2sXIAZSQkHj9hBmiRljiz7Uu\n qJrPjBInv3xmB0mwCWhInO6YxwSSEBHoZ5TY+Os3WAezgJrEh573LCC2sIClxLM1r8BsFgFV\n ieVfpzKCLOAFiu9rUodYIC+xesMBsFZOASuJE3faWCCWNTBKbNi1mGUCI98CRoZVjCKppcW5\n 6bnFRnrFibnFpXnpesn5uZsYgaG67djPLTsYu94FH2IU4GBU4uGV8IyLE2JNLCuuzD3EKMHB\n rCTC68sZHSfEm5JYWZValB9fVJqTWnyI0RToqInMUqLJ+cA4yiuJNzQ1NLewNDQ3Njc2s1AS\n 5+0QOBgjJJCeWJKanZpakFoE08fEwSnVwLjn766MyV/udf866tb7RKLjWd3MJx0xkXcU64Q0\n bWxdP23VV5mVwhLjPiM+7DvbU7Zav/Um35zOt+0VEFd64ZXFNUlhgnqpctEnlyXZAg/3P6ic\n O0N1kZDspgUiFimm+3/Wtse8U5Nza9w2tWXe2U/udXG7T9gcfn8kjufe1Xbx2WxTIy4+UlVi\n Kc5INNRiLipOBABIlGTmawIAAA==" ], "X-CMS-MailID": "20200303182905eucas1p2a39607c525e04492db830062b28cedd2", "X-Msg-Generator": "CA", "Content-Type": "text/plain; charset=\"utf-8\"", "X-RootMTR": "20200303182905eucas1p2a39607c525e04492db830062b28cedd2", "X-EPHeader": "CA", "CMS-TYPE": "201P", "X-CMS-RootMailID": "20200303182905eucas1p2a39607c525e04492db830062b28cedd2", "References": "\n <CAJFAV8zQ7=EaQ93H4yMEUsZhnKog8fguoHU1W2WXgCKtefJZLg@mail.gmail.com>\n <20200303182846.26109-1-i.dyukov@samsung.com>\n <CGME20200303182905eucas1p2a39607c525e04492db830062b28cedd2@eucas1p2.samsung.com>", "Subject": "[dpdk-dev] [PATCH v6 2/4] 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 f814aa926..24fed9966 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@@ -1954,6 +1963,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@@ -1965,33 +1975,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@@ -2004,7 +2070,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 a38cb45ad..59012d55a 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -253,6 +253,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": [ "v6", "2/4" ] }