[dpdk-stable] patch 'net/bonding: fix possible silent failure in configuration' has been queued to stable release 18.08.1

Kevin Traynor ktraynor at redhat.com
Thu Nov 29 14:20:55 CET 2018


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 <lee.daly at intel.com>
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 <lee.daly at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 <lee.daly at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Lee Daly <lee.daly at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -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)


More information about the stable mailing list