From patchwork Thu Mar 24 03:00:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 108830 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2694DA0507; Thu, 24 Mar 2022 04:01:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1367A4280E; Thu, 24 Mar 2022 04:01:26 +0100 (CET) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 87B154280E; Thu, 24 Mar 2022 04:01:24 +0100 (CET) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4KP93F3cVGz1GCyG; Thu, 24 Mar 2022 11:01:13 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Thu, 24 Mar 2022 11:01:22 +0800 From: "Min Hu (Connor)" To: CC: Huisong Li , , Min Hu , Chas Williams , Radu Nicolau Subject: [PATCH V2 1/4] net/bonding: fix non-active slaves aren't stopped Date: Thu, 24 Mar 2022 11:00:33 +0800 Message-ID: <20220324030036.4761-2-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220324030036.4761-1-humin29@huawei.com> References: <20211025063922.34066-1-humin29@huawei.com> <20220324030036.4761-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Huisong Li When stopping a bonded port, all slaves should be deactivated. But only active slaves are stopped. So fix it and do "deactivae_slave()" for active slaves. Fixes: 0911d4ec0183 ("net/bonding: fix crash when stopping mode 4 port") Cc: stable@dpdk.org Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index b305b6a35b..469dc71170 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2118,18 +2118,20 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) internals->link_status_polling_enabled = 0; for (i = 0; i < internals->slave_count; i++) { uint16_t slave_id = internals->slaves[i].port_id; + + internals->slaves[i].last_link_status = 0; + ret = rte_eth_dev_stop(slave_id); + if (ret != 0) { + RTE_BOND_LOG(ERR, "Failed to stop device on port %u", + slave_id); + return ret; + } + + /* active slaves need to deactivate. */ if (find_slave_by_id(internals->active_slaves, internals->active_slave_count, slave_id) != - internals->active_slave_count) { - internals->slaves[i].last_link_status = 0; - ret = rte_eth_dev_stop(slave_id); - if (ret != 0) { - RTE_BOND_LOG(ERR, "Failed to stop device on port %u", - slave_id); - return ret; - } + internals->active_slave_count) deactivate_slave(eth_dev, slave_id); - } } return 0; From patchwork Thu Mar 24 03:00:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 108831 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57EF8A0507; Thu, 24 Mar 2022 04:01:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B1CB42817; Thu, 24 Mar 2022 04:01:34 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id AD64942816; Thu, 24 Mar 2022 04:01:32 +0100 (CET) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KP91n0JKNzfZYx; Thu, 24 Mar 2022 10:59:57 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Thu, 24 Mar 2022 11:01:30 +0800 From: "Min Hu (Connor)" To: CC: Huisong Li , , Min Hu , Chas Williams , Andrew Rybchenko , Ivan Ilchenko Subject: [PATCH V2 2/4] net/bonding: fix non-terminable while loop Date: Thu, 24 Mar 2022 11:00:34 +0800 Message-ID: <20220324030036.4761-3-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220324030036.4761-1-humin29@huawei.com> References: <20211025063922.34066-1-humin29@huawei.com> <20220324030036.4761-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Huisong Li All slaves will be stopped and removed when closing a bonded port. But the while loop can not stop if both rte_eth_dev_stop and rte_eth_bond_slave_remove fail to run. Fixes: fb0379bc5db3 ("net/bonding: check stop call status") Cc: stable@dpdk.org Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 469dc71170..00d4deda44 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2149,13 +2149,14 @@ bond_ethdev_close(struct rte_eth_dev *dev) return 0; RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name); - while (internals->slave_count != skipped) { + while (skipped < internals->slave_count) { uint16_t port_id = internals->slaves[skipped].port_id; if (rte_eth_dev_stop(port_id) != 0) { RTE_BOND_LOG(ERR, "Failed to stop device on port %u", port_id); skipped++; + continue; } if (rte_eth_bond_slave_remove(bond_port_id, port_id) != 0) { From patchwork Thu Mar 24 03:00:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 108832 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CD570A0507; Thu, 24 Mar 2022 04:01:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 72B1142818; Thu, 24 Mar 2022 04:01:37 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id E4DB042816; Thu, 24 Mar 2022 04:01:33 +0100 (CET) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KP91p2jW2zfZZ0; Thu, 24 Mar 2022 10:59:58 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Thu, 24 Mar 2022 11:01:32 +0800 From: "Min Hu (Connor)" To: CC: Huisong Li , , Min Hu , Aman Singh , Xiaoyun Li , Yuying Zhang , Pablo de Lara , Bernard Iremonger Subject: [PATCH V2 3/4] app/testpmd: fix port status of slave device Date: Thu, 24 Mar 2022 11:00:35 +0800 Message-ID: <20220324030036.4761-4-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220324030036.4761-1-humin29@huawei.com> References: <20211025063922.34066-1-humin29@huawei.com> <20220324030036.4761-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Huisong Li Starting or stopping a bonded port also starts or stops all active slaves under the bonded port. If this port is a bonded device, we need to modify the port status of all slaves. 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) Acked-by: Aman Singh --- app/test-pmd/cmdline.c | 1 + app/test-pmd/testpmd.c | 74 +++++++++++++++++++++++++++++++++++++++--- app/test-pmd/testpmd.h | 3 +- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 7ab0575e64..f0efcf09f0 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -6671,6 +6671,7 @@ static void cmd_create_bonded_device_parsed(void *parsed_result, "Failed to enable promiscuous mode for port %u: %s - ignore\n", port_id, rte_strerror(-ret)); + ports[port_id].bond_flag = 1; ports[port_id].need_setup = 0; ports[port_id].port_status = RTE_PORT_STOPPED; } diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index fe2ce19f99..dc90600787 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -66,6 +66,9 @@ #ifdef RTE_EXEC_ENV_WINDOWS #include #endif +#ifdef RTE_NET_BOND +#include +#endif #include "testpmd.h" @@ -597,11 +600,57 @@ eth_dev_configure_mp(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return 0; } +#ifdef RTE_NET_BOND +static int +change_bonding_slave_port_status(portid_t bond_pid, bool is_stop) +{ + portid_t slave_pids[RTE_MAX_ETHPORTS]; + struct rte_port *port; + int num_slaves; + portid_t slave_pid; + int i; + + num_slaves = rte_eth_bond_slaves_get(bond_pid, slave_pids, + RTE_MAX_ETHPORTS); + if (num_slaves < 0) { + fprintf(stderr, "Failed to get slave list for port = %u\n", + bond_pid); + return num_slaves; + } + + for (i = 0; i < num_slaves; i++) { + slave_pid = slave_pids[i]; + port = &ports[slave_pid]; + port->port_status = + is_stop ? RTE_PORT_STOPPED : RTE_PORT_STARTED; + } + + return 0; +} +#endif + static int eth_dev_start_mp(uint16_t port_id) { - if (is_proc_primary()) - return rte_eth_dev_start(port_id); + int ret; + + if (is_proc_primary()) { + ret = rte_eth_dev_start(port_id); + if (ret != 0) + return ret; + +#ifdef RTE_NET_BOND + struct rte_port *port = &ports[port_id]; + + /* + * Starting a bonded port also starts all slaves under the bonded + * device. So if this port is bond device, we need to modify the + * port status of these slaves. + */ + if (port->bond_flag == 1) + return change_bonding_slave_port_status(port_id, false); +#endif + } return 0; } @@ -609,8 +658,25 @@ eth_dev_start_mp(uint16_t port_id) static int eth_dev_stop_mp(uint16_t port_id) { - if (is_proc_primary()) - return rte_eth_dev_stop(port_id); + int ret; + + if (is_proc_primary()) { + ret = rte_eth_dev_stop(port_id); + if (ret != 0) + return ret; + +#ifdef RTE_NET_BOND + struct rte_port *port = &ports[port_id]; + + /* + * Stopping a bonded port also stops all slaves under the bonded + * device. So if this port is bond device, we need to modify the + * port status of these slaves. + */ + if (port->bond_flag == 1) + return change_bonding_slave_port_status(port_id, true); +#endif + } return 0; } diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 31f766c965..67f253b30e 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -266,7 +266,8 @@ struct rte_port { uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */ queueid_t queue_nb; /**< nb. of queues for flow rules */ uint32_t queue_sz; /**< size of a queue for flow rules */ - uint8_t slave_flag; /**< bonding slave port */ + uint8_t slave_flag : 1, /**< bonding slave port */ + bond_flag : 1; /**< port is bond device */ struct port_template *pattern_templ_list; /**< Pattern templates. */ struct port_template *actions_templ_list; /**< Actions templates. */ struct port_table *table_list; /**< Flow tables. */ From patchwork Thu Mar 24 03:00:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 108833 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AF9BFA0507; Thu, 24 Mar 2022 04:01:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FCA442825; Thu, 24 Mar 2022 04:01:38 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 5E07C42816; Thu, 24 Mar 2022 04:01:36 +0100 (CET) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KP91C20frzCqjS; Thu, 24 Mar 2022 10:59:27 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.21; Thu, 24 Mar 2022 11:01:34 +0800 From: "Min Hu (Connor)" To: CC: Huisong Li , , Min Hu , Xiaoyun Li , Aman Singh , Yuying Zhang , Pablo de Lara , Bernard Iremonger Subject: [PATCH V2 4/4] app/testpmd: fix slave device isn't released Date: Thu, 24 Mar 2022 11:00:36 +0800 Message-ID: <20220324030036.4761-5-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220324030036.4761-1-humin29@huawei.com> References: <20211025063922.34066-1-humin29@huawei.com> <20220324030036.4761-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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.