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 892F5A0563; Wed, 15 Apr 2020 17:17:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E389F1D6B6; Wed, 15 Apr 2020 17:17:46 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 2FB5A1D938 for ; Wed, 15 Apr 2020 17:17:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586963862; 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=ElXczAZHBR72lGEb6QgFynjkgSvpFdJBsqFJnSRNv4s=; b=NQpVr//hsehhk2f0wp+0Ged9N8zTL3PO+gaoj47GSRULypVfQpC1oT+m1UuTOiRvyPCj72 oeCKH8WI1h17A2iAa6DTTYg7WBLlcfj1Kx6hUU757VcPq4GFDKQwIDTiVYdDFMXmIlOKac uq3gUbUSfSVHUkVkfAdgMUuDeHNqvfA= 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-393-_OcdnsRrMr2hWvn7ML1ufQ-1; Wed, 15 Apr 2020 11:17:38 -0400 X-MC-Unique: _OcdnsRrMr2hWvn7ML1ufQ-1 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 7FE5219057DB; Wed, 15 Apr 2020 15:17:37 +0000 (UTC) Received: from [10.36.110.44] (unknown [10.36.110.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7FCDC0DB9; Wed, 15 Apr 2020 15:17:33 +0000 (UTC) To: Ivan Dyukov , dev@dpdk.org, v.kuramshin@samsung.com, amorenoz@redhat.com, zhihong.wang@intel.com, xiaolong.ye@intel.com, mb@smartsharesystems.com References: <20191212085012.9170-1-i.dyukov@samsung.com> <20200406085855.25773-1-i.dyukov@samsung.com> <20200406085855.25773-6-i.dyukov@samsung.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: Date: Wed, 15 Apr 2020 17:17:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200406085855.25773-6-i.dyukov@samsung.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v9 5/5] net/virtio: Support of VIRTIO_NET_F_SPEED_DUPLEX 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" Hi Ivan, On 4/6/20 10:58 AM, Ivan Dyukov wrote: > This patch adds a support of VIRTIO_NET_F_SPEED_DUPLEX feature > for virtio driver. Set default speed to 0xffffffff and default > duplex to 0xff >=20 > There are few ways to specify speed of the link: s/few/two/ > 'speed' devarg > negotiate speed from qemu via VIRTIO_NET_F_SPEED_DUPLEX Thanks for taking care of that, I appreciate it. It should be used soon with vDPA. > The highest priority is devarg. If devarg is not specified, > drivers tries to negotiate it from qemu. >=20 > Signed-off-by: Ivan Dyukov > --- > doc/guides/nics/virtio.rst | 4 ++-- > drivers/net/virtio/virtio_ethdev.c | 16 +++++++++++++++- > drivers/net/virtio/virtio_ethdev.h | 3 ++- > drivers/net/virtio/virtio_pci.h | 15 +++++++++++++++ > lib/librte_ethdev/rte_ethdev.h | 27 ++++++++++++++------------- > 5 files changed, 48 insertions(+), 17 deletions(-) >=20 > diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst > index e70b6653b..06c7a19aa 100644 > --- a/doc/guides/nics/virtio.rst > +++ b/doc/guides/nics/virtio.rst > @@ -361,7 +361,7 @@ Below devargs are supported by the PCI virtio driver: > 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: 10000 (10G)) > + (Default: 0xffffffff (unknown)) I think the Default should be changed in the initial patch, not in the last one. > =20 > Below devargs are supported by the virtio-user vdev: > =20 > @@ -415,7 +415,7 @@ Below devargs are supported by the virtio-user vdev: > 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: 10000 (10G)) > + (Default: 0xffffffff (unknown)) > =20 > =20 > Virtio paths Selection and Usage > diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virt= io_ethdev.c > index eb46a5a11..0137efcc5 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -1718,6 +1718,20 @@ virtio_init_device(struct rte_eth_dev *eth_dev, ui= nt64_t req_features) > =09=09 hw->mac_addr[0], hw->mac_addr[1], hw->mac_addr[2], > =09=09 hw->mac_addr[3], hw->mac_addr[4], hw->mac_addr[5]); > =20 > +=09if (vtpci_with_feature(hw, VIRTIO_NET_F_SPEED_DUPLEX)) { > +=09=09config =3D &local_config; > +=09=09/* if speed is not specified in devargs */ > +=09=09if (hw->speed =3D=3D ETH_SPEED_NUM_UNKNOWN) { > +=09=09=09vtpci_read_dev_config(hw, > +=09=09=09=09offsetof(struct virtio_net_config, speed), > +=09=09=09=09&config->speed, sizeof(config->speed)); > +=09=09=09hw->speed =3D config->speed; > +=09=09} > +=09} > + > +=09PMD_INIT_LOG(DEBUG, "link speed =3D %u%s", > +=09=09hw->speed, hw->speed =3D=3D ETH_SPEED_NUM_UNKNOWN ? > +=09=09"(UNKNOWN)" : ""); > =09if (vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VQ)) { > =09=09config =3D &local_config; > =20 > @@ -1865,7 +1879,7 @@ int > eth_virtio_dev_init(struct rte_eth_dev *eth_dev) > { > =09struct virtio_hw *hw =3D eth_dev->data->dev_private; > -=09uint32_t speed =3D ETH_SPEED_NUM_10G; > +=09uint32_t speed =3D ETH_SPEED_NUM_UNKNOWN; > =09int ret; > =20 > =09if (sizeof(struct virtio_net_hdr_mrg_rxbuf) > RTE_PKTMBUF_HEADROOM) { > diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virt= io_ethdev.h > index cd8947656..febaf17a8 100644 > --- a/drivers/net/virtio/virtio_ethdev.h > +++ b/drivers/net/virtio/virtio_ethdev.h > @@ -37,7 +37,8 @@ > =09 1ULL << VIRTIO_F_RING_PACKED=09 |=09\ > =09 1ULL << VIRTIO_F_IOMMU_PLATFORM |=09\ > =09 1ULL << VIRTIO_F_ORDER_PLATFORM |=09\ > -=09 1ULL << VIRTIO_F_NOTIFICATION_DATA) > +=09 1ULL << VIRTIO_F_NOTIFICATION_DATA | \ > +=09 1ULL << VIRTIO_NET_F_SPEED_DUPLEX) > =20 > #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES=09\ > =09(VIRTIO_PMD_DEFAULT_GUEST_FEATURES |=09\ > diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_= pci.h > index ed98e11c3..2948760ab 100644 > --- 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 > =20 > +/* 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 fie= ld. */ > /* The Host publishes the avail index for which it expects a kick > @@ -306,6 +309,18 @@ struct virtio_net_config { > =09uint16_t status; > =09uint16_t max_virtqueue_pairs; > =09uint16_t mtu; > +=09/* > +=09 * speed, in units of 1Mb. All values 0 to INT_MAX are legal. > +=09 * Any other value stands for unknown. > +=09 */ > +=09uint32_t speed; > +=09/* > +=09 * 0x00 - half duplex > +=09 * 0x01 - full duplex > +=09 * Any other value stands for unknown. > +=09 */ > +=09uint8_t duplex; > + > } __attribute__((packed)); > =20 > /* Below change should be in a dedicated patch, and I would prefer it to be the first patch in the series. > diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethde= v.h > index d1a593ad1..a15ea572e 100644 > --- a/lib/librte_ethdev/rte_ethdev.h > +++ b/lib/librte_ethdev/rte_ethdev.h > @@ -287,19 +287,20 @@ struct rte_eth_stats { > /** > * Ethernet numeric link speeds in Mbps > */ > -#define ETH_SPEED_NUM_NONE 0 /**< Not defined */ > -#define ETH_SPEED_NUM_10M 10 /**< 10 Mbps */ > -#define ETH_SPEED_NUM_100M 100 /**< 100 Mbps */ > -#define ETH_SPEED_NUM_1G 1000 /**< 1 Gbps */ > -#define ETH_SPEED_NUM_2_5G 2500 /**< 2.5 Gbps */ > -#define ETH_SPEED_NUM_5G 5000 /**< 5 Gbps */ > -#define ETH_SPEED_NUM_10G 10000 /**< 10 Gbps */ > -#define ETH_SPEED_NUM_20G 20000 /**< 20 Gbps */ > -#define ETH_SPEED_NUM_25G 25000 /**< 25 Gbps */ > -#define ETH_SPEED_NUM_40G 40000 /**< 40 Gbps */ > -#define ETH_SPEED_NUM_50G 50000 /**< 50 Gbps */ > -#define ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */ > -#define ETH_SPEED_NUM_100G 100000 /**< 100 Gbps */ > +#define ETH_SPEED_NUM_NONE 0 /**< Not defined */ > +#define ETH_SPEED_NUM_10M 10 /**< 10 Mbps */ > +#define ETH_SPEED_NUM_100M 100 /**< 100 Mbps */ > +#define ETH_SPEED_NUM_1G 1000 /**< 1 Gbps */ > +#define ETH_SPEED_NUM_2_5G 2500 /**< 2.5 Gbps */ > +#define ETH_SPEED_NUM_5G 5000 /**< 5 Gbps */ > +#define ETH_SPEED_NUM_10G 10000 /**< 10 Gbps */ > +#define ETH_SPEED_NUM_20G 20000 /**< 20 Gbps */ > +#define ETH_SPEED_NUM_25G 25000 /**< 25 Gbps */ > +#define ETH_SPEED_NUM_40G 40000 /**< 40 Gbps */ > +#define ETH_SPEED_NUM_50G 50000 /**< 50 Gbps */ > +#define ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */ > +#define ETH_SPEED_NUM_100G 100000 /**< 100 Gbps */ > +#define ETH_SPEED_NUM_UNKNOWN 0xffffffff /**< Unknown */ > =20 > /** > * A structure used to retrieve link-level information of an Ethernet po= rt. >=20 Thanks, Maxime