From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 74AD0A0588;
Thu, 16 Apr 2020 07:53:54 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0A3E91DAB6;
Thu, 16 Apr 2020 07:53:32 +0200 (CEST)
Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com
[210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 5E7ED1DAAF
for <dev@dpdk.org>; Thu, 16 Apr 2020 07:53:29 +0200 (CEST)
Received: from eucas1p2.samsung.com (unknown [182.198.249.207])
by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id
20200416055329euoutp01a387460e2d2be0d89812c10b4b15ee36~GNwQJJ0b22038420384euoutp01e
for <dev@dpdk.org>; Thu, 16 Apr 2020 05:53:29 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com
20200416055329euoutp01a387460e2d2be0d89812c10b4b15ee36~GNwQJJ0b22038420384euoutp01e
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com;
s=mail20170921; t=1587016409;
bh=/Sx5PLXWzYimOAlkENkZY4+K1nGA7XAmiXUi1RTi9wM=;
h=From:To:Subject:Date:In-Reply-To:References:From;
b=kYxxC59KBVPooMqH3lYQg63C9hfDnHdyPTfSgzUMMFfkSBoGifdwX1PaYhZb+a/FZ
kQjMIWRYzcyLGiBK4ilnYFO7/hrccJyoRXNCiCHcNpEnqT1j8E+pSF6wEwvy8zShvY
C13qErFrg25YCQCJWEAb1TvZwtfe9RhgF32SjmC4=
Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by
eucas1p2.samsung.com (KnoxPortal) with ESMTP id
20200416055328eucas1p2df8797ea8d01f120abd1ecfadf86b274~GNwP1_52n1557215572eucas1p2V;
Thu, 16 Apr 2020 05:53:28 +0000 (GMT)
Received: from eucas1p1.samsung.com ( [182.198.249.206]) by
eusmges2new.samsung.com (EUCPMTA) with SMTP id 54.85.60679.8D2F79E5; Thu, 16
Apr 2020 06:53:28 +0100 (BST)
Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by
eucas1p2.samsung.com (KnoxPortal) with ESMTPA id
20200416055328eucas1p24f25a424be76659170277b7362c8d700~GNwPgsS291938419384eucas1p2Q;
Thu, 16 Apr 2020 05:53:28 +0000 (GMT)
Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by
eusmtrp1.samsung.com (KnoxPortal) with ESMTP id
20200416055328eusmtrp1f424aa31fd04a1b4daab1c62d3d4f2ea~GNwPgDgli2642726427eusmtrp1i;
Thu, 16 Apr 2020 05:53:28 +0000 (GMT)
X-AuditID: cbfec7f4-0cbff7000001ed07-47-5e97f2d8d521
Received: from eusmtip2.samsung.com ( [203.254.199.222]) by
eusmgms2.samsung.com (EUCPMTA) with SMTP id B2.6D.07950.8D2F79E5; Thu, 16
Apr 2020 06:53:28 +0100 (BST)
Received: from idyukov.rnd.samsung.ru (unknown [106.109.129.29]) by
eusmtip2.samsung.com (KnoxPortal) with ESMTPA id
20200416055327eusmtip254535fe34259774eba0feb9913e5a783~GNwO5_nQm2636026360eusmtip2r;
Thu, 16 Apr 2020 05:53:27 +0000 (GMT)
From: Ivan Dyukov <i.dyukov@samsung.com>
To: dev@dpdk.org, maxime.coquelin@redhat.com, i.dyukov@samsung.com,
v.kuramshin@samsung.com, amorenoz@redhat.com, zhihong.wang@intel.com,
xiaolong.ye@intel.com, mb@smartsharesystems.com
Date: Thu, 16 Apr 2020 08:53:03 +0300
Message-Id: <20200416055309.19679-4-i.dyukov@samsung.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200416055309.19679-1-i.dyukov@samsung.com>
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEIsWRmVeSWpSXmKPExsWy7djPc7o3Pk2PM/jbYGDRuuMBi8W7T9uZ
LGZdamK3ONa5h8Wi79dVRovTNzezW/x5Y2qx+eIkJgcOj18LlrJ6LN7zksnj/b6rbB59W1Yx
epx61M0cwBrFZZOSmpNZllqkb5fAlTFz3S3mgsXmFXNP/WFqYHyr08XIySEhYCLx+34Dexcj
F4eQwApGiRtH5rJAOF8YJe5fnQ3lfGaUWNC1lxWm5eGRT8wgtpDAckaJ9jVuEEVfgdrnvWUB
SbAJaEic7pjHBGKLCOxllDh2pgDEFhawkvg5eSM7iM0ioCox8f8isBpeAUuJprb/TBAL5CVW
bzgAtoATqP5A9xmo+Hs2iQd3eSBsF4kVnZ+ZIWxhiVfHt7BD2DISpyf3sEDY1RLfN10H+01C
oINR4t6iVqgie4ktr88B2RwczAKaEut36UOEHSV2TPzOBhKWEOCTuPFWECTMDGRO2jadGSLM
K9HRJgRRrSRx4OQlqLCExN/fUId5SGy58h8aoHsYJR63nWaZwCg3C2HXAkbGVYziqaXFuemp
xUZ5qeV6xYm5xaV56XrJ+bmbGIEp4fS/4192MO76k3SIUYCDUYmH1+DltDgh1sSy4srcQ4wS
HMxKIrw7/KfHCfGmJFZWpRblxxeV5qQWH2KU5mBREuc1XvQyVkggPbEkNTs1tSC1CCbLxMEp
1cDI+uHdeT2P+UX/c5cfu/RG9Mz8VVkfC8/HiNw+vE5Ql13jjeP5vyKqoS8YDPM/R745LyHp
snOLiEiDnrOCfkujutwC49mf351eyFzyUylGTkrI+d3Vdx4nDzT0aP9objy7QlzkXZHGDXMR
u0dHqn96X1BaJi/16k/fo+ZSN77lH5b5rjB/yNykxFKckWioxVxUnAgAs2QzJwUDAAA=
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGLMWRmVeSWpSXmKPExsVy+t/xe7o3Pk2PMzjcJWHRuuMBi8W7T9uZ
LGZdamK3ONa5h8Wi79dVRovTNzezW/x5Y2qx+eIkJgcOj18LlrJ6LN7zksnj/b6rbB59W1Yx
epx61M0cwBqlZ1OUX1qSqpCRX1xiqxRtaGGkZ2hpoWdkYqlnaGwea2VkqqRvZ5OSmpNZllqk
b5eglzFz3S3mgsXmFXNP/WFqYHyr08XIySEhYCLx8Mgn5i5GLg4hgaWMEtPXb2PrYuQASkhI
vH7CDFEjLPHnWhcbRM1nRom7J86CJdgENCROd8xjAkmICBxnlOid9Z8JJCEsYCXxc/JGdhCb
RUBVYuL/RWBxXgFLiaY2iBoJAXmJ1RsOgA3iBKo/0H0GLC4kkCHR2HGMaQIj7wJGhlWMIqml
xbnpucVGesWJucWleel6yfm5mxiBYbrt2M8tOxi73gUfYhTgYFTi4e14PS1OiDWxrLgy9xCj
BAezkgjvDv/pcUK8KYmVValF+fFFpTmpxYcYTYGOmsgsJZqcD4yhvJJ4Q1NDcwtLQ3Njc2Mz
CyVx3g6BgzFCAumJJanZqakFqUUwfUwcnFINjMH3+Kcuk4kLfpYU9O1pKHdUbU/oR/4VpxS8
T9ZnzVOrZg/7d/Wi9C9Grv1H9+8serEsv1rByEZrlkVV91mzbafts1c8rDkYZn/nU+My3VUz
jqzaYvspqWXBl5QD+nsfrl5bfS49Mb9QMmJfcWjPnhtOyhfUnpyN2fFXQ2Gq/eJ1zlKCS/5E
GSqxFGckGmoxFxUnAgCW4Z8kaQIAAA==
X-CMS-MailID: 20200416055328eucas1p24f25a424be76659170277b7362c8d700
X-Msg-Generator: CA
Content-Type: text/plain; charset="utf-8"
X-RootMTR: 20200416055328eucas1p24f25a424be76659170277b7362c8d700
X-EPHeader: CA
CMS-TYPE: 201P
X-CMS-RootMailID: 20200416055328eucas1p24f25a424be76659170277b7362c8d700
References: <20191212085012.9170-1-i.dyukov@samsung.com>
<20200416055309.19679-1-i.dyukov@samsung.com>
<CGME20200416055328eucas1p24f25a424be76659170277b7362c8d700@eucas1p2.samsung.com>
Subject: [dpdk-dev] [PATCH v11 3/6] 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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.dyukov@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 60195ab3c..306241d37 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_FIXED;
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