From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 70027A053B; Thu, 6 Feb 2020 15:22:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E3DE31C0D6; Thu, 6 Feb 2020 15:22:27 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id CE5A21C0D2 for ; Thu, 6 Feb 2020 15:22:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580998946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=qEzhHump+zJIKjcKPVzZmfvMyvTWp7wXviqmZUbsA8w=; b=ZlM+3YLaeyRxJbAc21G03wvDujvenhzauqg+YYx87oO85s/I+bejovAmUN80Z7m8Ztrjkj TVd1zCG+FiYXLBCSHf1cYxBIcwsfR3MWK/etJN/HJYmF7SSqoembim/gpOYPm99ElubYxm ApdKDoGv1HIOYiuP80ykreXA/CyuKOs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-UK_OvMsEPGWt2_RFKTU1iw-1; Thu, 06 Feb 2020 09:22:22 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 543D118B9FCB; Thu, 6 Feb 2020 14:22:21 +0000 (UTC) Received: from [10.36.112.40] (ovpn-112-40.ams2.redhat.com [10.36.112.40]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFFEF790E1; Thu, 6 Feb 2020 14:22:19 +0000 (UTC) To: Adrian Moreno , dev@dpdk.org, Ivan Dyukov References: <20200120170520.24192-1-i.dyukov@samsung.com> <20200120170520.24192-2-i.dyukov@samsung.com> <686c6268-ac3e-cf5d-8318-6985b146e646@redhat.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= mQINBFOEQQIBEADjNLYZZqghYuWv1nlLisptPJp+TSxE/KuP7x47e1Gr5/oMDJ1OKNG8rlNg kLgBQUki3voWhUbMb69ybqdMUHOl21DGCj0BTU3lXwapYXOAnsh8q6RRM+deUpasyT+Jvf3a gU35dgZcomRh5HPmKMU4KfeA38cVUebsFec1HuJAWzOb/UdtQkYyZR4rbzw8SbsOemtMtwOx YdXodneQD7KuRU9IhJKiEfipwqk2pufm2VSGl570l5ANyWMA/XADNhcEXhpkZ1Iwj3TWO7XR uH4xfvPl8nBsLo/EbEI7fbuUULcAnHfowQslPUm6/yaGv6cT5160SPXT1t8U9QDO6aTSo59N jH519JS8oeKZB1n1eLDslCfBpIpWkW8ZElGkOGWAN0vmpLfdyiqBNNyS3eGAfMkJ6b1A24un /TKc6j2QxM0QK4yZGfAxDxtvDv9LFXec8ENJYsbiR6WHRHq7wXl/n8guyh5AuBNQ3LIK44x0 KjGXP1FJkUhUuruGyZsMrDLBRHYi+hhDAgRjqHgoXi5XGETA1PAiNBNnQwMf5aubt+mE2Q5r qLNTgwSo2dpTU3+mJ3y3KlsIfoaxYI7XNsPRXGnZi4hbxmeb2NSXgdCXhX3nELUNYm4ArKBP LugOIT/zRwk0H0+RVwL2zHdMO1Tht1UOFGfOZpvuBF60jhMzbQARAQABtCxNYXhpbWUgQ29x dWVsaW4gPG1heGltZS5jb3F1ZWxpbkByZWRoYXQuY29tPokCOAQTAQIAIgUCV3u/5QIbAwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQyjiNKEaHD4ma2g/+P+Hg9WkONPaY1J4AR7Uf kBneosS4NO3CRy0x4WYmUSLYMLx1I3VH6SVjqZ6uBoYy6Fs6TbF6SHNc7QbB6Qjo3neqnQR1 71Ua1MFvIob8vUEl3jAR/+oaE1UJKrxjWztpppQTukIk4oJOmXbL0nj3d8dA2QgHdTyttZ1H xzZJWWz6vqxCrUqHU7RSH9iWg9R2iuTzii4/vk1oi4Qz7y/q8ONOq6ffOy/t5xSZOMtZCspu Mll2Szzpc/trFO0pLH4LZZfz/nXh2uuUbk8qRIJBIjZH3ZQfACffgfNefLe2PxMqJZ8mFJXc RQO0ONZvwoOoHL6CcnFZp2i0P5ddduzwPdGsPq1bnIXnZqJSl3dUfh3xG5ArkliZ/++zGF1O wvpGvpIuOgLqjyCNNRoR7cP7y8F24gWE/HqJBXs1qzdj/5Hr68NVPV1Tu/l2D1KMOcL5sOrz 2jLXauqDWn1Okk9hkXAP7+0Cmi6QwAPuBT3i6t2e8UdtMtCE4sLesWS/XohnSFFscZR6Vaf3 gKdWiJ/fW64L6b9gjkWtHd4jAJBAIAx1JM6xcA1xMbAFsD8gA2oDBWogHGYcScY/4riDNKXi lw92d6IEHnSf6y7KJCKq8F+Jrj2BwRJiFKTJ6ChbOpyyR6nGTckzsLgday2KxBIyuh4w+hMq TGDSp2rmWGJjASq5Ag0EVPSbkwEQAMkaNc084Qvql+XW+wcUIY+Dn9A2D1gMr2BVwdSfVDN7 0ZYxo9PvSkzh6eQmnZNQtl8WSHl3VG3IEDQzsMQ2ftZn2sxjcCadexrQQv3Lu60Tgj7YVYRM H+fLYt9W5YuWduJ+FPLbjIKynBf6JCRMWr75QAOhhhaI0tsie3eDsKQBA0w7WCuPiZiheJaL 4MDe9hcH4rM3ybnRW7K2dLszWNhHVoYSFlZGYh+MGpuODeQKDS035+4H2rEWgg+iaOwqD7bg CQXwTZ1kSrm8NxIRVD3MBtzp9SZdUHLfmBl/tLVwDSZvHZhhvJHC6Lj6VL4jPXF5K2+Nn/Su CQmEBisOmwnXZhhu8ulAZ7S2tcl94DCo60ReheDoPBU8PR2TLg8rS5f9w6mLYarvQWL7cDtT d2eX3Z6TggfNINr/RTFrrAd7NHl5h3OnlXj7PQ1f0kfufduOeCQddJN4gsQfxo/qvWVB7PaE 1WTIggPmWS+Xxijk7xG6x9McTdmGhYaPZBpAxewK8ypl5+yubVsE9yOOhKMVo9DoVCjh5To5 aph7CQWfQsV7cd9PfSJjI2lXI0dhEXhQ7lRCFpf3V3mD6CyrhpcJpV6XVGjxJvGUale7+IOp sQIbPKUHpB2F+ZUPWds9yyVxGwDxD8WLqKKy0WLIjkkSsOb9UBNzgRyzrEC9lgQ/ABEBAAGJ Ah8EGAECAAkFAlT0m5MCGwwACgkQyjiNKEaHD4nU8hAAtt0xFJAy0sOWqSmyxTc7FUcX+pbD KVyPlpl6urKKMk1XtVMUPuae/+UwvIt0urk1mXi6DnrAN50TmQqvdjcPTQ6uoZ8zjgGeASZg jj0/bJGhgUr9U7oG7Hh2F8vzpOqZrdd65MRkxmc7bWj1k81tOU2woR/Gy8xLzi0k0KUa8ueB iYOcZcIGTcs9CssVwQjYaXRoeT65LJnTxYZif2pfNxfINFzCGw42s3EtZFteczClKcVSJ1+L +QUY/J24x0/ocQX/M1PwtZbB4c/2Pg/t5FS+s6UB1Ce08xsJDcwyOPIH6O3tccZuriHgvqKP yKz/Ble76+NFlTK1mpUlfM7PVhD5XzrDUEHWRTeTJSvJ8TIPL4uyfzhjHhlkCU0mw7Pscyxn DE8G0UYMEaNgaZap8dcGMYH/96EfE5s/nTX0M6MXV0yots7U2BDb4soLCxLOJz4tAFDtNFtA wLBhXRSvWhdBJZiig/9CG3dXmKfi2H+wdUCSvEFHRpgo7GK8/Kh3vGhgKmnnxhl8ACBaGy9n fxjSxjSO6rj4/MeenmlJw1yebzkX8ZmaSi8BHe+n6jTGEFNrbiOdWpJgc5yHIZZnwXaW54QT UhhSjDL1rV2B4F28w30jYmlRmm2RdN7iCZfbyP3dvFQTzQ4ySquuPkIGcOOHrvZzxbRjzMx1 Mwqu3GQ= Message-ID: Date: Thu, 6 Feb 2020 15:22:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <686c6268-ac3e-cf5d-8318-6985b146e646@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: UK_OvMsEPGWt2_RFKTU1iw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2 2/2] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Adding back Ivan as you removed it from the To: list. So he may not have seen your comment. On 1/29/20 11:10 AM, Adrian Moreno wrote: > On 1/20/20 6:05 PM, Ivan Dyukov wrote: >> Some applications like pktgen use link_speed to calculate >> transmit rate. It limits outcome traffic to hardcoded 10G. >> >> This patch adds link_speed devarg which allows to configure >> link_speed of virtio device. >> >> Signed-off-by: Ivan Dyukov >> --- >> drivers/net/virtio/virtio_ethdev.c | 101 ++++++++++++++++++++++++----- >> drivers/net/virtio/virtio_pci.h | 1 + >> 2 files changed, 85 insertions(+), 17 deletions(-) >> > > Hi Ivan, > > IMHO, this new option deserves being documented in doc/guides/nics/virtio.rst. > > Otherwise it looks good to me. I agree with Adrian here, the new option need to be documented. Thanks, Maxime > Thank you. > Adrian >> diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c >> index 22323d9a5..5ef3c11a7 100644 >> --- a/drivers/net/virtio/virtio_ethdev.c >> +++ b/drivers/net/virtio/virtio_ethdev.c >> @@ -45,6 +45,10 @@ static int virtio_dev_promiscuous_enable(struct rte_eth_dev *dev); >> static int virtio_dev_promiscuous_disable(struct rte_eth_dev *dev); >> static int virtio_dev_allmulticast_enable(struct rte_eth_dev *dev); >> static int virtio_dev_allmulticast_disable(struct rte_eth_dev *dev); >> +static uint32_t virtio_dev_speed_capa_get(uint32_t link_speed); >> +static int virtio_dev_devargs_parse(struct rte_devargs *devargs, >> + int *vdpa, >> + uint32_t *link_speed); >> static int virtio_dev_info_get(struct rte_eth_dev *dev, >> struct rte_eth_dev_info *dev_info); >> static int virtio_dev_link_update(struct rte_eth_dev *dev, >> @@ -1861,6 +1865,7 @@ int >> eth_virtio_dev_init(struct rte_eth_dev *eth_dev) >> { >> struct virtio_hw *hw = eth_dev->data->dev_private; >> + uint32_t link_speed = ETH_SPEED_NUM_10G; >> int ret; >> >> if (sizeof(struct virtio_net_hdr_mrg_rxbuf) > RTE_PKTMBUF_HEADROOM) { >> @@ -1886,7 +1891,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev) >> >> return 0; >> } >> - >> + ret = virtio_dev_devargs_parse(eth_dev->device->devargs, >> + NULL, &link_speed); >> + if (ret < 0) >> + return ret; >> + hw->link_speed = link_speed; >> /* >> * Pass the information to the rte_eth_dev_close() that it should also >> * release the private port resources. >> @@ -1953,6 +1962,14 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev) >> >> return 0; >> } >> +#define VIRTIO_ARG_LINK_SPEED "link_speed" >> +#define VIRTIO_ARG_VDPA "vdpa" >> + >> +static const char * const valid_args[] = { >> + VIRTIO_ARG_LINK_SPEED, >> + VIRTIO_ARG_VDPA, >> + NULL >> +}; >> >> static int vdpa_check_handler(__rte_unused const char *key, >> const char *value, void *ret_val) >> @@ -1965,33 +1982,84 @@ static int vdpa_check_handler(__rte_unused const char *key, >> return 0; >> } >> >> + >> +static uint32_t >> +virtio_dev_speed_capa_get(uint32_t link_speed) >> +{ >> + switch (link_speed) { >> + case ETH_SPEED_NUM_10G: >> + return ETH_LINK_SPEED_10G; >> + case ETH_SPEED_NUM_20G: >> + return ETH_LINK_SPEED_20G; >> + case ETH_SPEED_NUM_25G: >> + return ETH_LINK_SPEED_25G; >> + case ETH_SPEED_NUM_40G: >> + return ETH_LINK_SPEED_40G; >> + case ETH_SPEED_NUM_50G: >> + return ETH_LINK_SPEED_50G; >> + case ETH_SPEED_NUM_56G: >> + return ETH_LINK_SPEED_56G; >> + case ETH_SPEED_NUM_100G: >> + return ETH_LINK_SPEED_100G; >> + default: >> + return 0; >> + } >> +} >> + >> +static int link_speed_handler(const char *key __rte_unused, >> + const char *value, void *ret_val) >> +{ >> + uint32_t val; >> + if (!value || !ret_val) >> + return -EINVAL; >> + val = strtoul(value, NULL, 0); >> + /* validate input */ >> + if (virtio_dev_speed_capa_get(val) == 0) >> + return -EINVAL; >> + *(uint32_t *)ret_val = val; >> + >> + return 0; >> +} >> + >> + >> static int >> -virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa) >> +virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa, >> + uint32_t *link_speed) >> { >> struct rte_kvargs *kvlist; >> - const char *key = "vdpa"; >> int ret = 0; >> >> if (devargs == NULL) >> return 0; >> >> - kvlist = rte_kvargs_parse(devargs->args, NULL); >> - if (kvlist == NULL) >> + kvlist = rte_kvargs_parse(devargs->args, valid_args); >> + if (kvlist == NULL) { >> + PMD_INIT_LOG(ERR, "error when parsing param"); >> return 0; >> - >> - if (!rte_kvargs_count(kvlist, key)) >> - goto exit; >> - >> - if (vdpa) { >> + } >> + if (vdpa && rte_kvargs_count(kvlist, VIRTIO_ARG_VDPA) == 1) { >> /* vdpa mode selected when there's a key-value pair: >> * vdpa=1 >> */ >> - ret = rte_kvargs_process(kvlist, key, >> + ret = rte_kvargs_process(kvlist, VIRTIO_ARG_VDPA, >> vdpa_check_handler, vdpa); >> - if (ret < 0) >> + if (ret < 0) { >> + PMD_INIT_LOG(ERR, "error to parse %s", >> + VIRTIO_ARG_VDPA); >> goto exit; >> + } >> + } >> + if (link_speed && >> + rte_kvargs_count(kvlist, VIRTIO_ARG_LINK_SPEED) == 1) { >> + ret = rte_kvargs_process(kvlist, >> + VIRTIO_ARG_LINK_SPEED, >> + link_speed_handler, link_speed); >> + if (ret < 0) { >> + PMD_INIT_LOG(ERR, "error to parse %s", >> + VIRTIO_ARG_LINK_SPEED); >> + goto exit; >> + } >> } >> - >> >> exit: >> rte_kvargs_free(kvlist); >> @@ -2004,7 +2072,7 @@ static int eth_virtio_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, >> int vdpa = 0; >> int ret = 0; >> >> - ret = virtio_dev_devargs_parse(pci_dev->device.devargs, &vdpa); >> + ret = virtio_dev_devargs_parse(pci_dev->device.devargs, &vdpa, NULL); >> if (ret < 0) { >> PMD_DRV_LOG(ERR, >> "devargs parsing is failed"); >> @@ -2386,7 +2454,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet >> >> memset(&link, 0, sizeof(link)); >> link.link_duplex = ETH_LINK_FULL_DUPLEX; >> - link.link_speed = ETH_SPEED_NUM_10G; >> + link.link_speed = hw->link_speed; >> link.link_autoneg = ETH_LINK_FIXED; >> >> if (!hw->started) { >> @@ -2441,8 +2509,7 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) >> { >> uint64_t tso_mask, host_features; >> struct virtio_hw *hw = dev->data->dev_private; >> - >> - dev_info->speed_capa = ETH_LINK_SPEED_10G; /* fake value */ >> + dev_info->speed_capa = virtio_dev_speed_capa_get(hw->link_speed); >> >> dev_info->max_rx_queues = >> RTE_MIN(hw->max_queue_pairs, VIRTIO_MAX_RX_QUEUES); >> diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h >> index a38cb45ad..688eda914 100644 >> --- a/drivers/net/virtio/virtio_pci.h >> +++ b/drivers/net/virtio/virtio_pci.h >> @@ -253,6 +253,7 @@ struct virtio_hw { >> uint16_t port_id; >> uint8_t mac_addr[RTE_ETHER_ADDR_LEN]; >> uint32_t notify_off_multiplier; >> + uint32_t link_speed; /* link speed in MB */ >> uint8_t *isr; >> uint16_t *notify_base; >> struct virtio_pci_common_cfg *common_cfg; >> >