From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 0DEF42B9C for ; Sun, 22 Apr 2018 17:12:14 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 9640C20FED; Sun, 22 Apr 2018 11:12:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:12:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=1+OiyEZdKqrZGR989 zDDg+xee43B+430A+7Q5+mJiks=; b=CAkzX3fbFNUNE+exJGhKstmiEMnN08un8 yFrAInCy5XGGiI2E8tRrA14Kpm0B9IpXoYnzXq9wSRzNauxNRNuXYM+wok0gIAwt 4ySCkLZkN4OkAaZoHwIBn9hV8CEiC8Z0hnWHRgA1dRVHuBEJ6TOw0xKGmgNTTUeT Yzu+Axb/XeFlMrEPPp9qP6KI3DXvgZnEnTW691U0N4PVMe18OsnWRegvSuRwuHks gvoHAGDlssL1IXnAWz+Qo2UkGShNb6uP7RDJ2QpK/OlhFToukxgIpkBIztWz7ThM dII3GT0q6NFYlw64h2JhuKMv9dIYJ+nTqwVO2qPdnUx9QebHwibvQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=1+OiyEZdKqrZGR989zDDg+xee43B+430A+7Q5+mJiks=; b=aavGJFps wtrq2Rb60OfdWw2/XQmQr27MUoOaN9FPLmSBX3T9V3Qneq6pU1prjlaICdTWGPQ4 x2qTI+bMOLsGu+KAAgYYLVZbUESgjSQGO9IeuDCa+rXdzQ/Yaw0KyrNc+mdgkr7c pT5Xj4jYxTt3z2ZPOkTnXh6uqM2gJ/6/DP7x7K7C8iKmP5/Yx70WUbQKlk94Dtpv KKMQWEk5kj8xYYZqLp6DnzerLZyRH3BkmDPvvk59wfuuOLCPkJcIhRJ2M11Lwy8o MW2VicE9ZtvX92i2QW2E4y+0P7W54jE3ba6GM06UZryhx4poJ1T6k4ioV4VQ7YVv p1C/LLMc/raCXA== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 9DF5110253; Sun, 22 Apr 2018 11:12:11 -0400 (EDT) From: Yuanhan Liu To: Chas Williams Cc: Radu Nicolau , dpdk stable Date: Sun, 22 Apr 2018 23:09:39 +0800 Message-Id: <20180422150949.17523-49-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/bonding: clear started state if start fails' has been queued to LTS release 17.11.2 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: Sun, 22 Apr 2018 15:12:14 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From ee1fb8fc8271d2be09495c7cbf671dfd519dd1c8 Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Fri, 23 Mar 2018 13:05:32 -0400 Subject: [PATCH] net/bonding: clear started state if start fails [ upstream commit 85d3c09a0f40740ca64556522fed1b3bb5aa6167 ] 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: 2efb58cbab6e ("bond: new link bonding library") Signed-off-by: Chas Williams Acked-by: Radu Nicolau --- drivers/net/bonding/rte_eth_bond_pmd.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 1d3fbebab..08444d9fc 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1912,7 +1912,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) { @@ -1923,18 +1923,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) @@ -1959,7 +1959,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 @@ -1967,6 +1967,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( @@ -1986,6 +1987,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 -- 2.11.0