From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0828FA00C2 for ; Mon, 30 May 2022 08:01:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD41F40A82; Mon, 30 May 2022 08:01:58 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 481F340A82; Mon, 30 May 2022 08:01:57 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4LBPrx3sbwzbbl1; Mon, 30 May 2022 14:00:17 +0800 (CST) Received: from [10.67.103.128] (10.67.103.128) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 30 May 2022 14:01:54 +0800 Subject: Re: [PATCH V2 4/4] app/testpmd: fix slave device isn't released To: CC: Huisong Li , , Xiaoyun Li , Aman Singh , Yuying Zhang , Pablo de Lara , Bernard Iremonger , Ferruh Yigit References: <20211025063922.34066-1-humin29@huawei.com> <20220324030036.4761-1-humin29@huawei.com> <20220324030036.4761-5-humin29@huawei.com> From: "Min Hu (Connor)" Message-ID: <7e71fe75-776a-d68a-6a8a-e0f227367d97@huawei.com> Date: Mon, 30 May 2022 14:01:53 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <20220324030036.4761-5-humin29@huawei.com> Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.103.128] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, all, any comments for this patch? ÔÚ 2022/3/24 11:00, Min Hu (Connor) дµÀ: > From: Huisong Li > > 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 > Signed-off-by: Min Hu (Connor) > --- > app/test-pmd/cmdline.c | 1 + > app/test-pmd/testpmd.c | 48 ++++++++++++++++++++++++++++++++++++++++++ > app/test-pmd/testpmd.h | 2 ++ > 3 files changed, 51 insertions(+) > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c > index f0efcf09f0..cd3873e1e0 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -8891,6 +8891,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result, > __rte_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 dc90600787..22700e073d 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. > @@ -3167,11 +3168,43 @@ remove_invalid_ports(void) > nb_cfg_ports = nb_fwd_ports; > } > > +#ifdef RTE_NET_BOND > +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) { > + 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); > + } > +} > +#endif > + > void > close_port(portid_t pid) > { > portid_t pi; > struct rte_port *port; > +#ifdef RTE_NET_BOND > + portid_t slave_pids[RTE_MAX_ETHPORTS]; > + int num_slaves = 0; > +#endif > > if (port_id_is_invalid(pid, ENABLED_WARN)) > return; > @@ -3205,7 +3238,22 @@ close_port(portid_t pid) > if (is_proc_primary()) { > port_flow_flush(pi); > port_flex_item_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); > +#ifdef RTE_NET_BOND > + /* > + * 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); > +#endif > } > > free_xstats_display_info(pi); > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h > index 67f253b30e..5af9455012 100644 > --- a/app/test-pmd/testpmd.h > +++ b/app/test-pmd/testpmd.h > @@ -32,6 +32,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. >