diff mbox

[dpdk-dev,v2] net/bonding: clear dev_started if start fails

Message ID 20180323170532.7448-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 March 23, 2018, 5:05 p.m. UTC 
  From: "Charles (Chas) Williams" <chas3@att.com>

There are several error paths where the bonding device may not start.
Clear dev_started before we return if we take one of these paths.

Fixes: 2efb58cbab ("bond: new link bonding library")
Cc: stable@dpdk.org

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

Comments

Radu Nicolau April 5, 2018, 10:58 a.m. UTC | #1 
On 3/23/2018 5:05 PM, Chas Williams wrote:
> From: "Charles (Chas) Williams" <chas3@att.com>
>
> There are several error paths where the bonding device may not start.
> Clear dev_started before we return if we take one of these paths.
>
> Fixes: 2efb58cbab ("bond: new link bonding library")
> Cc: stable@dpdk.org
>
> Signed-off-by: Chas Williams <chas3@att.com>
> ---
>
Acked-by: Radu Nicolau <radu.nicolau@intel.com> 
<mailto:radu.nicolau@intel.com>
Ferruh Yigit April 6, 2018, 10:03 a.m. UTC | #2 
On 4/5/2018 11:58 AM, Radu Nicolau wrote:
> 
> 
> On 3/23/2018 5:05 PM, Chas Williams wrote:
>> From: "Charles (Chas) Williams" <chas3@att.com>
>>
>> There are several error paths where the bonding device may not start.
>> Clear dev_started before we return if we take one of these paths.
>>
>> Fixes: 2efb58cbab ("bond: new link bonding library")
>> Cc: stable@dpdk.org
>>
>> 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_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index b59ba9f7c..1decd8bed 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2034,7 +2034,7 @@  bond_ethdev_start(struct rte_eth_dev *eth_dev)
 
 	if (internals->slave_count == 0) {
 		RTE_BOND_LOG(ERR, "Cannot start port since there are no slave devices");
-		return -1;
+		goto out_err;
 	}
 
 	if (internals->user_defined_mac == 0) {
@@ -2045,18 +2045,18 @@  bond_ethdev_start(struct rte_eth_dev *eth_dev)
 				new_mac_addr = &internals->slaves[i].persisted_mac_addr;
 
 		if (new_mac_addr == NULL)
-			return -1;
+			goto out_err;
 
 		if (mac_address_set(eth_dev, new_mac_addr) != 0) {
 			RTE_BOND_LOG(ERR, "bonded port (%d) failed to update MAC address",
 					eth_dev->data->port_id);
-			return -1;
+			goto out_err;
 		}
 	}
 
 	/* Update all slave devices MACs*/
 	if (mac_address_slaves_update(eth_dev) != 0)
-		return -1;
+		goto out_err;
 
 	/* If bonded device is configure in promiscuous mode then re-apply config */
 	if (internals->promiscuous_en)
@@ -2081,7 +2081,7 @@  bond_ethdev_start(struct rte_eth_dev *eth_dev)
 				"bonded port (%d) failed to reconfigure slave device (%d)",
 				eth_dev->data->port_id,
 				internals->slaves[i].port_id);
-			return -1;
+			goto out_err;
 		}
 		/* We will need to poll for link status if any slave doesn't
 		 * support interrupts
@@ -2089,6 +2089,7 @@  bond_ethdev_start(struct rte_eth_dev *eth_dev)
 		if (internals->slaves[i].link_status_poll_enabled)
 			internals->link_status_polling_enabled = 1;
 	}
+
 	/* start polling if needed */
 	if (internals->link_status_polling_enabled) {
 		rte_eal_alarm_set(
@@ -2108,6 +2109,10 @@  bond_ethdev_start(struct rte_eth_dev *eth_dev)
 		bond_tlb_enable(internals);
 
 	return 0;
+
+out_err:
+	eth_dev->data->dev_started = 0;
+	return -1;
 }
 
 static void