[dpdk-stable] patch 'net/bonding: stop and deactivate slaves on stop' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Fri Nov 30 00:10:23 CET 2018


Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/01/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.

Yongseok

---
>From 099f4cd0d934eb9748436f865f06568938bb1dcd Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau at intel.com>
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 <radu.nicolau at intel.com>
Acked-by: Declan Doherty <declan.doherty at intel.com>
---
 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 608b3ebc7..d4b37d183 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2063,12 +2063,15 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
 			tlb_last_obytets[internals->active_slaves[i]] = 0;
 	}
 
-	internals->link_status_polling_enabled = 0;
-	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;
+
+	internals->link_status_polling_enabled = 0;
+	for (i = 0; i < internals->slave_count; i++) {
+		internals->slaves[i].last_link_status = 0;
+		rte_eth_dev_stop(internals->slaves[i].port_id);
+		deactivate_slave(eth_dev, internals->slaves[i].port_id);
+	}
 }
 
 void
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 15:01:46.543490315 -0800
+++ 0029-net-bonding-stop-and-deactivate-slaves-on-stop.patch	2018-11-29 15:01:45.036960000 -0800
@@ -1,13 +1,14 @@
-From 7486331308f6c18b3f84bb2c19b8ffe1808a32f5 Mon Sep 17 00:00:00 2001
+From 099f4cd0d934eb9748436f865f06568938bb1dcd Mon Sep 17 00:00:00 2001
 From: Radu Nicolau <radu.nicolau at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
 Acked-by: Declan Doherty <declan.doherty at intel.com>
@@ -16,10 +17,10 @@
  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 608b3ebc7..d4b37d183 100644
 --- a/drivers/net/bonding/rte_eth_bond_pmd.c
 +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
-@@ -2174,12 +2174,15 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
+@@ -2063,12 +2063,15 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
  			tlb_last_obytets[internals->active_slaves[i]] = 0;
  	}
  


More information about the stable mailing list