diff mbox

[dpdk-dev] net/bonding: don't early mark eth device as bonded

Message ID 20180117164444.4705-1-3chas3@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Chas Williams Jan. 17, 2018, 4:44 p.m. UTC 
  From: "Charles (Chas) Williams" <ciwillia@mail.eng.vyatta.net>

bonding immediately marks the incoming eth device as bonded and doesn't
clear this in later error paths.  Delay marking the dev until we are
certain that we are going to add this eth device to the bond group.

Signed-off-by: Chas Williams <chas3@att.com>
---
 drivers/net/bonding/rte_eth_bond_api.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Radu Nicolau Jan. 25, 2018, 12:28 p.m. UTC | #1 
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Chas Williams
> Sent: Wednesday, January 17, 2018 4:45 PM
> To: dev@dpdk.org
> Cc: Doherty, Declan <declan.doherty@intel.com>; Charles (Chas) Williams
> <ciwillia@mail.eng.vyatta.net>; Chas Williams <chas3@att.com>
> Subject: [dpdk-dev] [PATCH] net/bonding: don't early mark eth device as
> bonded
> 
> From: "Charles (Chas) Williams" <ciwillia@mail.eng.vyatta.net>
> 
> bonding immediately marks the incoming eth device as bonded and doesn't
> clear this in later error paths.  Delay marking the dev until we are certain that
> we are going to add this eth device to the bond group.
> 
> Signed-off-by: Chas Williams <chas3@att.com>
> ---

Acked-by: Radu Nicolau <radu.nicolau@intel.com>
Ferruh Yigit Jan. 25, 2018, 1:23 p.m. UTC | #2 
On 1/25/2018 12:28 PM, Nicolau, Radu wrote:
> 
>> -----Original Message-----
>> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Chas Williams
>> Sent: Wednesday, January 17, 2018 4:45 PM
>> To: dev@dpdk.org
>> Cc: Doherty, Declan <declan.doherty@intel.com>; Charles (Chas) Williams
>> <ciwillia@mail.eng.vyatta.net>; Chas Williams <chas3@att.com>
>> Subject: [dpdk-dev] [PATCH] net/bonding: don't early mark eth device as
>> bonded
>>
>> From: "Charles (Chas) Williams" <ciwillia@mail.eng.vyatta.net>
>>
>> bonding immediately marks the incoming eth device as bonded and doesn't
>> clear this in later error paths.  Delay marking the dev until we are certain that
>> we are going to add this eth device to the bond group.
>>
>> Signed-off-by: Chas Williams <chas3@att.com>
>> ---
> 
> Acked-by: Radu Nicolau <radu.nicolau@intel.com>

Applied to dpdk-next-net/master, thanks.
diff mbox

Patch

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 534a890..e9c446b 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -242,9 +242,6 @@  __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
 		return -1;
 	}
 
-	/* Add slave details to bonded device */
-	slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE;
-
 	rte_eth_dev_info_get(slave_port_id, &dev_info);
 	if (dev_info.max_rx_pktlen < internals->max_rx_pktlen) {
 		RTE_BOND_LOG(ERR, "Slave (port %u) max_rx_pktlen too small",
@@ -316,18 +313,21 @@  __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
 
 	internals->slave_count++;
 
-	/* Update all slave devices MACs*/
-	mac_address_slaves_update(bonded_eth_dev);
-
 	if (bonded_eth_dev->data->dev_started) {
 		if (slave_configure(bonded_eth_dev, slave_eth_dev) != 0) {
-			slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE);
+			internals->slave_count--;
 			RTE_BOND_LOG(ERR, "rte_bond_slaves_configure: port=%d",
 					slave_port_id);
 			return -1;
 		}
 	}
 
+	/* Add slave details to bonded device */
+	slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE;
+
+	/* Update all slave devices MACs*/
+	mac_address_slaves_update(bonded_eth_dev);
+
 	/* Register link status change callback with bonded device pointer as
 	 * argument*/
 	rte_eth_dev_callback_register(slave_port_id, RTE_ETH_EVENT_INTR_LSC,