Default value of link speed is 0xffffffff (Unknown)
This patch adds speed devarg which allows to configure
link speed of virtio device.
Signed-off-by: Ivan Dyukov <i.dyu...@samsung.com>
---
doc/guides/nics/virtio.rst | 7 ++
drivers/net/virtio/virtio_ethdev.c | 107 ++++++++++++++++++++++++-----
drivers/net/virtio/virtio_pci.h | 1 +
3 files changed, 99 insertions(+), 16 deletions(-)
diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst
index d1f5fb898..55bc6a267 100644
--- a/doc/guides/nics/virtio.rst
+++ b/doc/guides/nics/virtio.rst
@@ -356,6 +356,13 @@ Below devargs are supported by the PCI virtio driver:
a virtio device needs to work in vDPA mode.
(Default: 0 (disabled))
+#. ``speed``:
+
+ It is used to specify link speed of virtio device, in units of 1Mb.
+ Link speed is a part of link status structure. It could be requested
+ by application using rte_eth_link_get_nowait function.
+ (Default: 0xffffffff (Unknown))
+
Below devargs are supported by the virtio-user vdev:
#. ``path``:
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index ca323ee57..b757edfcc 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 speed);
+static int virtio_dev_devargs_parse(struct rte_devargs *devargs,
+ int *vdpa,
+ uint32_t *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 speed = ETH_SPEED_NUM_UNKNOWN;
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, &speed);
+ if (ret < 0)
+ return ret;
+ hw->speed = speed;
/*
* Pass the information to the rte_eth_dev_close() that it should also
* release the private port resources.
@@ -1967,33 +1976,100 @@ static int vdpa_check_handler(__rte_unused const char
*key,
return 0;
}
+
+static uint32_t
+virtio_dev_speed_capa_get(uint32_t speed)
+{
+ struct speed_caps {
+ uint32_t min_speed;
+ uint32_t speed_capa;
+ };
+ struct speed_caps caps[] = {
+ {ETH_SPEED_NUM_10M, ETH_LINK_SPEED_10M},
+ {ETH_SPEED_NUM_100M, ETH_LINK_SPEED_100M},
+ {ETH_SPEED_NUM_1G, ETH_LINK_SPEED_1G},
+ {ETH_SPEED_NUM_2_5G, ETH_LINK_SPEED_2_5G},
+ {ETH_SPEED_NUM_5G, ETH_LINK_SPEED_5G},
+ {ETH_SPEED_NUM_10G, ETH_LINK_SPEED_10G},
+ {ETH_SPEED_NUM_20G, ETH_LINK_SPEED_20G},
+ {ETH_SPEED_NUM_25G, ETH_LINK_SPEED_25G},
+ {ETH_SPEED_NUM_40G, ETH_LINK_SPEED_40G},
+ {ETH_SPEED_NUM_50G, ETH_LINK_SPEED_50G},
+ {ETH_SPEED_NUM_56G, ETH_LINK_SPEED_56G},
+ {ETH_SPEED_NUM_100G, ETH_LINK_SPEED_100G}
+ };
+ const uint32_t caps_size = sizeof(caps) / sizeof(struct speed_caps);
+ uint32_t speed_capa = ETH_LINK_SPEED_AUTONEG;
+ if (speed != ETH_SPEED_NUM_UNKNOWN) {
+ /* find maximum suitable speed capability */
+ for (uint32_t i = 0; i < caps_size; i++) {
+ if (speed >= caps[i].min_speed)
+ speed_capa = caps[i].speed_capa;
+ }
+ }
+ return speed_capa;
+}
+
+
+#define VIRTIO_ARG_SPEED "speed"
+#define VIRTIO_ARG_VDPA "vdpa"
+
+
static int
-virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa)
+link_speed_handler(const char *key __rte_unused,
+ const char *value, void *ret_val)
+{
+ uint32_t val;
+ if (!value || !ret_val)
+ return -EINVAL;
+ errno = 0;
+ val = strtoul(value, NULL, 0);
+ /* validate input */
+ if (errno != 0)
+ return -EINVAL;
+ *(uint32_t *)ret_val = val;
+
+ return 0;
+}
+
+
+static int
+virtio_dev_devargs_parse(struct rte_devargs *devargs, int *vdpa,
+ uint32_t *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)
+ 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, "Failed to parse %s",
+ VIRTIO_ARG_VDPA);
goto exit;
+ }
+ }
+ if (speed && rte_kvargs_count(kvlist, VIRTIO_ARG_SPEED) == 1) {
+ ret = rte_kvargs_process(kvlist,
+ VIRTIO_ARG_SPEED,
+ link_speed_handler, speed);
+ if (ret < 0) {
+ PMD_INIT_LOG(ERR, "Failed to parse %s",
+ VIRTIO_ARG_SPEED);
+ goto exit;
+ }
}
-
exit:
rte_kvargs_free(kvlist);
@@ -2006,7 +2082,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_INIT_LOG(ERR, "devargs parsing is failed");
return ret;
@@ -2385,7 +2461,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_UNKNOWN;
+ link.link_speed = hw->speed;
link.link_autoneg = ETH_LINK_AUTONEG;
if (!hw->started) {
@@ -2440,8 +2516,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_AUTONEG; /* fake value */
+ dev_info->speed_capa = virtio_dev_speed_capa_get(hw->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 7433d2f08..ed98e11c3 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -259,6 +259,7 @@ struct virtio_hw {
uint16_t port_id;
uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
uint32_t notify_off_multiplier;
+ uint32_t speed; /* link speed in MB */
uint8_t *isr;
uint16_t *notify_base;
struct virtio_pci_common_cfg *common_cfg;
--
2.17.1
