From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id F289E1B518 for ; Fri, 30 Nov 2018 00:15:40 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:31 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8m032075; Fri, 30 Nov 2018 01:15:35 +0200 From: Yongseok Koh To: Radu Nicolau Cc: Chas Williams , dpdk stable Date: Thu, 29 Nov 2018 15:11:42 -0800 Message-Id: <20181129231202.30436-108-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/bonding: fix crash when stopping mode 4 port' has been queued to LTS release 17.11.5 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: Thu, 29 Nov 2018 23:15:41 -0000 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 9766f95a972d6a1fc3cbe62db60ef9b901defce7 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Thu, 8 Nov 2018 15:26:42 +0000 Subject: [PATCH] net/bonding: fix crash when stopping mode 4 port [ upstream commit 0911d4ec01839c9149a0df5758d00d9d57a47cea ] When stopping a bonded port all slaves are deactivated. Attempting to deactivate a slave that was never activated will result in a segfault when mode 4 is used. Fixes: 7486331308f6 ("net/bonding: stop and deactivate slaves on stop") Signed-off-by: Radu Nicolau Acked-by: Chas Williams --- drivers/net/bonding/rte_eth_bond_pmd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index d4b37d183..bf39a8ff6 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2068,9 +2068,14 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) 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); + uint16_t slave_id = internals->slaves[i].port_id; + if (find_slave_by_id(internals->active_slaves, + internals->active_slave_count, slave_id) != + internals->active_slave_count) { + internals->slaves[i].last_link_status = 0; + rte_eth_dev_stop(slave_id); + deactivate_slave(eth_dev, slave_id); + } } } -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:49.915881598 -0800 +++ 0108-net-bonding-fix-crash-when-stopping-mode-4-port.patch 2018-11-29 15:01:45.282957000 -0800 @@ -1,14 +1,15 @@ -From 0911d4ec01839c9149a0df5758d00d9d57a47cea Mon Sep 17 00:00:00 2001 +From 9766f95a972d6a1fc3cbe62db60ef9b901defce7 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Thu, 8 Nov 2018 15:26:42 +0000 Subject: [PATCH] net/bonding: fix crash when stopping mode 4 port +[ upstream commit 0911d4ec01839c9149a0df5758d00d9d57a47cea ] + When stopping a bonded port all slaves are deactivated. Attempting to deactivate a slave that was never activated will result in a segfault when mode 4 is used. Fixes: 7486331308f6 ("net/bonding: stop and deactivate slaves on stop") -Cc: stable@dpdk.org Signed-off-by: Radu Nicolau Acked-by: Chas Williams @@ -17,10 +18,10 @@ 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index 1a6d8e4df..2661620ab 100644 +index d4b37d183..bf39a8ff6 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -2181,9 +2181,14 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) +@@ -2068,9 +2068,14 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) internals->link_status_polling_enabled = 0; for (i = 0; i < internals->slave_count; i++) {