From: Huisong Li <lihuisong@huawei.com>
To: <stable@dpdk.org>, <christian.ehrhardt@canonical.com>
Cc: <liudongdong3@huawei.com>, <fengchengwen@huawei.com>,
<huangdaode@huawei.com>, <haijie1@huawei.com>,
<lihuisong@huawei.com>
Subject: [PATCH 19.11 2/4] app/testpmd: fix bonding slave devices not released
Date: Tue, 19 Jul 2022 10:49:17 +0800 [thread overview]
Message-ID: <20220719024919.16999-3-lihuisong@huawei.com> (raw)
In-Reply-To: <20220719024919.16999-1-lihuisong@huawei.com>
[ upstream commit 3889a3220c9b93f07dfdf95e30b2661e6e3f698f ]
Currently, some eth devices are added to bond device, these devices are
not released when the quit command is executed in testpmd. This patch
adds the release operation for all active slaves under a bond device.
Fixes: 0e545d3047fe ("app/testpmd: check stopping port is not in bonding")
Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
---
app/test-pmd/cmdline.c | 1 +
app/test-pmd/testpmd.c | 38 ++++++++++++++++++++++++++++++++++++++
app/test-pmd/testpmd.h | 2 ++
3 files changed, 41 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b7a59203ac..a2e65a7e4d 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8058,6 +8058,7 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result,
__attribute__((unused)) void *data)
{
cmdline_quit(cl);
+ cl_quit = 1;
}
cmdline_parse_token_string_t cmd_quit_quit =
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index ba4c3dafb7..cce2cbb5c2 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -209,6 +209,7 @@ uint16_t stats_period; /**< Period to show statistics (disabled by default) */
* option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
*/
uint8_t f_quit;
+uint8_t cl_quit; /* Quit testpmd from cmdline. */
/*
* Configuration of packet segments used by the "txonly" processing engine.
@@ -2616,11 +2617,36 @@ remove_invalid_ports(void)
nb_cfg_ports = nb_fwd_ports;
}
+static void
+clear_bonding_slave_device(portid_t *slave_pids, uint16_t num_slaves)
+{
+ struct rte_port *port;
+ portid_t slave_pid;
+ uint16_t i;
+
+ for (i = 0; i < num_slaves; i++) {
+ slave_pid = slave_pids[i];
+ if (port_is_started(slave_pid) == 1) {
+ rte_eth_dev_stop(slave_pid);
+ port = &ports[slave_pid];
+ port->port_status = RTE_PORT_STOPPED;
+ }
+
+ clear_port_slave_flag(slave_pid);
+
+ /* Close slave device when testpmd quit or is killed. */
+ if (cl_quit == 1 || f_quit == 1)
+ rte_eth_dev_close(slave_pid);
+ }
+}
+
void
close_port(portid_t pid)
{
portid_t pi;
struct rte_port *port;
+ portid_t slave_pids[RTE_MAX_ETHPORTS];
+ int num_slaves = 0;
if (port_id_is_invalid(pid, ENABLED_WARN))
return;
@@ -2656,7 +2682,19 @@ close_port(portid_t pid)
if (port->flow_list)
port_flow_flush(pi);
+
+#ifdef RTE_LIBRTE_PMD_BOND
+ if (port->bond_flag == 1)
+ num_slaves = rte_eth_bond_slaves_get(pi,
+ slave_pids, RTE_MAX_ETHPORTS);
+#endif
rte_eth_dev_close(pi);
+ /*
+ * If this port is bonded device, all slaves under the
+ * device need to be removed or closed.
+ */
+ if (port->bond_flag == 1 && num_slaves > 0)
+ clear_bonding_slave_device(slave_pids, num_slaves);
remove_invalid_ports();
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 2690dda2e2..a3ae3f392a 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -23,6 +23,8 @@
#define RTE_PORT_CLOSED (uint16_t)2
#define RTE_PORT_HANDLING (uint16_t)3
+extern uint8_t cl_quit;
+
/*
* It is used to allocate the memory for hash key.
* The hash key size is NIC dependent.
--
2.22.0
next prev parent reply other threads:[~2022-07-19 2:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 2:49 [PATCH 19.11 0/4] backporting some bonding bugfix and RSS display Huisong Li
2022-07-19 2:49 ` [PATCH 19.11 1/4] app/testpmd: fix port status of bonding slave device Huisong Li
2022-07-19 2:49 ` Huisong Li [this message]
2022-07-19 2:49 ` [PATCH 19.11 3/4] app/testpmd: fix supported RSS offload display Huisong Li
2022-07-19 2:49 ` [PATCH 19.11 4/4] net/bonding: fix stopping non-active slaves Huisong Li
2022-08-03 9:55 ` [PATCH 19.11 0/4] backporting some bonding bugfix and RSS display Christian Ehrhardt
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=20220719024919.16999-3-lihuisong@huawei.com \
--to=lihuisong@huawei.com \
--cc=christian.ehrhardt@canonical.com \
--cc=fengchengwen@huawei.com \
--cc=haijie1@huawei.com \
--cc=huangdaode@huawei.com \
--cc=liudongdong3@huawei.com \
--cc=stable@dpdk.org \
/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).