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 183DCA0501 for ; Wed, 4 May 2022 01:39:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E067E41145; Wed, 4 May 2022 01:39:58 +0200 (CEST) Received: from forward501j.mail.yandex.net (forward501j.mail.yandex.net [5.45.198.251]) by mails.dpdk.org (Postfix) with ESMTP id 63B4C40691; Wed, 4 May 2022 01:39:56 +0200 (CEST) Received: from myt6-22bd3499f8ff.qloud-c.yandex.net (myt6-22bd3499f8ff.qloud-c.yandex.net [IPv6:2a02:6b8:c12:239b:0:640:22bd:3499]) by forward501j.mail.yandex.net (Yandex) with ESMTP id B666462335D; Wed, 4 May 2022 02:39:55 +0300 (MSK) Received: from myt6-016ca1315a73.qloud-c.yandex.net (myt6-016ca1315a73.qloud-c.yandex.net [2a02:6b8:c12:4e0e:0:640:16c:a131]) by myt6-22bd3499f8ff.qloud-c.yandex.net (mxback/Yandex) with ESMTP id SsRjNHhndN-dth8FDRB; Wed, 04 May 2022 02:39:55 +0300 X-Yandex-Fwd: 2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1651621195; bh=3bbSFerfpTWghMaTiT/TXVWWr7117d/11SLNtRbEj7o=; h=In-Reply-To:From:Subject:Cc:References:Date:Message-ID:To; b=Nc8XAz0x7ypN8uhbPQ1sTNrmUZz5btcP54VuF8JdQg0j/iTaQbISeFCbbCX9+iMzI UK+yU5xvHLPkoB/wAYE9pKiAK+njaI7i9kRwBI1lObme67ulGScgNtdQj39v53/IaC duv6Bl1e5slg6zq77a7QbtSh8gUki6+sZDu/WOdc= Authentication-Results: myt6-22bd3499f8ff.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru Received: by myt6-016ca1315a73.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id lBjy9yQjbi-drM8YXJO; Wed, 04 May 2022 02:39:54 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Message-ID: <45233ff7-512c-f50a-7b56-8970737d3efe@yandex.ru> Date: Wed, 4 May 2022 00:39:52 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH v3 3/5] app/testpmd: fix port status of slave device Content-Language: en-US To: "Min Hu (Connor)" , dev@dpdk.org Cc: Huisong Li , stable@dpdk.org, Aman Singh , Xiaoyun Li , Yuying Zhang , Pablo de Lara , Bernard Iremonger References: <20220324030036.4761-1-humin29@huawei.com> <20220503100217.46203-1-humin29@huawei.com> <20220503100217.46203-4-humin29@huawei.com> From: Konstantin Ananyev In-Reply-To: <20220503100217.46203-4-humin29@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 03/05/2022 11:02, Min Hu (Connor) пишет: > 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 6ffea8e21a..d9fc7a88bd 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 Here and in other places - probably no need to pollute the code with all these 'ifdef RTE_NET_BOND'. I suppose this logic (for checking is bonding API present or not) can be hidden inside change_bonding_slave_port_status() itself. > + 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. */