From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id DA8541B3AD for ; Wed, 3 Oct 2018 18:52:56 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id z3-v6so6900323wrr.13 for ; Wed, 03 Oct 2018 09:52:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CHf+mKgJ7TiF7OFyAYjBqyPDk/5/34NBrwxcbKamnPk=; b=TCqwBQidAzb8N9V5bvmScdg35E6mOp2gsvcvIAdHzFH6ve/WHvSoPymuXTB7y6twRj 2fQtTvrfjWhNnb6kac/t5J77GTa/VQL4k0JbX2Nc+XykK85N1oLvehlaxQxKIeldZLyW ysgUSEgZRi41lv2GynQlcIvPL9Fv72Bd7sVdlldQPWJ/RZQalcu+A5VDlB/rfNQFKDbq MIuLJ9p1pFiKaix+ueO7pXtIQdwlAuVgooB6vwCHfU6NXAbNX+WqSCfN45Q8NpsUdyXi +JijZme/DXPz2adLxdmsB9aDL9l0RkOx4pvT/M7Oxh6V9edgz3HDbo4nhFdJevOtYSDk N3tg== X-Gm-Message-State: ABuFfogb5R2NtHLDKw7JgnCdK5QgGHtXFkkVgWKMKjXvrQ15xXmeYeQ1 Ih+PiVSEzZfhAM+fz4N3XBI= X-Google-Smtp-Source: ACcGV63KH2W+RV8Ny1aWnABUYXZZc30D8ORY+uF/88513ukUk/wrltzsKELjKgDEToj80x5hLm77UQ== X-Received: by 2002:a5d:6707:: with SMTP id o7-v6mr2012467wru.326.1538585576469; Wed, 03 Oct 2018 09:52:56 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id u5-v6sm3434496wru.16.2018.10.03.09.52.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Oct 2018 09:52:55 -0700 (PDT) From: Luca Boccassi To: Radu Nicolau Cc: Declan Doherty , dpdk stable Date: Wed, 3 Oct 2018 17:52:38 +0100 Message-Id: <20181003165239.8531-5-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181003165239.8531-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181003165239.8531-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: stop and deactivate slaves on stop' has been queued to LTS release 16.11.9 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: Wed, 03 Oct 2018 16:52:57 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/05/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. Luca Boccassi --- >>From b37c1a4cd7ba380bdfac2a41e2d73962e8853ce5 Mon Sep 17 00:00:00 2001 From: Radu Nicolau 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 Acked-by: Declan Doherty --- 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 c672f0560b..aad8631787 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1652,12 +1652,15 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) tlb_last_obytets[internals->active_slaves[i]] = 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++) + 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; + rte_eth_dev_stop(internals->slaves[i].port_id); + deactivate_slave(eth_dev, internals->slaves[i].port_id); + } } void -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-03 17:44:54.694590199 +0100 +++ 0006-net-bonding-stop-and-deactivate-slaves-on-stop.patch 2018-10-03 17:44:54.574534610 +0100 @@ -1,13 +1,14 @@ -From 7486331308f6c18b3f84bb2c19b8ffe1808a32f5 Mon Sep 17 00:00:00 2001 +From b37c1a4cd7ba380bdfac2a41e2d73962e8853ce5 Mon Sep 17 00:00:00 2001 From: Radu Nicolau 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@dpdk.org Signed-off-by: Radu Nicolau Acked-by: Declan Doherty @@ -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 4df0e84079..1d6245aa56 100644 +index c672f0560b..aad8631787 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) +@@ -1652,12 +1652,15 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) tlb_last_obytets[internals->active_slaves[i]] = 0; }