net/virtio: support Virtio link speed feature

This patch adds a support of VIRTIO_NET_F_SPEED_DUPLEX feature
for virtio driver.

There are two ways to specify speed of the link:
   'speed' devarg
   negotiate speed from qemu via VIRTIO_NET_F_SPEED_DUPLEX
The highest priority is devarg. If devarg is not specified,
drivers tries to negotiate it from qemu.

Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 5058990..37766cb 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1662,7 +1662,8 @@ virtio_configure_intr(struct rte_eth_dev *dev)
 
        return 0;
 }
-
+#define SPEED_UNKNOWN    0xffffffff
+#define DUPLEX_UNKNOWN   0xff
 /* reset device and renegotiate features if needed */
 static int
 virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
@@ -1718,6 +1719,25 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
                     hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2],
                     hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]);
 
+       if (hw->speed == SPEED_UNKNOWN) {
+               if (vtpci_with_feature(hw, VIRTIO_NET_F_SPEED_DUPLEX)) {
+                       config = &local_config;
+                       vtpci_read_dev_config(hw,
+                               offsetof(struct virtio_net_config, speed),
+                               &config->speed, sizeof(config->speed));
+                       vtpci_read_dev_config(hw,
+                               offsetof(struct virtio_net_config, duplex),
+                               &config->duplex, sizeof(config->duplex));
+                       hw->speed = config->speed;
+                       hw->duplex = config->duplex;
+               }
+       }
+       if (hw->speed == SPEED_UNKNOWN)
+               hw->speed = ETH_SPEED_NUM_10G;
+       if (hw->duplex == DUPLEX_UNKNOWN)
+               hw->duplex = ETH_LINK_FULL_DUPLEX;
+       PMD_INIT_LOG(DEBUG, "link speed = %d, duplex = %d",
+               hw->speed, hw->duplex);
        if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VQ)) {
                config = &local_config;
 
@@ -1865,7 +1885,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_10G;
+       uint32_t speed = SPEED_UNKNOWN;
        int ret;
 
        if (sizeof(struct virtio_net_hdr_mrg_rxbuf) > RTE_PKTMBUF_HEADROOM) {
@@ -2450,7 +2470,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
        struct virtio_hw *hw = dev->data->dev_private;
 
        memset(&link, 0, sizeof(link));
-       link.link_duplex = ETH_LINK_FULL_DUPLEX;
+       link.link_duplex = hw->duplex;
        link.link_speed  = hw->speed;
        link.link_autoneg = ETH_LINK_AUTONEG;
 

diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index cd89476..febaf17 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -37,7 +37,8 @@
         1ULL << VIRTIO_F_RING_PACKED     |     \
         1ULL << VIRTIO_F_IOMMU_PLATFORM  |     \
         1ULL << VIRTIO_F_ORDER_PLATFORM  |     \
-        1ULL << VIRTIO_F_NOTIFICATION_DATA)
+        1ULL << VIRTIO_F_NOTIFICATION_DATA | \
+        1ULL << VIRTIO_NET_F_SPEED_DUPLEX)
 
 #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES    \
        (VIRTIO_PMD_DEFAULT_GUEST_FEATURES |    \

diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 9cb7104..2ac665b 100644 (file)
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -141,6 +141,9 @@ struct virtnet_ctl;
  */
 #define VIRTIO_F_NOTIFICATION_DATA 38
 
+/* Device set linkspeed and duplex */
+#define VIRTIO_NET_F_SPEED_DUPLEX 63
+
 /* The Guest publishes the used index for which it expects an interrupt
  * at the end of the avail ring. Host should ignore the avail->flags field. */
 /* The Host publishes the avail index for which it expects a kick
@@ -260,6 +263,7 @@ struct virtio_hw {
        uint8_t     mac_addr[RTE_ETHER_ADDR_LEN];
        uint32_t    notify_off_multiplier;
        uint32_t    speed;  /* link speed in MB */
+       uint8_t     duplex;
        uint8_t     *isr;
        uint16_t    *notify_base;
        struct virtio_pci_common_cfg *common_cfg;
@@ -306,6 +310,18 @@ struct virtio_net_config {
        uint16_t   status;
        uint16_t   max_virtqueue_pairs;
        uint16_t   mtu;
+       /*
+        * speed, in units of 1Mb. All values 0 to INT_MAX are legal.
+        * Any other value stands for unknown.
+        */
+       uint32_t speed;
+       /*
+        * 0x00 - half duplex
+        * 0x01 - full duplex
+        * Any other value stands for unknown.
+        */
+       uint8_t duplex;
+
 } __rte_packed;
 
 /*