From: Ferruh Yigit <ferruh.yigit@xilinx.com>
To: Dongdong Liu <liudongdong3@huawei.com>, <dev@dpdk.org>
Cc: <stable@dpdk.org>, <xiaoyun.li@intel.com>,
<aman.deep.singh@intel.com>, <yuying.zhang@intel.com>,
<bernard.iremonger@intel.com>, <pablo.de.lara.guarch@intel.com>,
Huisong Li <lihuisong@huawei.com>, Min Hu <humin29@huawei.com>
Subject: Re: [PATCH v4] app/testpmd: fix slave device isn't released
Date: Tue, 7 Jun 2022 15:31:24 +0100 [thread overview]
Message-ID: <9a0fcfdf-6302-36f8-e26a-ff228cccfc74@xilinx.com> (raw)
In-Reply-To: <20220607081038.23859-1-liudongdong3@huawei.com>
On 6/7/2022 9:10 AM, Dongdong Liu wrote:
> From: Huisong Li <lihuisong@huawei.com>
>
> 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")
> Cc: stable@dpdk.org
>
> 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>
> ---
> app/test-pmd/cmdline.c | 1 +
> app/test-pmd/testpmd.c | 46 ++++++++++++++++++++++++++++++++++++++++++
> app/test-pmd/testpmd.h | 2 ++
> 3 files changed, 49 insertions(+)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index fdd0cada3b..6c58b02650 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -8915,6 +8915,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,
> __rte_unused void *data)
> {
> cmdline_quit(cl);
> + cl_quit = 1;
> }
>
> static cmdline_parse_token_string_t cmd_quit_quit =
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index fc1b64b60d..2b16551a26 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -229,6 +229,7 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */
> * option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
> */
> uint8_t f_quit;
> +uint8_t cl_quit; /* Quit testpmd from cmdline. */
>
> /*
> * Max Rx frame size, set by '--max-pkt-len' parameter.
> @@ -3201,11 +3202,44 @@ remove_invalid_ports(void)
> nb_cfg_ports = nb_fwd_ports;
> }
>
> +static void
> +clear_bonding_slave_device(portid_t *slave_pids, uint16_t num_slaves)
> +{
> +#ifdef RTE_NET_BOND
> + 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) {
> + if (rte_eth_dev_stop(slave_pid) != 0)
> + fprintf(stderr, "rte_eth_dev_stop failed for port %u\n",
> + 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);
> + }
> +#else
> + RTE_SET_USED(slave_pids);
> + RTE_SET_USED(num_slaves);
> +#endif
Do we need this #ifdef, everything is already available in compile time.
> +}
> +
> 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;
> @@ -3240,7 +3274,19 @@ close_port(portid_t pid)
> port_flow_flush(pi);
> port_flex_item_flush(pi);
> port_action_handle_flush(pi);
> +#ifdef RTE_NET_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);
> }
>
> free_xstats_display_info(pi);
> diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
> index 6693813dda..b44d5dd5ac 100644
> --- a/app/test-pmd/testpmd.h
> +++ b/app/test-pmd/testpmd.h
> @@ -38,6 +38,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.
next prev parent reply other threads:[~2022-06-07 14:31 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211025063922.34066-1-humin29@huawei.com>
[not found] ` <20220324030036.4761-1-humin29@huawei.com>
2022-03-24 3:00 ` [PATCH V2 1/4] net/bonding: fix non-active slaves aren't stopped Min Hu (Connor)
2022-04-26 18:19 ` Ferruh Yigit
2022-04-29 6:45 ` Min Hu (Connor)
2022-04-29 13:31 ` Ferruh Yigit
2022-05-03 6:54 ` Min Hu (Connor)
2022-05-03 19:04 ` Ferruh Yigit
2022-05-05 1:16 ` Min Hu (Connor)
2022-03-24 3:00 ` [PATCH V2 2/4] net/bonding: fix non-terminable while loop Min Hu (Connor)
2022-04-26 18:19 ` Ferruh Yigit
2022-04-29 6:52 ` Min Hu (Connor)
2022-04-29 13:35 ` Ferruh Yigit
2022-03-24 3:00 ` [PATCH V2 3/4] app/testpmd: fix port status of slave device Min Hu (Connor)
2022-03-24 3:00 ` [PATCH V2 4/4] app/testpmd: fix slave device isn't released Min Hu (Connor)
2022-05-30 6:01 ` Min Hu (Connor)
2022-05-30 10:21 ` Singh, Aman Deep
[not found] ` <20220503100217.46203-1-humin29@huawei.com>
2022-05-03 10:02 ` [PATCH v3 1/5] net/bonding: fix non-active slaves aren't stopped Min Hu (Connor)
2022-05-03 10:02 ` [PATCH v3 2/5] net/bonding: fix non-terminable while loop Min Hu (Connor)
2022-05-03 10:02 ` [PATCH v3 3/5] app/testpmd: fix port status of slave device Min Hu (Connor)
2022-05-03 23:39 ` Konstantin Ananyev
2022-05-06 8:16 ` Min Hu (Connor)
2022-05-08 11:28 ` Konstantin Ananyev
2022-05-10 16:34 ` Ferruh Yigit
2022-05-10 21:48 ` Konstantin Ananyev
2022-05-11 2:16 ` Min Hu (Connor)
2022-05-11 10:05 ` Ferruh Yigit
2022-05-11 2:14 ` [PATCH v4] " Min Hu (Connor)
2022-05-11 22:08 ` Konstantin Ananyev
2022-05-19 7:15 ` Andrew Rybchenko
2022-05-03 10:02 ` [PATCH v3 4/5] app/testpmd: fix slave device isn't released Min Hu (Connor)
2022-06-01 17:54 ` Ferruh Yigit
2022-06-07 8:15 ` Dongdong Liu
2022-06-07 8:10 ` [PATCH v4] " Dongdong Liu
2022-06-07 14:31 ` Ferruh Yigit [this message]
2022-06-09 7:50 ` Dongdong Liu
2022-06-09 8:50 ` Ferruh Yigit
2022-06-09 11:20 ` Dongdong Liu
2022-06-09 11:49 ` [PATCH v5] " Dongdong Liu
2022-06-10 8:10 ` Ferruh Yigit
2022-05-03 10:02 ` [PATCH v3 5/5] ethdev: fix dev state when stop Min Hu (Connor)
2022-05-25 17:44 ` Ferruh Yigit
2022-05-26 10:21 ` Thomas Monjalon
2022-05-30 12:04 ` 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=9a0fcfdf-6302-36f8-e26a-ff228cccfc74@xilinx.com \
--to=ferruh.yigit@xilinx.com \
--cc=aman.deep.singh@intel.com \
--cc=bernard.iremonger@intel.com \
--cc=dev@dpdk.org \
--cc=humin29@huawei.com \
--cc=lihuisong@huawei.com \
--cc=liudongdong3@huawei.com \
--cc=pablo.de.lara.guarch@intel.com \
--cc=stable@dpdk.org \
--cc=xiaoyun.li@intel.com \
--cc=yuying.zhang@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).