From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jay Vosburgh Subject: Re: [PATCH net V2] net/bonding: Enforce active-backup policy for IPoIB bonds Date: Thu, 21 Jul 2016 07:39:50 -0700 Message-ID: <14242.1469111990@famine> References: <1469091175-17143-1-git-send-email-saeedm@mellanox.com> Cc: "David S. Miller" , netdev@vger.kernel.org, Veaceslav Falico , Andy Gospodarek , Or Gerlitz , Jiri Pirko , Doug Ledford , Mark Bloch To: Saeed Mahameed Return-path: Received: from youngberry.canonical.com ([91.189.89.112]:57047 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752591AbcGUOj5 (ORCPT ); Thu, 21 Jul 2016 10:39:57 -0400 In-reply-to: <1469091175-17143-1-git-send-email-saeedm@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: Saeed Mahameed wrote: >From: Mark Bloch > >When using an IPoIB bond currently only active-backup mode is a valid >use case and this commit strengthens it. > >Since commit 2ab82852a270 ("net/bonding: Enable bonding to enslave >netdevices not supporting set_mac_address()") was introduced till >4.7-rc1, IPoIB didn't support the set_mac_address ndo, and hence the >fail over mac policy always applied to IPoIB bonds. > >With the introduction of commit 492a7e67ff83 ("IB/IPoIB: Allow setting >the device address"), that doesn't hold and practically IPoIB bonds are >broken as of that. To fix it, lets go to fail over mac if the device >doesn't support the ndo OR this is IPoIB device. > >As a by-product, this commit also prevents a stack corruption which >occurred when trying to copy 20 bytes (IPoIB) device address >to a sockaddr struct that has only 16 bytes of storage. > >Signed-off-by: Mark Bloch >Signed-off-by: Or Gerlitz >Signed-off-by: Saeed Mahameed Signed-off-by: Jay Vosburgh > >Changes from v0: > - Set res to -EOPNOTSUPP before jumping to err_undo_flags. > > drivers/net/bonding/bond_main.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > >diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c >index a2afa3b..4d79819 100644 >--- a/drivers/net/bonding/bond_main.c >+++ b/drivers/net/bonding/bond_main.c >@@ -1422,7 +1422,16 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) > return -EINVAL; > } > >- if (slave_ops->ndo_set_mac_address == NULL) { >+ if (slave_dev->type == ARPHRD_INFINIBAND && >+ BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) { >+ netdev_warn(bond_dev, "Type (%d) supports only active-backup mode\n", >+ slave_dev->type); >+ res = -EOPNOTSUPP; >+ goto err_undo_flags; >+ } >+ >+ if (!slave_ops->ndo_set_mac_address || >+ slave_dev->type == ARPHRD_INFINIBAND) { > netdev_warn(bond_dev, "The slave device specified does not support setting the MAC address\n"); > if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP && > bond->params.fail_over_mac != BOND_FOM_ACTIVE) { >-- >2.8.0 >