[1/2] net/virtio: set UNKNOWN as default speed
Checks
Commit Message
rte_ethdev states new rule for NICs: they should return UNKNOWN
speed if speed is unknown and interface is up, in case of down
interface, NONE speed should be returned.
Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
---
doc/guides/nics/virtio.rst | 4 ++--
drivers/net/virtio/virtio_ethdev.c | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
Comments
Hi Ivan,
On 9/22/20 11:18 PM, Ivan Dyukov wrote:
> rte_ethdev states new rule for NICs: they should return UNKNOWN
> speed if speed is unknown and interface is up, in case of down
> interface, NONE speed should be returned.
>
> Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
> ---
> doc/guides/nics/virtio.rst | 4 ++--
> drivers/net/virtio/virtio_ethdev.c | 9 ++++-----
> 2 files changed, 6 insertions(+), 7 deletions(-)
>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
ps: CI reports build failure, but it builds when applied on top of
latest next-net.
Thanks!
Maxime
On Fri, Sep 25, 2020 at 4:36 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
> On 9/22/20 11:18 PM, Ivan Dyukov wrote:
> > rte_ethdev states new rule for NICs: they should return UNKNOWN
> > speed if speed is unknown and interface is up, in case of down
> > interface, NONE speed should be returned.
> >
> > Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
> > ---
> > doc/guides/nics/virtio.rst | 4 ++--
> > drivers/net/virtio/virtio_ethdev.c | 9 ++++-----
> > 2 files changed, 6 insertions(+), 7 deletions(-)
> >
>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>
> ps: CI reports build failure, but it builds when applied on top of
> latest next-net.
You scared me :-).
Applied on: CommitID:89f6a4be217f22f7592b616d5d69c775530dce88
DPDK git baseline: Repo:dpdk-next-virtio, CommitID:
89f6a4be217f22f7592b616d5d69c775530dce88
The patches just hit the list before you aligned next-virtio to next-net.
On 9/22/20 11:18 PM, Ivan Dyukov wrote:
> rte_ethdev states new rule for NICs: they should return UNKNOWN
> speed if speed is unknown and interface is up, in case of down
> interface, NONE speed should be returned.
>
> Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
> ---
> doc/guides/nics/virtio.rst | 4 ++--
> drivers/net/virtio/virtio_ethdev.c | 9 ++++-----
> 2 files changed, 6 insertions(+), 7 deletions(-)
Applied to dpdk-next-virtio/main.
Thanks,
Maxime
@@ -361,7 +361,7 @@ Below devargs are supported by the PCI virtio driver:
It is used to specify link speed of virtio device. Link speed is a part of
link status structure. It could be requested by application using
rte_eth_link_get_nowait function.
- (Default: 10000 (10G))
+ (Default: 0xffffffff (Unknown))
#. ``vectorized``:
@@ -422,7 +422,7 @@ Below devargs are supported by the virtio-user vdev:
It is used to specify link speed of virtio device. Link speed is a part of
link status structure. It could be requested by application using
rte_eth_link_get_nowait function.
- (Default: 10000 (10G))
+ (Default: 0xffffffff (Unknown))
#. ``vectorized``:
@@ -1666,7 +1666,6 @@ 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
@@ -1723,7 +1722,7 @@ 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 (hw->speed == ETH_SPEED_NUM_UNKNOWN) {
if (vtpci_with_feature(hw, VIRTIO_NET_F_SPEED_DUPLEX)) {
config = &local_config;
vtpci_read_dev_config(hw,
@@ -1736,8 +1735,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
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",
@@ -1889,7 +1886,7 @@ int
eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
{
struct virtio_hw *hw = eth_dev->data->dev_private;
- uint32_t speed = SPEED_UNKNOWN;
+ uint32_t speed = ETH_SPEED_NUM_UNKNOWN;
int vectorized = 0;
int ret;
@@ -2552,6 +2549,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
if (!hw->started) {
link.link_status = ETH_LINK_DOWN;
+ link.link_speed = ETH_SPEED_NUM_NONE;
} else if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) {
PMD_INIT_LOG(DEBUG, "Get link status from hw");
vtpci_read_dev_config(hw,
@@ -2559,6 +2557,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
&status, sizeof(status));
if ((status & VIRTIO_NET_S_LINK_UP) == 0) {
link.link_status = ETH_LINK_DOWN;
+ link.link_speed = ETH_SPEED_NUM_NONE;
PMD_INIT_LOG(DEBUG, "Port %d is down",
dev->data->port_id);
} else {