From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Thomas Monjalon <thomas@monjalon.net>,
Andrew Rybchenko <arybchenko@solarflare.com>
Cc: dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,
Wenzhuo Lu <wenzhuo.lu@intel.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH v4 2/3] ethdev: fix device info getting
Date: Tue, 13 Nov 2018 11:12:37 +0000 [thread overview]
Message-ID: <20181113111238.80107-2-ferruh.yigit@intel.com> (raw)
In-Reply-To: <20181113111238.80107-1-ferruh.yigit@intel.com>
From: Wenzhuo Lu <wenzhuo.lu@intel.com>
The device information cannot be gotten correctly before
the configuration is set. Because on some NICs the
information has dependence on the configuration.
Fixes: 3be82f5cc5e3 ("ethdev: support PMD-tuned Tx/Rx parameters")
Cc: stable@dpdk.org
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
Cc: Andrew Rybchenko <arybchenko@solarflare.com>
---
lib/librte_ethdev/rte_ethdev.c | 35 +++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 04dff1f5e..0f01138ea 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1104,6 +1104,22 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_configure, -ENOTSUP);
+ if (dev->data->dev_started) {
+ RTE_ETHDEV_LOG(ERR,
+ "Port %u must be stopped to allow configuration\n",
+ port_id);
+ return -EBUSY;
+ }
+
+ /* Store original config, as rollback required on failure */
+ memcpy(&orig_conf, &dev->data->dev_conf, sizeof(dev->data->dev_conf));
+
+ /*
+ * Copy the dev_conf parameter into the dev structure.
+ * rte_eth_dev_info_get() requires dev_conf, copy it before dev_info get
+ */
+ memcpy(&dev->data->dev_conf, &local_conf, sizeof(dev->data->dev_conf));
+
rte_eth_dev_info_get(port_id, &dev_info);
/* If number of queues specified by application for both Rx and Tx is
@@ -1125,29 +1141,18 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
RTE_ETHDEV_LOG(ERR,
"Number of RX queues requested (%u) is greater than max supported(%d)\n",
nb_rx_q, RTE_MAX_QUEUES_PER_PORT);
- return -EINVAL;
+ ret = -EINVAL;
+ goto rollback;
}
if (nb_tx_q > RTE_MAX_QUEUES_PER_PORT) {
RTE_ETHDEV_LOG(ERR,
"Number of TX queues requested (%u) is greater than max supported(%d)\n",
nb_tx_q, RTE_MAX_QUEUES_PER_PORT);
- return -EINVAL;
- }
-
- if (dev->data->dev_started) {
- RTE_ETHDEV_LOG(ERR,
- "Port %u must be stopped to allow configuration\n",
- port_id);
- return -EBUSY;
+ ret = -EINVAL;
+ goto rollback;
}
- /* Store original config, as rollback required on failure */
- memcpy(&orig_conf, &dev->data->dev_conf, sizeof(dev->data->dev_conf));
-
- /* Copy the dev_conf parameter into the dev structure */
- memcpy(&dev->data->dev_conf, &local_conf, sizeof(dev->data->dev_conf));
-
/*
* Check that the numbers of RX and TX queues are not greater
* than the maximum number of RX and TX queues supported by the
--
2.17.2
next prev parent reply other threads:[~2018-11-13 11:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 5:27 [dpdk-dev] [PATCH] " Wenzhuo Lu
2018-07-12 8:06 ` Andrew Rybchenko
2018-07-13 1:56 ` Lu, Wenzhuo
2018-07-13 2:42 ` [dpdk-dev] [PATCH v2] " Wenzhuo Lu
2018-07-13 8:02 ` Andrew Rybchenko
2018-07-16 1:08 ` Lu, Wenzhuo
2018-07-16 1:58 ` Lu, Wenzhuo
2018-08-01 15:36 ` Thomas Monjalon
2018-08-13 2:50 ` Lu, Wenzhuo
2018-08-13 8:38 ` Andrew Rybchenko
2018-08-14 0:57 ` Lu, Wenzhuo
2018-08-22 16:55 ` Ferruh Yigit
2018-08-23 8:58 ` Andrew Rybchenko
2018-10-22 12:01 ` Ferruh Yigit
2018-10-22 12:13 ` Thomas Monjalon
2018-10-23 1:25 ` Lu, Wenzhuo
2018-10-23 7:28 ` Thomas Monjalon
2018-11-06 0:56 ` Lu, Wenzhuo
2018-11-06 7:40 ` Andrew Rybchenko
2018-11-08 2:09 ` [dpdk-dev] [PATCH v3 1/2] " Wenzhuo Lu
2018-11-08 2:09 ` [dpdk-dev] [PATCH v3 2/2] ethdev: device configuration enhancement Wenzhuo Lu
2018-11-08 6:25 ` Andrew Rybchenko
2018-11-09 21:10 ` Ferruh Yigit
2018-11-13 0:46 ` Lu, Wenzhuo
2018-11-13 9:40 ` Ferruh Yigit
2018-11-14 1:28 ` Lu, Wenzhuo
2018-11-13 11:12 ` [dpdk-dev] [PATCH v4 1/3] ethdev: fix invalid device configuration after failure Ferruh Yigit
2018-11-13 11:12 ` Ferruh Yigit [this message]
2018-11-13 11:19 ` [dpdk-dev] [PATCH v4 2/3] ethdev: fix device info getting Andrew Rybchenko
2018-11-13 11:12 ` [dpdk-dev] [PATCH v4 3/3] ethdev: eliminate interim variable Ferruh Yigit
2018-11-13 11:22 ` Andrew Rybchenko
2018-11-13 11:51 ` Ferruh Yigit
2018-11-13 11:56 ` Andrew Rybchenko
2018-11-13 11:19 ` [dpdk-dev] [PATCH v4 1/3] ethdev: fix invalid device configuration after failure Andrew Rybchenko
2018-11-13 17:49 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181113111238.80107-2-ferruh.yigit@intel.com \
--to=ferruh.yigit@intel.com \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).