From: "Min Hu (Connor)" <humin29@huawei.com>
To: <dev@dpdk.org>
Cc: <ferruh.yigit@intel.com>, <xiaoyun.li@intel.com>
Subject: [dpdk-dev] [PATCH 1/2] app/testpmd: add link speed check before port start
Date: Mon, 19 Apr 2021 14:21:42 +0800 [thread overview]
Message-ID: <1618813303-32945-2-git-send-email-humin29@huawei.com> (raw)
In-Reply-To: <1618813303-32945-1-git-send-email-humin29@huawei.com>
From: Huisong Li <lihuisong@huawei.com>
Currently, to check whether the configured link_speeds is valid, we
have to run "port start". In addition, if the configuration fails,
"port->dev_conf.link_speeds" maintained in testpmd cannot be
restored.
This patch adds the link_speeds check before port start by calling
dev_configure, and resolves these problems.
Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
app/test-pmd/cmdline.c | 40 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 5bf1497..09e30cf 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1537,8 +1537,12 @@ cmd_config_speed_all_parsed(void *parsed_result,
__rte_unused void *data)
{
struct cmd_config_speed_all *res = parsed_result;
+ uint32_t old_link_speeds[RTE_MAX_ETHPORTS];
+ struct rte_port *port;
uint32_t link_speed;
portid_t pid;
+ portid_t i;
+ int ret;
if (!all_ports_stopped()) {
printf("Please stop all ports first\n");
@@ -1550,7 +1554,26 @@ cmd_config_speed_all_parsed(void *parsed_result,
return;
RTE_ETH_FOREACH_DEV(pid) {
- ports[pid].dev_conf.link_speeds = link_speed;
+ port = &ports[pid];
+ old_link_speeds[pid] = port->dev_conf.link_speeds;
+ port->dev_conf.link_speeds = link_speed;
+ ret = rte_eth_dev_configure(pid, nb_rxq, nb_txq,
+ &port->dev_conf);
+ if (ret < 0) {
+ printf("Failed to check link speeds for port %d, ret = %d.\n",
+ pid, ret);
+ goto roolback;
+ }
+ }
+
+ cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
+
+ return;
+
+roolback:
+ for (i = 0; i <= pid; i++) {
+ port = &ports[i];
+ port->dev_conf.link_speeds = old_link_speeds[i];
}
cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
@@ -1609,7 +1632,10 @@ cmd_config_speed_specific_parsed(void *parsed_result,
__rte_unused void *data)
{
struct cmd_config_speed_specific *res = parsed_result;
+ uint32_t old_link_speeds;
+ struct rte_port *port;
uint32_t link_speed;
+ int ret;
if (!all_ports_stopped()) {
printf("Please stop all ports first\n");
@@ -1623,7 +1649,17 @@ cmd_config_speed_specific_parsed(void *parsed_result,
&link_speed) < 0)
return;
- ports[res->id].dev_conf.link_speeds = link_speed;
+ port = &ports[res->id];
+ old_link_speeds = port->dev_conf.link_speeds;
+ port->dev_conf.link_speeds = link_speed;
+ ret = rte_eth_dev_configure(res->id, nb_rxq, nb_txq,
+ &port->dev_conf);
+ if (ret < 0) {
+ printf("Failed to check link speeds for port %d, ret = %d.\n",
+ res->id, ret);
+ port->dev_conf.link_speeds = old_link_speeds;
+ return;
+ }
cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1);
}
--
2.7.4
next prev parent reply other threads:[~2021-04-19 6:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 6:21 [dpdk-dev] [PATCH 0/2] fixes for link speed Min Hu (Connor)
2021-04-19 6:21 ` Min Hu (Connor) [this message]
2021-04-20 12:11 ` [dpdk-dev] [PATCH 1/2] app/testpmd: add link speed check before port start Ferruh Yigit
2021-04-21 3:44 ` Min Hu (Connor)
2021-04-19 6:21 ` [dpdk-dev] [PATCH 2/2] app/testpmd: fix link speed for a specified port Min Hu (Connor)
2021-04-19 22:52 ` Ferruh Yigit
2021-04-28 8:36 ` [dpdk-dev] [PATCH v2 0/2] fixes for link speed Min Hu (Connor)
2021-04-28 8:36 ` [dpdk-dev] [PATCH v2 1/2] app/testpmd: add link speed check before port start Min Hu (Connor)
2021-04-30 3:19 ` Li, Xiaoyun
2021-04-30 4:04 ` Huisong Li
2021-04-30 4:46 ` Li, Xiaoyun
2021-05-04 1:46 ` Huisong Li
2021-05-06 2:36 ` Li, Xiaoyun
2021-05-06 6:46 ` Huisong Li
2021-06-08 10:34 ` Andrew Rybchenko
2021-06-08 10:49 ` Andrew Rybchenko
2021-06-10 6:13 ` Huisong Li
2021-04-28 8:36 ` [dpdk-dev] [PATCH v2 2/2] app/testpmd: fix link speed for a specified port Min Hu (Connor)
2021-04-29 8:42 ` Li, Xiaoyun
2021-07-02 10:02 ` Andrew Rybchenko
2021-06-08 10:29 ` [dpdk-dev] [PATCH v2 0/2] fixes for link speed Andrew Rybchenko
2021-06-10 6:19 ` Huisong Li
2021-06-28 3:25 ` Min Hu (Connor)
2021-06-29 6:24 ` Singh, Aman Deep
2021-06-29 7:31 ` Min Hu (Connor)
2021-07-02 10:05 ` Andrew Rybchenko
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=1618813303-32945-2-git-send-email-humin29@huawei.com \
--to=humin29@huawei.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=xiaoyun.li@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).