From patchwork Tue Jan 29 11:19:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 216503 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 20B0B2C00A9 for ; Tue, 29 Jan 2013 22:19:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857Ab3A2LTU (ORCPT ); Tue, 29 Jan 2013 06:19:20 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:58497 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052Ab3A2LTS (ORCPT ); Tue, 29 Jan 2013 06:19:18 -0500 Received: by mail-we0-f175.google.com with SMTP id x8so216576wey.20 for ; Tue, 29 Jan 2013 03:19:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=I/Jjtm2CbNvBUv+F5DM98n1+wpUHKFOlJv/blUoZgfI=; b=NKe8sL+ih9+/HZid073J5SPWq5hGPicbmdEQlFaVlX8qIipkKeuWZRZWt44Yh/x62i Kd2cGZulYj5LsNxZYi7gC/liFVSb1t01J71OT39w87v6Gj63nJDz+lAzwoXE4vMn2T4L 0AfjOO2ASOeWl/SWbw6Mw+UNv1pdo2QHV0sUKkxIeWE1zThkdygkTZAJjQ6zA0DLfTwi FKbtcWXYr6kwNcztN+E5B53LQIrx7MA3CSDxdgHtrDKAWz3qUbNoOdA4c+A1JShioObl NqPvUeAsu9FNbZ7QXK7CHd1EzvEwzJuxghqqS0pfU8+FtO5zw/rfWWA0jsseBGFU57AU f8Bg== X-Received: by 10.180.93.40 with SMTP id cr8mr1856652wib.15.1359458356898; Tue, 29 Jan 2013 03:19:16 -0800 (PST) Received: from localhost (ip-94-112-98-141.net.upcbroadband.cz. [94.112.98.141]) by mx.google.com with ESMTPS id q13sm2232892wie.0.2013.01.29.03.19.14 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 29 Jan 2013 03:19:15 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, fubar@us.ibm.com, andy@greyhouse.net, stephen@networkplumber.org, psimerda@redhat.com, dcbw@redhat.com Subject: [patch net-next V3] bond: have random dev address by default instead of zeroes Date: Tue, 29 Jan 2013 12:19:11 +0100 Message-Id: <1359458351-6842-1-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlg41uFDOD8PA8It3n7EdWfHeI98CW0Cuwk7emHgaNxeC/Rr7V20yi1LaNW6D2ATCUg6w4u Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Makes more sense to have randomly generated address by default than to have all zeroes. It also allows user to for example put the bond into bridge without need to have any slaves in it. Also note that this changes only behaviour of bonds with no slaves. Once the first slave device is enslaved, its address will be used (no change here). Also, fix dev_assign_type values on the way. Reported-by: Pavel Šimerda Signed-off-by: Jiri Pirko --- v2->v3: - call_netdevice_notifiers is called after dev_addr change. - use bond->get_dev_addr_from_first_slave to know when to get addr from the first slave v1->v2: - fixed assign value of bond_dev->addr_assign_type in bond_set_dev_addr() - added note to patch description drivers/net/bonding/bond_main.c | 38 +++++++++++++++++++------------------- drivers/net/bonding/bonding.h | 1 + 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 564cf42..8692df8 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1320,14 +1320,15 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev) /*---------------------------------- IOCTL ----------------------------------*/ -static int bond_sethwaddr(struct net_device *bond_dev, - struct net_device *slave_dev) +static void bond_set_dev_addr(struct net_device *bond_dev, + struct net_device *slave_dev) { pr_debug("bond_dev=%p\n", bond_dev); pr_debug("slave_dev=%p\n", slave_dev); pr_debug("slave_dev->addr_len=%d\n", slave_dev->addr_len); memcpy(bond_dev->dev_addr, slave_dev->dev_addr, slave_dev->addr_len); - return 0; + bond_dev->addr_assign_type = NET_ADDR_SET; + call_netdevice_notifiers(NETDEV_CHANGEADDR, bond_dev); } static netdev_features_t bond_fix_features(struct net_device *dev, @@ -1628,10 +1629,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) /* If this is the first slave, then we need to set the master's hardware * address to be the same as the slave's. */ - if (is_zero_ether_addr(bond->dev->dev_addr)) - memcpy(bond->dev->dev_addr, slave_dev->dev_addr, - slave_dev->addr_len); - + if (bond->get_dev_addr_from_first_slave) + bond_set_dev_addr(bond->dev, slave_dev); new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL); if (!new_slave) { @@ -2048,12 +2047,8 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) if (bond->slave_cnt == 0) { bond_set_carrier(bond); - - /* if the last slave was removed, zero the mac address - * of the master so it will be set by the application - * to the mac address of the first slave - */ - memset(bond_dev->dev_addr, 0, bond_dev->addr_len); + eth_hw_addr_random(bond_dev); + bond->get_dev_addr_from_first_slave = true; if (bond_vlan_used(bond)) { pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n", @@ -2234,11 +2229,8 @@ static int bond_release_all(struct net_device *bond_dev) write_lock_bh(&bond->lock); } - /* zero the mac address of the master so it will be - * set by the application to the mac address of the - * first slave - */ - memset(bond_dev->dev_addr, 0, bond_dev->addr_len); + eth_hw_addr_random(bond_dev); + bond->get_dev_addr_from_first_slave = true; if (bond_vlan_used(bond)) { pr_warning("%s: Warning: clearing HW address of %s while it still has VLANs.\n", @@ -3708,7 +3700,8 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd break; case BOND_SETHWADDR_OLD: case SIOCBONDSETHWADDR: - res = bond_sethwaddr(bond_dev, slave_dev); + bond_set_dev_addr(bond_dev, slave_dev); + res = 0; break; case BOND_CHANGE_ACTIVE_OLD: case SIOCBONDCHANGEACTIVE: @@ -4858,6 +4851,13 @@ static int bond_init(struct net_device *bond_dev) bond_debug_register(bond); + /* Ensure valid dev_addr */ + if (is_zero_ether_addr(bond_dev->dev_addr) && + bond_dev->addr_assign_type == NET_ADDR_PERM) { + eth_hw_addr_random(bond_dev); + bond->get_dev_addr_from_first_slave = true; + } + __hw_addr_init(&bond->mc_list); return 0; } diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 0d282d2..3200638 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -248,6 +248,7 @@ struct bonding { /* debugging support via debugfs */ struct dentry *debug_dir; #endif /* CONFIG_DEBUG_FS */ + bool get_dev_addr_from_first_slave; }; static inline bool bond_vlan_used(struct bonding *bond)