From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7C5041B10D for ; Wed, 21 Nov 2018 17:06:46 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DC36D30842CF; Wed, 21 Nov 2018 16:06:45 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B954E5F7D9; Wed, 21 Nov 2018 16:06:44 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Declan Doherty , dpdk stable Date: Wed, 21 Nov 2018 16:04:29 +0000 Message-Id: <20181121160440.9014-39-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 21 Nov 2018 16:06:45 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bonding: stop and deactivate slaves on stop' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 16:06:46 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From b04e35734e0305b1e477aa7ff13ad4e6beae888c Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Wed, 1 Aug 2018 14:18:43 +0100 Subject: [PATCH] net/bonding: stop and deactivate slaves on stop [ upstream commit 7486331308f6c18b3f84bb2c19b8ffe1808a32f5 ] When a bonding port is stopped also stop and deactivate all slaves. Otherwise slaves will be still listed as active. Fixes: 2efb58cbab6e ("bond: new link bonding library") Signed-off-by: Radu Nicolau Acked-by: Declan Doherty --- drivers/net/bonding/rte_eth_bond_pmd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 86e78bde8..5c2890f5f 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2175,10 +2175,13 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) } + eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; + eth_dev->data->dev_started = 0; + internals->link_status_polling_enabled = 0; - for (i = 0; i < internals->slave_count; i++) + for (i = 0; i < internals->slave_count; i++) { internals->slaves[i].last_link_status = 0; - - eth_dev->data->dev_link.link_status = ETH_LINK_DOWN; - eth_dev->data->dev_started = 0; + rte_eth_dev_stop(internals->slaves[i].port_id); + deactivate_slave(eth_dev, internals->slaves[i].port_id); + } } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:14.612036957 +0000 +++ 0039-net-bonding-stop-and-deactivate-slaves-on-stop.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,13 +1,14 @@ -From 7486331308f6c18b3f84bb2c19b8ffe1808a32f5 Mon Sep 17 00:00:00 2001 +From b04e35734e0305b1e477aa7ff13ad4e6beae888c Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Wed, 1 Aug 2018 14:18:43 +0100 Subject: [PATCH] net/bonding: stop and deactivate slaves on stop +[ upstream commit 7486331308f6c18b3f84bb2c19b8ffe1808a32f5 ] + When a bonding port is stopped also stop and deactivate all slaves. Otherwise slaves will be still listed as active. Fixes: 2efb58cbab6e ("bond: new link bonding library") -Cc: stable@dpdk.org Signed-off-by: Radu Nicolau Acked-by: Declan Doherty @@ -16,7 +17,7 @@ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index 4df0e8407..1d6245aa5 100644 +index 86e78bde8..5c2890f5f 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2175,10 +2175,13 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)