Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/68673/?format=api
{ "id": 68673, "url": "http://patches.dpdk.org/api/patches/68673/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200416124258.15549-5-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": "<20200416124258.15549-5-i.dyukov@samsung.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200416124258.15549-5-i.dyukov@samsung.com", "date": "2020-04-16T12:42:55", "name": "[v12,4/7] net/virtio: add link speed devarg", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d3b4590b8f52e6ad6b860b6bc018a3c653009bb6", "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/20200416124258.15549-5-i.dyukov@samsung.com/mbox/", "series": [ { "id": 9425, "url": "http://patches.dpdk.org/api/series/9425/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9425", "date": "2020-04-16T12:42:52", "name": "[v12,1/7] ethdev: added UNKNOWN speed value", "version": 12, "mbox": "http://patches.dpdk.org/series/9425/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/68673/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/68673/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 E0FE9A0588;\n\tThu, 16 Apr 2020 14:43:48 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B51BC1DC6E;\n\tThu, 16 Apr 2020 14:43:19 +0200 (CEST)", "from mailout1.w1.samsung.com (mailout1.w1.samsung.com\n [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 2FBD91DC65\n for <dev@dpdk.org>; Thu, 16 Apr 2020 14:43:17 +0200 (CEST)", "from eucas1p2.samsung.com (unknown [182.198.249.207])\n by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id\n 20200416124316euoutp01a5338bc23d5fa7934ecea91d17f56941~GTWDUkFUf0589505895euoutp01T\n for <dev@dpdk.org>; Thu, 16 Apr 2020 12:43:16 +0000 (GMT)", "from eusmges3new.samsung.com (unknown [203.254.199.245]) by\n eucas1p1.samsung.com (KnoxPortal) with ESMTP id\n 20200416124316eucas1p18d8b043c6f62432b4b275df40cbe8e13~GTWDKHsaE3028830288eucas1p18;\n Thu, 16 Apr 2020 12:43:16 +0000 (GMT)", "from eucas1p1.samsung.com ( [182.198.249.206]) by\n eusmges3new.samsung.com (EUCPMTA) with SMTP id 65.4E.60698.4E2589E5; Thu, 16\n Apr 2020 13:43:16 +0100 (BST)", "from eusmtrp1.samsung.com (unknown [182.198.249.138]) by\n eucas1p2.samsung.com (KnoxPortal) with ESMTPA id\n 20200416124316eucas1p2be047d5a4728c47d5db196e46fcf71ab~GTWCjRx7_1243412434eucas1p2U;\n Thu, 16 Apr 2020 12:43:16 +0000 (GMT)", "from eusmgms2.samsung.com (unknown [182.198.249.180]) by\n eusmtrp1.samsung.com (KnoxPortal) with ESMTP id\n 20200416124316eusmtrp16cdc309b95b63f8b78cc14740e4e4fe9~GTWCis-Xw0947209472eusmtrp1H;\n Thu, 16 Apr 2020 12:43:16 +0000 (GMT)", "from eusmtip2.samsung.com ( [203.254.199.222]) by\n eusmgms2.samsung.com (EUCPMTA) with SMTP id 70.D8.07950.4E2589E5; Thu, 16\n Apr 2020 13:43:16 +0100 (BST)", "from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by\n eusmtip2.samsung.com (KnoxPortal) with ESMTPA id\n 20200416124315eusmtip211ffca8ef1a132190a7a949c7ebfab12~GTWB-bgb50263102631eusmtip2Z;\n Thu, 16 Apr 2020 12:43:15 +0000 (GMT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com\n 20200416124316euoutp01a5338bc23d5fa7934ecea91d17f56941~GTWDUkFUf0589505895euoutp01T", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;\n s=mail20170921; t=1587040997;\n bh=FD+USHBNHa0+Xb2y3wyNedQOMRlujtSQTzsHkG2CGs8=;\n h=From:To:Subject:Date:In-Reply-To:References:From;\n b=HWTjxuZgomiIjCHCgr+grxtPK35IPezMV3QR+KN4UOEFL27SZ4V02sBWHFu/iO4gg\n 7AtiDtxwnt9c7Sgf6WTP7Y8v7haIP2HRAkrmiGDEHDIq2p0zjN67Zq0AHfOeC3+kar\n N4L2q8dqNixBlysMVL8JnPYP1ADaM23CMufIOpfo=", "X-AuditID": "cbfec7f5-a29ff7000001ed1a-ba-5e9852e45cd7", "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": "Thu, 16 Apr 2020 15:42:55 +0300", "Message-Id": "<20200416124258.15549-5-i.dyukov@samsung.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200416124258.15549-1-i.dyukov@samsung.com>", "X-Brightmail-Tracker": [ "\n H4sIAAAAAAAAA+NgFvrCIsWRmVeSWpSXmKPExsWy7djPc7pPgmbEGRxepWvRuuMBi8W7T9uZ\n LGZdamK3ONa5h8Wi79dVRovTNzezW/x5Y2qx+eIkJgcOj18LlrJ6LN7zksnj/b6rbB59W1Yx\n epx61M0cwBrFZZOSmpNZllqkb5fAlfF9/mb2gqXmFYtWP2JuYHyv08XIySEhYCLx9egWti5G\n Lg4hgRWMEmfPTmKCcL4wSszccoQZwvnMKNFyeisTTEvHvBMsEInljBLTX2+FqvrKKLFhUhcr\n SBWbgIbE6Y55YB0iAnsZJY6dKQCxhQWsJE7ef88OYrMIqErMudsNVs8rYCnx4vgRFogN8hKr\n NxxgBrE5gervdr9iBVkgIfCeTeLszJvMEEUuEveWXoM6SVji1fEt7BC2jMTpyT1Qg6olvm+6\n zg7R3MEocW9RK1SRvcSW1+eAbA4OZgFNifW79CHCjhLNNw4wgYQlBPgkbrwVBAkzA5mTtk1n\n hgjzSnS0CUFUK0kcOHkJKiwh8fc3D0TYQ+LZ413QUNwDDMWVV5gnMMrNQti1gJFxFaN4amlx\n bnpqsXFearlecWJucWleul5yfu4mRmBaOP3v+NcdjPv+JB1iFOBgVOLhTbCfESfEmlhWXJl7\n iFGCg1lJhJfPFCjEm5JYWZValB9fVJqTWnyIUZqDRUmc13jRy1ghgfTEktTs1NSC1CKYLBMH\n p1QDo0DCrMdrft/3c3Pft1SvJzTn6UGfvfd/vFZolrWoeX6iUE798I6Q3Wvm5+zo056RKbq2\n 6fTVnWcdtJlkj8exWC5+mOXwLnPJ53t+tjI6e34Z8TlXrt0Z3jjNpbKi2f2gnIvcp+L9s8/K\n FX7cwaFxUPNlc5vQSUnLwNm7DrbseblS9GXSQSm2C0osxRmJhlrMRcWJAIWxKb4HAwAA", "\n H4sIAAAAAAAAA+NgFrrGLMWRmVeSWpSXmKPExsVy+t/xe7pPgmbEGVztZ7No3fGAxeLdp+1M\n FrMuNbFbHOvcw2LR9+sqo8Xpm5vZLf68MbXYfHESkwOHx68FS1k9Fu95yeTxft9VNo++LasY\n PU496mYOYI3SsynKLy1JVcjILy6xVYo2tDDSM7S00DMysdQzNDaPtTIyVdK3s0lJzcksSy3S\n t0vQy/g+fzN7wVLzikWrHzE3ML7X6WLk5JAQMJHomHeCpYuRi0NIYCmjxNeNFxi7GDmAEhIS\n r58wQ9QIS/y51sUGUfOZUWLpug2MIAk2AQ2J0x3zmEASIgLHGSV6Z/1nAkkIC1hJnLz/nh3E\n ZhFQlZhzt5sVxOYVsJR4cfwIC8RUeYnVGw6AbeAEqr/b/QqsRkggQ2LhpccsExh5FzAyrGIU\n SS0tzk3PLTbSK07MLS7NS9dLzs/dxAgM023Hfm7Zwdj1LvgQowAHoxIPb4L9jDgh1sSy4src\n Q4wSHMxKIrx8pkAh3pTEyqrUovz4otKc1OJDjKZAR01klhJNzgfGUF5JvKGpobmFpaG5sbmx\n mYWSOG+HwMEYIYH0xJLU7NTUgtQimD4mDk6pBsYzlbcEZm6apcrb2Npr6X2rewn/08OG1zf+\n K7n4MkelSMGkZv765xzu3/9tmi81YeUXh50q/Uzl1erbOZn+N65s4GVdqlc1c5/Ok5x10u7T\n P/D/YHRaXCQQzfH+t/9852CXbbWd4u/ePlrjYW+4mzn2e7Z0f/dOvt2b/6S3XNdjWlBZ+lNg\n 4RMlluKMREMt5qLiRACBNMlaaQIAAA==" ], "X-CMS-MailID": "20200416124316eucas1p2be047d5a4728c47d5db196e46fcf71ab", "X-Msg-Generator": "CA", "Content-Type": "text/plain; charset=\"utf-8\"", "X-RootMTR": "20200416124316eucas1p2be047d5a4728c47d5db196e46fcf71ab", "X-EPHeader": "CA", "CMS-TYPE": "201P", "X-CMS-RootMailID": "20200416124316eucas1p2be047d5a4728c47d5db196e46fcf71ab", "References": "<20191212085012.9170-1-i.dyukov@samsung.com>\n <20200416124258.15549-1-i.dyukov@samsung.com>\n <CGME20200416124316eucas1p2be047d5a4728c47d5db196e46fcf71ab@eucas1p2.samsung.com>", "Subject": "[dpdk-dev] [PATCH v12 4/7] 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": "Default value of link speed is 0xffffffff (Unknown)\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 | 107 ++++++++++++++++++++++++-----\n drivers/net/virtio/virtio_pci.h | 1 +\n 3 files changed, 99 insertions(+), 16 deletions(-)", "diff": "diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst\nindex d1f5fb898..55bc6a267 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: 0xffffffff (Unknown))\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 ca323ee57..b757edfcc 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_UNKNOWN;\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@@ -1967,33 +1976,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-virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa)\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+\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 +2082,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 +2461,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_UNKNOWN;\n+\tlink.link_speed = hw->speed;\n \tlink.link_autoneg = ETH_LINK_AUTONEG;\n \n \tif (!hw->started) {\n@@ -2440,8 +2516,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_AUTONEG; /* 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": [ "v12", "4/7" ] }