From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A9C6E1B8B8 for ; Fri, 14 Dec 2018 19:25:19 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18AE18AE7A; Fri, 14 Dec 2018 18:25:19 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-116-106.ams2.redhat.com [10.36.116.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02273600C0; Fri, 14 Dec 2018 18:25:17 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Chas Williams , dpdk stable Date: Fri, 14 Dec 2018 18:24:08 +0000 Message-Id: <20181214182430.11593-6-ktraynor@redhat.com> In-Reply-To: <20181214182430.11593-1-ktraynor@redhat.com> References: <20181214182430.11593-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 14 Dec 2018 18:25:19 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/bond: fix initialization order' has been queued to stable release 18.11.1 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: Fri, 14 Dec 2018 18:25:20 -0000 Hi, FYI, your patch has been queued to stable release 18.11.1 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/18/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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From d28827f34506ae065a5bb81699f2f77f2b3ffd71 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 13 Nov 2018 16:46:04 +0000 Subject: [PATCH] examples/bond: fix initialization order [ upstream commit 2eee509c7c7a3e4b564161b163ea0003f029dd57 ] Queue setup will fail if called before adding slaves. Fixes: 7a0665940fa8 ("net/bonding: inherit descriptor limits from slaves") Signed-off-by: Radu Nicolau Acked-by: Chas Williams --- examples/bond/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/bond/main.c b/examples/bond/main.c index b282e68ba..65f3c3980 100644 --- a/examples/bond/main.c +++ b/examples/bond/main.c @@ -244,4 +244,11 @@ bond_port_init(struct rte_mempool *mbuf_pool) "failed (res=%d)\n", BOND_PORT, retval); + for (i = 0; i < slaves_count; i++) { + if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1) + rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n", + slaves[i], BOND_PORT); + + } + /* RX setup */ rxq_conf = dev_info.default_rxconf; @@ -264,11 +271,4 @@ bond_port_init(struct rte_mempool *mbuf_pool) BOND_PORT, retval); - for (i = 0; i < slaves_count; i++) { - if (rte_eth_bond_slave_add(BOND_PORT, slaves[i]) == -1) - rte_exit(-1, "Oooops! adding slave (%u) to bond (%u) failed!\n", - slaves[i], BOND_PORT); - - } - retval = rte_eth_dev_start(BOND_PORT); if (retval < 0) -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-12-14 18:23:18.393645339 +0000 +++ 0006-examples-bond-fix-initialization-order.patch 2018-12-14 18:23:18.000000000 +0000 @@ -1,12 +1,13 @@ -From 2eee509c7c7a3e4b564161b163ea0003f029dd57 Mon Sep 17 00:00:00 2001 +From d28827f34506ae065a5bb81699f2f77f2b3ffd71 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Tue, 13 Nov 2018 16:46:04 +0000 Subject: [PATCH] examples/bond: fix initialization order +[ upstream commit 2eee509c7c7a3e4b564161b163ea0003f029dd57 ] + Queue setup will fail if called before adding slaves. Fixes: 7a0665940fa8 ("net/bonding: inherit descriptor limits from slaves") -Cc: stable@dpdk.org Signed-off-by: Radu Nicolau Acked-by: Chas Williams