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 32F391B4AA for ; Thu, 29 Nov 2018 14:23:35 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 946DA83F3C; Thu, 29 Nov 2018 13:23:34 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FB2B1001F50; Thu, 29 Nov 2018 13:23:32 +0000 (UTC) From: Kevin Traynor To: Lee Daly Cc: Ferruh Yigit , dpdk stable Date: Thu, 29 Nov 2018 13:20:55 +0000 Message-Id: <20181129132128.7609-55-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 29 Nov 2018 13:23:34 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bonding: fix possible silent failure in configuration' has been queued to stable release 18.08.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: Thu, 29 Nov 2018 13:23:35 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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/08/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. Kevin Traynor --- >>From f55344c70ed8b4c2858a0bafe81cfe3bb9ac4533 Mon Sep 17 00:00:00 2001 From: Lee Daly Date: Fri, 16 Nov 2018 16:48:02 +0000 Subject: [PATCH] net/bonding: fix possible silent failure in configuration [ upstream commit 6f4ae7f5d97a295100fa541fd59ba0b4c96a8d9c ] This patch checks the return value of function rte_eth_bond_8023ad_agg_selection_set() in bond_ethdev_configure for error return value. Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") Signed-off-by: Lee Daly Reviewed-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_pmd.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index e3e2e83be..253d9288e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3405,7 +3405,14 @@ bond_ethdev_configure(struct rte_eth_dev *dev) name); } - if (internals->mode == BONDING_MODE_8023AD) - rte_eth_bond_8023ad_agg_selection_set(port_id, - agg_mode); + if (internals->mode == BONDING_MODE_8023AD) { + int ret = rte_eth_bond_8023ad_agg_selection_set(port_id, + agg_mode); + if (ret < 0) { + RTE_BOND_LOG(ERR, + "Invalid args for agg selection set for bonded device %s", + name); + return -1; + } + } } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:36.438734394 +0000 +++ 0054-net-bonding-fix-possible-silent-failure-in-configura.patch 2018-11-29 13:11:34.000000000 +0000 @@ -1,14 +1,15 @@ -From 6f4ae7f5d97a295100fa541fd59ba0b4c96a8d9c Mon Sep 17 00:00:00 2001 +From f55344c70ed8b4c2858a0bafe81cfe3bb9ac4533 Mon Sep 17 00:00:00 2001 From: Lee Daly Date: Fri, 16 Nov 2018 16:48:02 +0000 Subject: [PATCH] net/bonding: fix possible silent failure in configuration +[ upstream commit 6f4ae7f5d97a295100fa541fd59ba0b4c96a8d9c ] + This patch checks the return value of function rte_eth_bond_8023ad_agg_selection_set() in bond_ethdev_configure for error return value. Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") -Cc: stable@dpdk.org Signed-off-by: Lee Daly Reviewed-by: Ferruh Yigit @@ -17,10 +18,10 @@ 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index 2661620ab..44deaf119 100644 +index e3e2e83be..253d9288e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -3424,7 +3424,14 @@ bond_ethdev_configure(struct rte_eth_dev *dev) +@@ -3405,7 +3405,14 @@ bond_ethdev_configure(struct rte_eth_dev *dev) name); } - if (internals->mode == BONDING_MODE_8023AD)