2005-11-10 01:36:41 +07:00
|
|
|
/*
|
|
|
|
* Copyright(c) 2004-2005 Intel Corporation. All rights reserved.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
2013-12-06 21:28:47 +07:00
|
|
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
2005-11-10 01:36:41 +07:00
|
|
|
*
|
|
|
|
* The full GNU General Public License is included in this distribution in the
|
|
|
|
* file called LICENSE.
|
|
|
|
*
|
|
|
|
*/
|
2009-12-14 11:06:07 +07:00
|
|
|
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2005-11-10 01:36:41 +07:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/device.h>
|
2009-10-07 20:09:06 +07:00
|
|
|
#include <linux/sched.h>
|
2005-11-10 01:36:41 +07:00
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/inetdevice.h>
|
|
|
|
#include <linux/in.h>
|
|
|
|
#include <linux/sysfs.h>
|
|
|
|
#include <linux/ctype.h>
|
|
|
|
#include <linux/inet.h>
|
|
|
|
#include <linux/rtnetlink.h>
|
2009-06-13 02:02:51 +07:00
|
|
|
#include <linux/etherdevice.h>
|
2007-09-18 01:56:21 +07:00
|
|
|
#include <net/net_namespace.h>
|
2009-10-29 21:18:26 +07:00
|
|
|
#include <net/netns/generic.h>
|
|
|
|
#include <linux/nsproxy.h>
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-11-11 01:27:49 +07:00
|
|
|
#include <net/bonding.h>
|
2008-12-10 14:09:22 +07:00
|
|
|
|
2008-11-13 14:37:49 +07:00
|
|
|
#define to_bond(cd) ((struct bonding *)(netdev_priv(to_net_dev(cd))))
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* "show" function for the bond_masters attribute.
|
2005-11-10 01:36:41 +07:00
|
|
|
* The class parameter is ignored.
|
|
|
|
*/
|
2010-01-05 18:48:07 +07:00
|
|
|
static ssize_t bonding_show_bonds(struct class *cls,
|
|
|
|
struct class_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2011-10-13 04:56:25 +07:00
|
|
|
struct bond_net *bn =
|
|
|
|
container_of(attr, struct bond_net, class_attr_bonding_masters);
|
2005-11-10 01:36:41 +07:00
|
|
|
int res = 0;
|
|
|
|
struct bonding *bond;
|
|
|
|
|
2009-06-13 02:02:46 +07:00
|
|
|
rtnl_lock();
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2009-10-29 21:18:26 +07:00
|
|
|
list_for_each_entry(bond, &bn->dev_list, bond_list) {
|
2005-11-10 01:36:41 +07:00
|
|
|
if (res > (PAGE_SIZE - IFNAMSIZ)) {
|
|
|
|
/* not enough space for another interface name */
|
|
|
|
if ((PAGE_SIZE - res) > 10)
|
|
|
|
res = PAGE_SIZE - 10;
|
2007-12-07 14:40:30 +07:00
|
|
|
res += sprintf(buf + res, "++more++ ");
|
2005-11-10 01:36:41 +07:00
|
|
|
break;
|
|
|
|
}
|
2007-12-07 14:40:30 +07:00
|
|
|
res += sprintf(buf + res, "%s ", bond->dev->name);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2007-12-07 14:40:31 +07:00
|
|
|
if (res)
|
|
|
|
buf[res-1] = '\n'; /* eat the leftover space */
|
2009-06-13 02:02:46 +07:00
|
|
|
|
|
|
|
rtnl_unlock();
|
2005-11-10 01:36:41 +07:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2011-10-13 04:56:25 +07:00
|
|
|
static struct net_device *bond_get_by_name(struct bond_net *bn, const char *ifname)
|
2009-06-13 02:02:50 +07:00
|
|
|
{
|
|
|
|
struct bonding *bond;
|
|
|
|
|
2009-10-29 21:18:26 +07:00
|
|
|
list_for_each_entry(bond, &bn->dev_list, bond_list) {
|
2009-06-13 02:02:50 +07:00
|
|
|
if (strncmp(bond->dev->name, ifname, IFNAMSIZ) == 0)
|
|
|
|
return bond->dev;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* "store" function for the bond_masters attribute. This is what
|
2005-11-10 01:36:41 +07:00
|
|
|
* creates and deletes entire bonds.
|
|
|
|
*
|
|
|
|
* The class parameter is ignored.
|
|
|
|
*/
|
2009-06-13 02:02:48 +07:00
|
|
|
static ssize_t bonding_store_bonds(struct class *cls,
|
2010-01-05 18:48:07 +07:00
|
|
|
struct class_attribute *attr,
|
2009-06-13 02:02:48 +07:00
|
|
|
const char *buffer, size_t count)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2011-10-13 04:56:25 +07:00
|
|
|
struct bond_net *bn =
|
|
|
|
container_of(attr, struct bond_net, class_attr_bonding_masters);
|
2005-11-10 01:36:41 +07:00
|
|
|
char command[IFNAMSIZ + 1] = {0, };
|
|
|
|
char *ifname;
|
2008-01-18 07:25:02 +07:00
|
|
|
int rv, res = count;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
sscanf(buffer, "%16s", command); /* IFNAMSIZ*/
|
|
|
|
ifname = command + 1;
|
|
|
|
if ((strlen(command) <= 1) ||
|
|
|
|
!dev_valid_name(ifname))
|
|
|
|
goto err_no_cmd;
|
|
|
|
|
|
|
|
if (command[0] == '+') {
|
2009-12-14 11:06:07 +07:00
|
|
|
pr_info("%s is being created...\n", ifname);
|
2011-10-13 04:56:25 +07:00
|
|
|
rv = bond_create(bn->net, ifname);
|
2008-01-18 07:25:02 +07:00
|
|
|
if (rv) {
|
2011-03-14 13:22:06 +07:00
|
|
|
if (rv == -EEXIST)
|
2014-02-16 07:01:45 +07:00
|
|
|
pr_info("%s already exists\n", ifname);
|
2011-03-14 13:22:06 +07:00
|
|
|
else
|
2014-02-16 07:01:45 +07:00
|
|
|
pr_info("%s creation failed\n", ifname);
|
2008-01-18 07:25:02 +07:00
|
|
|
res = rv;
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:50 +07:00
|
|
|
} else if (command[0] == '-') {
|
|
|
|
struct net_device *bond_dev;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2008-01-18 07:25:02 +07:00
|
|
|
rtnl_lock();
|
2011-10-13 04:56:25 +07:00
|
|
|
bond_dev = bond_get_by_name(bn, ifname);
|
2009-06-13 02:02:50 +07:00
|
|
|
if (bond_dev) {
|
2009-12-14 11:06:07 +07:00
|
|
|
pr_info("%s is being deleted...\n", ifname);
|
2009-06-13 02:02:50 +07:00
|
|
|
unregister_netdevice(bond_dev);
|
|
|
|
} else {
|
2009-12-14 11:06:07 +07:00
|
|
|
pr_err("unable to delete non-existent %s\n", ifname);
|
2009-06-13 02:02:50 +07:00
|
|
|
res = -ENODEV;
|
|
|
|
}
|
|
|
|
rtnl_unlock();
|
|
|
|
} else
|
|
|
|
goto err_no_cmd;
|
2008-01-18 07:25:02 +07:00
|
|
|
|
2009-06-13 02:02:50 +07:00
|
|
|
/* Always return either count or an error. If you return 0, you'll
|
|
|
|
* get called forever, which is bad.
|
|
|
|
*/
|
|
|
|
return res;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
err_no_cmd:
|
2014-02-16 07:01:45 +07:00
|
|
|
pr_err("no command found in bonding_masters - use +ifname or -ifname\n");
|
2008-05-03 07:49:38 +07:00
|
|
|
return -EPERM;
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:50 +07:00
|
|
|
|
2005-11-10 01:36:41 +07:00
|
|
|
/* class attribute for bond_masters file. This ends up in /sys/class/net */
|
2011-10-13 04:56:25 +07:00
|
|
|
static const struct class_attribute class_attr_bonding_masters = {
|
|
|
|
.attr = {
|
|
|
|
.name = "bonding_masters",
|
|
|
|
.mode = S_IWUSR | S_IRUGO,
|
|
|
|
},
|
|
|
|
.show = bonding_show_bonds,
|
|
|
|
.store = bonding_store_bonds,
|
|
|
|
};
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Generic "store" method for bonding sysfs option setting */
|
|
|
|
static ssize_t bonding_sysfs_store_option(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
const char *buffer, size_t count)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
const struct bond_option *opt;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
opt = bond_opt_get_by_name(attr->attr.name);
|
|
|
|
if (WARN_ON(!opt))
|
|
|
|
return -ENOENT;
|
|
|
|
ret = bond_opt_tryset_rtnl(bond, opt->id, (char *)buffer);
|
|
|
|
if (!ret)
|
|
|
|
ret = count;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Show the slaves in the current bond. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_slaves(struct device *d,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2013-09-25 14:20:14 +07:00
|
|
|
struct list_head *iter;
|
2013-08-01 21:54:47 +07:00
|
|
|
struct slave *slave;
|
|
|
|
int res = 0;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2013-10-15 15:28:42 +07:00
|
|
|
if (!rtnl_trylock())
|
|
|
|
return restart_syscall();
|
|
|
|
|
2013-09-25 14:20:14 +07:00
|
|
|
bond_for_each_slave(bond, slave, iter) {
|
2005-11-10 01:36:41 +07:00
|
|
|
if (res > (PAGE_SIZE - IFNAMSIZ)) {
|
|
|
|
/* not enough space for another interface name */
|
|
|
|
if ((PAGE_SIZE - res) > 10)
|
|
|
|
res = PAGE_SIZE - 10;
|
2007-12-07 14:40:28 +07:00
|
|
|
res += sprintf(buf + res, "++more++ ");
|
2005-11-10 01:36:41 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
res += sprintf(buf + res, "%s ", slave->dev->name);
|
|
|
|
}
|
2013-10-15 15:28:42 +07:00
|
|
|
|
|
|
|
rtnl_unlock();
|
|
|
|
|
2007-12-07 14:40:31 +07:00
|
|
|
if (res)
|
|
|
|
buf[res-1] = '\n'; /* eat the leftover space */
|
2013-08-01 21:54:47 +07:00
|
|
|
|
2005-11-10 01:36:41 +07:00
|
|
|
return res;
|
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(slaves, S_IRUGO | S_IWUSR, bonding_show_slaves,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the bonding mode. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_mode(struct device *d,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-16 02:39:55 +07:00
|
|
|
val = bond_opt_get_val(BOND_OPT_MODE, BOND_MODE(bond));
|
2014-01-22 20:53:17 +07:00
|
|
|
|
2014-05-16 02:39:55 +07:00
|
|
|
return sprintf(buf, "%s %d\n", val->string, BOND_MODE(bond));
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_mode, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the bonding transmit hash method. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_xmit_hash(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2014-01-22 20:53:19 +07:00
|
|
|
|
|
|
|
val = bond_opt_get_val(BOND_OPT_XMIT_HASH, bond->params.xmit_policy);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-01-22 20:53:19 +07:00
|
|
|
return sprintf(buf, "%s %d\n", val->string, bond->params.xmit_policy);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_xmit_hash, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show arp_validate. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_arp_validate(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2006-09-23 11:54:53 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2014-01-22 20:53:20 +07:00
|
|
|
|
|
|
|
val = bond_opt_get_val(BOND_OPT_ARP_VALIDATE,
|
|
|
|
bond->params.arp_validate);
|
2006-09-23 11:54:53 +07:00
|
|
|
|
2014-01-22 20:53:20 +07:00
|
|
|
return sprintf(buf, "%s %d\n", val->string, bond->params.arp_validate);
|
2006-09-23 11:54:53 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(arp_validate, S_IRUGO | S_IWUSR, bonding_show_arp_validate,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_sysfs_store_option);
|
|
|
|
|
|
|
|
/* Show arp_all_targets. */
|
bonding: add an option to fail when any of arp_ip_target is inaccessible
Currently, we fail only when all of the ips in arp_ip_target are gone.
However, in some situations we might need to fail if even one host from
arp_ip_target becomes unavailable.
All situations, obviously, rely on the idea that we need *completely*
functional network, with all interfaces/addresses working correctly.
One real world example might be:
vlans on top on bond (hybrid port). If bond and vlans have ips assigned
and we have their peers monitored via arp_ip_target - in case of switch
misconfiguration (trunk/access port), slave driver malfunction or
tagged/untagged traffic dropped on the way - we will be able to switch
to another slave.
Though any other configuration needs that if we need to have access to all
arp_ip_targets.
This patch adds this possibility by adding a new parameter -
arp_all_targets (both as a module parameter and as a sysfs knob). It can be
set to:
0 or any (the default) - which works exactly as it's working now -
the slave is up if any of the arp_ip_targets are up.
1 or all - the slave is up if all of the arp_ip_targets are up.
This parameter can be changed on the fly (via sysfs), and requires the mode
to be active-backup and arp_validate to be enabled (it obeys the
arp_validate config on which slaves to validate).
Internally it's done through:
1) Add target_last_arp_rx[BOND_MAX_ARP_TARGETS] array to slave struct. It's
an array of jiffies, meaning that slave->target_last_arp_rx[i] is the
last time we've received arp from bond->params.arp_targets[i] on this
slave.
2) If we successfully validate an arp from bond->params.arp_targets[i] in
bond_validate_arp() - update the slave->target_last_arp_rx[i] with the
current jiffies value.
3) When getting slave's last_rx via slave_last_rx(), we return the oldest
time when we've received an arp from any address in
bond->params.arp_targets[].
If the value of arp_all_targets == 0 - we still work the same way as
before.
Also, update the documentation to reflect the new parameter.
v3->v4:
Kill the forgotten rtnl_unlock(), rephrase the documentation part to be
more clear, don't fail setting arp_all_targets if arp_validate is not set -
it has no effect anyway but can be easier to set up. Also, print a warning
if the last arp_ip_target is removed while the arp_interval is on, but not
the arp_validate.
v2->v3:
Use _bh spinlock, remove useless rtnl_lock() and use jiffies for new
arp_ip_target last arp, instead of slave_last_rx(). On bond_enslave(),
use the same initialization value for target_last_arp_rx[] as is used
for the default last_arp_rx, to avoid useless interface flaps.
Also, instead of failing to remove the last arp_ip_target just print a
warning - otherwise it might break existing scripts.
v1->v2:
Correctly handle adding/removing hosts in arp_ip_target - we need to
shift/initialize all slave's target_last_arp_rx. Also, don't fail module
loading on arp_all_targets misconfiguration, just disable it, and some
minor style fixes.
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-24 16:49:34 +07:00
|
|
|
static ssize_t bonding_show_arp_all_targets(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
bonding: add an option to fail when any of arp_ip_target is inaccessible
Currently, we fail only when all of the ips in arp_ip_target are gone.
However, in some situations we might need to fail if even one host from
arp_ip_target becomes unavailable.
All situations, obviously, rely on the idea that we need *completely*
functional network, with all interfaces/addresses working correctly.
One real world example might be:
vlans on top on bond (hybrid port). If bond and vlans have ips assigned
and we have their peers monitored via arp_ip_target - in case of switch
misconfiguration (trunk/access port), slave driver malfunction or
tagged/untagged traffic dropped on the way - we will be able to switch
to another slave.
Though any other configuration needs that if we need to have access to all
arp_ip_targets.
This patch adds this possibility by adding a new parameter -
arp_all_targets (both as a module parameter and as a sysfs knob). It can be
set to:
0 or any (the default) - which works exactly as it's working now -
the slave is up if any of the arp_ip_targets are up.
1 or all - the slave is up if all of the arp_ip_targets are up.
This parameter can be changed on the fly (via sysfs), and requires the mode
to be active-backup and arp_validate to be enabled (it obeys the
arp_validate config on which slaves to validate).
Internally it's done through:
1) Add target_last_arp_rx[BOND_MAX_ARP_TARGETS] array to slave struct. It's
an array of jiffies, meaning that slave->target_last_arp_rx[i] is the
last time we've received arp from bond->params.arp_targets[i] on this
slave.
2) If we successfully validate an arp from bond->params.arp_targets[i] in
bond_validate_arp() - update the slave->target_last_arp_rx[i] with the
current jiffies value.
3) When getting slave's last_rx via slave_last_rx(), we return the oldest
time when we've received an arp from any address in
bond->params.arp_targets[].
If the value of arp_all_targets == 0 - we still work the same way as
before.
Also, update the documentation to reflect the new parameter.
v3->v4:
Kill the forgotten rtnl_unlock(), rephrase the documentation part to be
more clear, don't fail setting arp_all_targets if arp_validate is not set -
it has no effect anyway but can be easier to set up. Also, print a warning
if the last arp_ip_target is removed while the arp_interval is on, but not
the arp_validate.
v2->v3:
Use _bh spinlock, remove useless rtnl_lock() and use jiffies for new
arp_ip_target last arp, instead of slave_last_rx(). On bond_enslave(),
use the same initialization value for target_last_arp_rx[] as is used
for the default last_arp_rx, to avoid useless interface flaps.
Also, instead of failing to remove the last arp_ip_target just print a
warning - otherwise it might break existing scripts.
v1->v2:
Correctly handle adding/removing hosts in arp_ip_target - we need to
shift/initialize all slave's target_last_arp_rx. Also, don't fail module
loading on arp_all_targets misconfiguration, just disable it, and some
minor style fixes.
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-24 16:49:34 +07:00
|
|
|
|
2014-01-22 20:53:21 +07:00
|
|
|
val = bond_opt_get_val(BOND_OPT_ARP_ALL_TARGETS,
|
|
|
|
bond->params.arp_all_targets);
|
|
|
|
return sprintf(buf, "%s %d\n",
|
|
|
|
val->string, bond->params.arp_all_targets);
|
bonding: add an option to fail when any of arp_ip_target is inaccessible
Currently, we fail only when all of the ips in arp_ip_target are gone.
However, in some situations we might need to fail if even one host from
arp_ip_target becomes unavailable.
All situations, obviously, rely on the idea that we need *completely*
functional network, with all interfaces/addresses working correctly.
One real world example might be:
vlans on top on bond (hybrid port). If bond and vlans have ips assigned
and we have their peers monitored via arp_ip_target - in case of switch
misconfiguration (trunk/access port), slave driver malfunction or
tagged/untagged traffic dropped on the way - we will be able to switch
to another slave.
Though any other configuration needs that if we need to have access to all
arp_ip_targets.
This patch adds this possibility by adding a new parameter -
arp_all_targets (both as a module parameter and as a sysfs knob). It can be
set to:
0 or any (the default) - which works exactly as it's working now -
the slave is up if any of the arp_ip_targets are up.
1 or all - the slave is up if all of the arp_ip_targets are up.
This parameter can be changed on the fly (via sysfs), and requires the mode
to be active-backup and arp_validate to be enabled (it obeys the
arp_validate config on which slaves to validate).
Internally it's done through:
1) Add target_last_arp_rx[BOND_MAX_ARP_TARGETS] array to slave struct. It's
an array of jiffies, meaning that slave->target_last_arp_rx[i] is the
last time we've received arp from bond->params.arp_targets[i] on this
slave.
2) If we successfully validate an arp from bond->params.arp_targets[i] in
bond_validate_arp() - update the slave->target_last_arp_rx[i] with the
current jiffies value.
3) When getting slave's last_rx via slave_last_rx(), we return the oldest
time when we've received an arp from any address in
bond->params.arp_targets[].
If the value of arp_all_targets == 0 - we still work the same way as
before.
Also, update the documentation to reflect the new parameter.
v3->v4:
Kill the forgotten rtnl_unlock(), rephrase the documentation part to be
more clear, don't fail setting arp_all_targets if arp_validate is not set -
it has no effect anyway but can be easier to set up. Also, print a warning
if the last arp_ip_target is removed while the arp_interval is on, but not
the arp_validate.
v2->v3:
Use _bh spinlock, remove useless rtnl_lock() and use jiffies for new
arp_ip_target last arp, instead of slave_last_rx(). On bond_enslave(),
use the same initialization value for target_last_arp_rx[] as is used
for the default last_arp_rx, to avoid useless interface flaps.
Also, instead of failing to remove the last arp_ip_target just print a
warning - otherwise it might break existing scripts.
v1->v2:
Correctly handle adding/removing hosts in arp_ip_target - we need to
shift/initialize all slave's target_last_arp_rx. Also, don't fail module
loading on arp_all_targets misconfiguration, just disable it, and some
minor style fixes.
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-24 16:49:34 +07:00
|
|
|
}
|
|
|
|
static DEVICE_ATTR(arp_all_targets, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_arp_all_targets, bonding_sysfs_store_option);
|
2006-09-23 11:54:53 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show fail_over_mac. */
|
2009-06-13 02:02:48 +07:00
|
|
|
static ssize_t bonding_show_fail_over_mac(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2007-10-10 09:57:24 +07:00
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2007-10-10 09:57:24 +07:00
|
|
|
|
2014-01-22 20:53:22 +07:00
|
|
|
val = bond_opt_get_val(BOND_OPT_FAIL_OVER_MAC,
|
|
|
|
bond->params.fail_over_mac);
|
|
|
|
|
|
|
|
return sprintf(buf, "%s %d\n", val->string, bond->params.fail_over_mac);
|
2007-10-10 09:57:24 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(fail_over_mac, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_fail_over_mac, bonding_sysfs_store_option);
|
2007-10-10 09:57:24 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the arp timer interval. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_arp_interval(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2007-12-07 14:40:28 +07:00
|
|
|
return sprintf(buf, "%d\n", bond->params.arp_interval);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(arp_interval, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_arp_interval, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the arp targets. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_arp_targets(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2014-01-22 20:53:24 +07:00
|
|
|
int i, res = 0;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
|
|
|
|
if (bond->params.arp_targets[i])
|
2008-10-31 14:56:00 +07:00
|
|
|
res += sprintf(buf + res, "%pI4 ",
|
|
|
|
&bond->params.arp_targets[i]);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2007-12-07 14:40:31 +07:00
|
|
|
if (res)
|
|
|
|
buf[res-1] = '\n'; /* eat the leftover space */
|
2014-01-22 20:53:24 +07:00
|
|
|
|
2005-11-10 01:36:41 +07:00
|
|
|
return res;
|
|
|
|
}
|
2014-05-08 19:23:54 +07:00
|
|
|
static DEVICE_ATTR(arp_ip_target, S_IRUGO | S_IWUSR,
|
|
|
|
bonding_show_arp_targets, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the up and down delays. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_downdelay(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2007-12-07 14:40:28 +07:00
|
|
|
return sprintf(buf, "%d\n", bond->params.downdelay * bond->params.miimon);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_downdelay, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_updelay(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2007-12-07 14:40:28 +07:00
|
|
|
return sprintf(buf, "%d\n", bond->params.updelay * bond->params.miimon);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_updelay, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the LACP interval. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_lacp(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-01-22 20:53:27 +07:00
|
|
|
val = bond_opt_get_val(BOND_OPT_LACP_RATE, bond->params.lacp_fast);
|
|
|
|
|
|
|
|
return sprintf(buf, "%s %d\n", val->string, bond->params.lacp_fast);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(lacp_rate, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_lacp, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2011-06-22 16:54:39 +07:00
|
|
|
static ssize_t bonding_show_min_links(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
|
2014-04-28 22:41:21 +07:00
|
|
|
return sprintf(buf, "%u\n", bond->params.min_links);
|
2011-06-22 16:54:39 +07:00
|
|
|
}
|
|
|
|
static DEVICE_ATTR(min_links, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_min_links, bonding_sysfs_store_option);
|
2011-06-22 16:54:39 +07:00
|
|
|
|
2008-11-05 08:51:16 +07:00
|
|
|
static ssize_t bonding_show_ad_select(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2008-11-05 08:51:16 +07:00
|
|
|
|
2014-01-22 20:53:29 +07:00
|
|
|
val = bond_opt_get_val(BOND_OPT_AD_SELECT, bond->params.ad_select);
|
|
|
|
|
|
|
|
return sprintf(buf, "%s %d\n", val->string, bond->params.ad_select);
|
2008-11-05 08:51:16 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(ad_select, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_ad_select, bonding_sysfs_store_option);
|
2008-11-05 08:51:16 +07:00
|
|
|
|
2015-07-24 20:50:31 +07:00
|
|
|
/* Show the number of peer notifications to send after a failover event. */
|
2011-04-26 22:25:52 +07:00
|
|
|
static ssize_t bonding_show_num_peer_notif(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
return sprintf(buf, "%d\n", bond->params.num_peer_notif);
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(num_grat_arp, S_IRUGO | S_IWUSR,
|
2015-07-24 20:50:31 +07:00
|
|
|
bonding_show_num_peer_notif, bonding_sysfs_store_option);
|
2011-04-26 22:25:52 +07:00
|
|
|
static DEVICE_ATTR(num_unsol_na, S_IRUGO | S_IWUSR,
|
2015-07-24 20:50:31 +07:00
|
|
|
bonding_show_num_peer_notif, bonding_sysfs_store_option);
|
2011-04-26 22:25:52 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the MII monitor interval. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_miimon(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2007-12-07 14:40:28 +07:00
|
|
|
return sprintf(buf, "%d\n", bond->params.miimon);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_miimon, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the primary slave. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_primary(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2014-09-10 04:17:00 +07:00
|
|
|
struct slave *primary;
|
|
|
|
int count = 0;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-09-10 04:17:00 +07:00
|
|
|
rcu_read_lock();
|
|
|
|
primary = rcu_dereference(bond->primary_slave);
|
|
|
|
if (primary)
|
|
|
|
count = sprintf(buf, "%s\n", primary->dev->name);
|
|
|
|
rcu_read_unlock();
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(primary, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_primary, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the primary_reselect flag. */
|
2009-09-25 10:28:09 +07:00
|
|
|
static ssize_t bonding_show_primary_reselect(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2014-03-05 07:36:44 +07:00
|
|
|
const struct bond_opt_value *val;
|
2014-01-22 20:53:33 +07:00
|
|
|
|
|
|
|
val = bond_opt_get_val(BOND_OPT_PRIMARY_RESELECT,
|
|
|
|
bond->params.primary_reselect);
|
2009-09-25 10:28:09 +07:00
|
|
|
|
|
|
|
return sprintf(buf, "%s %d\n",
|
2014-01-22 20:53:33 +07:00
|
|
|
val->string, bond->params.primary_reselect);
|
2009-09-25 10:28:09 +07:00
|
|
|
}
|
|
|
|
static DEVICE_ATTR(primary_reselect, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_primary_reselect, bonding_sysfs_store_option);
|
2009-09-25 10:28:09 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the use_carrier flag. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_carrier(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2007-12-07 14:40:28 +07:00
|
|
|
return sprintf(buf, "%d\n", bond->params.use_carrier);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_carrier, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show currently active_slave. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_active_slave(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2013-10-18 22:43:37 +07:00
|
|
|
struct net_device *slave_dev;
|
2007-12-07 14:40:29 +07:00
|
|
|
int count = 0;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
bonding: initial RCU conversion
This patch does the initial bonding conversion to RCU. After it the
following modes are protected by RCU alone: roundrobin, active-backup,
broadcast and xor. Modes ALB/TLB and 3ad still acquire bond->lock for
reading, and will be dealt with later. curr_active_slave needs to be
dereferenced via rcu in the converted modes because the only thing
protecting the slave after this patch is rcu_read_lock, so we need the
proper barrier for weakly ordered archs and to make sure we don't have
stale pointer. It's not tagged with __rcu yet because there's still work
to be done to remove the curr_slave_lock, so sparse will complain when
rcu_assign_pointer and rcu_dereference are used, but the alternative to use
rcu_dereference_protected would've created much bigger code churn which is
more difficult to test and review. That will be converted in time.
1. Active-backup mode
1.1 Perf recording while doing iperf -P 4
- old bonding: iperf spent 0.55% in bonding, system spent 0.29% CPU
in bonding
- new bonding: iperf spent 0.29% in bonding, system spent 0.15% CPU
in bonding
1.2. Bandwidth measurements
- old bonding: 16.1 gbps consistently
- new bonding: 17.5 gbps consistently
2. Round-robin mode
2.1 Perf recording while doing iperf -P 4
- old bonding: iperf spent 0.51% in bonding, system spent 0.24% CPU
in bonding
- new bonding: iperf spent 0.16% in bonding, system spent 0.11% CPU
in bonding
2.2 Bandwidth measurements
- old bonding: 8 gbps (variable due to packet reorderings)
- new bonding: 10 gbps (variable due to packet reorderings)
Of course the latency has improved in all converted modes, and moreover
while
doing enslave/release (since it doesn't affect tx anymore).
Also I've stress tested all modes doing enslave/release in a loop while
transmitting traffic.
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-01 21:54:51 +07:00
|
|
|
rcu_read_lock();
|
2013-10-18 22:43:37 +07:00
|
|
|
slave_dev = bond_option_active_slave_get_rcu(bond);
|
|
|
|
if (slave_dev)
|
|
|
|
count = sprintf(buf, "%s\n", slave_dev->name);
|
bonding: initial RCU conversion
This patch does the initial bonding conversion to RCU. After it the
following modes are protected by RCU alone: roundrobin, active-backup,
broadcast and xor. Modes ALB/TLB and 3ad still acquire bond->lock for
reading, and will be dealt with later. curr_active_slave needs to be
dereferenced via rcu in the converted modes because the only thing
protecting the slave after this patch is rcu_read_lock, so we need the
proper barrier for weakly ordered archs and to make sure we don't have
stale pointer. It's not tagged with __rcu yet because there's still work
to be done to remove the curr_slave_lock, so sparse will complain when
rcu_assign_pointer and rcu_dereference are used, but the alternative to use
rcu_dereference_protected would've created much bigger code churn which is
more difficult to test and review. That will be converted in time.
1. Active-backup mode
1.1 Perf recording while doing iperf -P 4
- old bonding: iperf spent 0.55% in bonding, system spent 0.29% CPU
in bonding
- new bonding: iperf spent 0.29% in bonding, system spent 0.15% CPU
in bonding
1.2. Bandwidth measurements
- old bonding: 16.1 gbps consistently
- new bonding: 17.5 gbps consistently
2. Round-robin mode
2.1 Perf recording while doing iperf -P 4
- old bonding: iperf spent 0.51% in bonding, system spent 0.24% CPU
in bonding
- new bonding: iperf spent 0.16% in bonding, system spent 0.11% CPU
in bonding
2.2 Bandwidth measurements
- old bonding: 8 gbps (variable due to packet reorderings)
- new bonding: 10 gbps (variable due to packet reorderings)
Of course the latency has improved in all converted modes, and moreover
while
doing enslave/release (since it doesn't affect tx anymore).
Also I've stress tested all modes doing enslave/release in a loop while
transmitting traffic.
Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-01 21:54:51 +07:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
2005-11-10 01:36:41 +07:00
|
|
|
return count;
|
|
|
|
}
|
2009-06-13 02:02:48 +07:00
|
|
|
static DEVICE_ATTR(active_slave, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_active_slave, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show link status of the bond interface. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_mii_status(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2016-01-09 08:35:36 +07:00
|
|
|
bool active = netif_carrier_ok(bond->dev);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-07-15 20:56:54 +07:00
|
|
|
return sprintf(buf, "%s\n", active ? "up" : "down");
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
2002-04-10 02:14:34 +07:00
|
|
|
static DEVICE_ATTR(mii_status, S_IRUGO, bonding_show_mii_status, NULL);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show current 802.3ad aggregator ID. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_ad_aggregator(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
|
|
|
int count = 0;
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-16 02:39:55 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD) {
|
2005-11-10 01:36:41 +07:00
|
|
|
struct ad_info ad_info;
|
2009-06-13 02:02:48 +07:00
|
|
|
count = sprintf(buf, "%d\n",
|
2013-05-18 08:18:31 +07:00
|
|
|
bond_3ad_get_active_agg_info(bond, &ad_info)
|
2009-06-13 02:02:48 +07:00
|
|
|
? 0 : ad_info.aggregator_id);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
2002-04-10 02:14:34 +07:00
|
|
|
static DEVICE_ATTR(ad_aggregator, S_IRUGO, bonding_show_ad_aggregator, NULL);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show number of active 802.3ad ports. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_ad_num_ports(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
|
|
|
int count = 0;
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-16 02:39:55 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD) {
|
2005-11-10 01:36:41 +07:00
|
|
|
struct ad_info ad_info;
|
2009-06-13 02:02:48 +07:00
|
|
|
count = sprintf(buf, "%d\n",
|
2013-05-18 08:18:31 +07:00
|
|
|
bond_3ad_get_active_agg_info(bond, &ad_info)
|
2009-06-13 02:02:48 +07:00
|
|
|
? 0 : ad_info.ports);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
2002-04-10 02:14:34 +07:00
|
|
|
static DEVICE_ATTR(ad_num_ports, S_IRUGO, bonding_show_ad_num_ports, NULL);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show current 802.3ad actor key. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_ad_actor_key(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
|
|
|
int count = 0;
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2015-06-19 01:30:54 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {
|
2005-11-10 01:36:41 +07:00
|
|
|
struct ad_info ad_info;
|
2009-06-13 02:02:48 +07:00
|
|
|
count = sprintf(buf, "%d\n",
|
2013-05-18 08:18:31 +07:00
|
|
|
bond_3ad_get_active_agg_info(bond, &ad_info)
|
2009-06-13 02:02:48 +07:00
|
|
|
? 0 : ad_info.actor_key);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
2002-04-10 02:14:34 +07:00
|
|
|
static DEVICE_ATTR(ad_actor_key, S_IRUGO, bonding_show_ad_actor_key, NULL);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show current 802.3ad partner key. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_ad_partner_key(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
|
|
|
int count = 0;
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2015-06-19 01:30:54 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {
|
2005-11-10 01:36:41 +07:00
|
|
|
struct ad_info ad_info;
|
2009-06-13 02:02:48 +07:00
|
|
|
count = sprintf(buf, "%d\n",
|
2013-05-18 08:18:31 +07:00
|
|
|
bond_3ad_get_active_agg_info(bond, &ad_info)
|
2009-06-13 02:02:48 +07:00
|
|
|
? 0 : ad_info.partner_key);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
2002-04-10 02:14:34 +07:00
|
|
|
static DEVICE_ATTR(ad_partner_key, S_IRUGO, bonding_show_ad_partner_key, NULL);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show current 802.3ad partner mac. */
|
2002-04-10 02:14:34 +07:00
|
|
|
static ssize_t bonding_show_ad_partner_mac(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
|
|
|
int count = 0;
|
2002-04-10 02:14:34 +07:00
|
|
|
struct bonding *bond = to_bond(d);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2015-06-19 01:30:54 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN)) {
|
2005-11-10 01:36:41 +07:00
|
|
|
struct ad_info ad_info;
|
2009-06-13 02:02:48 +07:00
|
|
|
if (!bond_3ad_get_active_agg_info(bond, &ad_info))
|
2008-10-28 05:59:26 +07:00
|
|
|
count = sprintf(buf, "%pM\n", ad_info.partner_system);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
2002-04-10 02:14:34 +07:00
|
|
|
static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the queue_ids of the slaves in the current bond. */
|
2010-06-02 15:40:18 +07:00
|
|
|
static ssize_t bonding_show_queue_id(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2013-09-25 14:20:14 +07:00
|
|
|
struct list_head *iter;
|
2013-08-01 21:54:47 +07:00
|
|
|
struct slave *slave;
|
|
|
|
int res = 0;
|
2010-06-02 15:40:18 +07:00
|
|
|
|
|
|
|
if (!rtnl_trylock())
|
|
|
|
return restart_syscall();
|
|
|
|
|
2013-09-25 14:20:14 +07:00
|
|
|
bond_for_each_slave(bond, slave, iter) {
|
2010-07-15 08:24:54 +07:00
|
|
|
if (res > (PAGE_SIZE - IFNAMSIZ - 6)) {
|
|
|
|
/* not enough space for another interface_name:queue_id pair */
|
2010-06-02 15:40:18 +07:00
|
|
|
if ((PAGE_SIZE - res) > 10)
|
|
|
|
res = PAGE_SIZE - 10;
|
|
|
|
res += sprintf(buf + res, "++more++ ");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
res += sprintf(buf + res, "%s:%d ",
|
|
|
|
slave->dev->name, slave->queue_id);
|
|
|
|
}
|
|
|
|
if (res)
|
|
|
|
buf[res-1] = '\n'; /* eat the leftover space */
|
2013-10-15 15:28:42 +07:00
|
|
|
|
2010-06-02 15:40:18 +07:00
|
|
|
rtnl_unlock();
|
2013-08-01 21:54:47 +07:00
|
|
|
|
2010-06-02 15:40:18 +07:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(queue_id, S_IRUGO | S_IWUSR, bonding_show_queue_id,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_sysfs_store_option);
|
2010-06-02 15:40:18 +07:00
|
|
|
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the all_slaves_active flag. */
|
2010-06-02 15:39:21 +07:00
|
|
|
static ssize_t bonding_show_slaves_active(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
|
|
|
|
return sprintf(buf, "%d\n", bond->params.all_slaves_active);
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_slaves_active, bonding_sysfs_store_option);
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Show the number of IGMP membership reports to send on link failure */
|
2010-10-05 21:23:59 +07:00
|
|
|
static ssize_t bonding_show_resend_igmp(struct device *d,
|
2011-05-25 15:38:58 +07:00
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
2010-10-05 21:23:59 +07:00
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
|
|
|
|
return sprintf(buf, "%d\n", bond->params.resend_igmp);
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(resend_igmp, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_resend_igmp, bonding_sysfs_store_option);
|
2010-10-05 21:23:59 +07:00
|
|
|
|
2013-09-13 22:05:33 +07:00
|
|
|
|
|
|
|
static ssize_t bonding_show_lp_interval(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2013-12-18 12:30:30 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
return sprintf(buf, "%d\n", bond->params.lp_interval);
|
2013-09-13 22:05:33 +07:00
|
|
|
}
|
|
|
|
static DEVICE_ATTR(lp_interval, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_lp_interval, bonding_sysfs_store_option);
|
2013-09-13 22:05:33 +07:00
|
|
|
|
2014-04-23 06:30:22 +07:00
|
|
|
static ssize_t bonding_show_tlb_dynamic_lb(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
return sprintf(buf, "%d\n", bond->params.tlb_dynamic_lb);
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(tlb_dynamic_lb, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_tlb_dynamic_lb, bonding_sysfs_store_option);
|
2014-04-23 06:30:22 +07:00
|
|
|
|
2013-11-05 19:51:41 +07:00
|
|
|
static ssize_t bonding_show_packets_per_slave(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
2013-12-05 17:36:58 +07:00
|
|
|
unsigned int packets_per_slave = bond->params.packets_per_slave;
|
2013-12-18 12:30:37 +07:00
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
return sprintf(buf, "%u\n", packets_per_slave);
|
2013-11-05 19:51:41 +07:00
|
|
|
}
|
|
|
|
static DEVICE_ATTR(packets_per_slave, S_IRUGO | S_IWUSR,
|
2014-05-08 19:23:54 +07:00
|
|
|
bonding_show_packets_per_slave, bonding_sysfs_store_option);
|
2013-11-05 19:51:41 +07:00
|
|
|
|
2015-05-09 14:01:55 +07:00
|
|
|
static ssize_t bonding_show_ad_actor_sys_prio(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
|
2015-06-19 01:30:54 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN))
|
2015-05-09 14:01:55 +07:00
|
|
|
return sprintf(buf, "%hu\n", bond->params.ad_actor_sys_prio);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(ad_actor_sys_prio, S_IRUGO | S_IWUSR,
|
|
|
|
bonding_show_ad_actor_sys_prio, bonding_sysfs_store_option);
|
|
|
|
|
2015-05-09 14:01:56 +07:00
|
|
|
static ssize_t bonding_show_ad_actor_system(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
|
2015-06-19 01:30:54 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN))
|
2015-05-09 14:01:56 +07:00
|
|
|
return sprintf(buf, "%pM\n", bond->params.ad_actor_system);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static DEVICE_ATTR(ad_actor_system, S_IRUGO | S_IWUSR,
|
|
|
|
bonding_show_ad_actor_system, bonding_sysfs_store_option);
|
|
|
|
|
2015-05-09 14:01:57 +07:00
|
|
|
static ssize_t bonding_show_ad_user_port_key(struct device *d,
|
|
|
|
struct device_attribute *attr,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct bonding *bond = to_bond(d);
|
|
|
|
|
2015-06-19 01:30:54 +07:00
|
|
|
if (BOND_MODE(bond) == BOND_MODE_8023AD && capable(CAP_NET_ADMIN))
|
2015-05-09 14:01:57 +07:00
|
|
|
return sprintf(buf, "%hu\n", bond->params.ad_user_port_key);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(ad_user_port_key, S_IRUGO | S_IWUSR,
|
|
|
|
bonding_show_ad_user_port_key, bonding_sysfs_store_option);
|
|
|
|
|
2005-11-10 01:36:41 +07:00
|
|
|
static struct attribute *per_bond_attrs[] = {
|
2002-04-10 02:14:34 +07:00
|
|
|
&dev_attr_slaves.attr,
|
|
|
|
&dev_attr_mode.attr,
|
2007-10-10 09:57:24 +07:00
|
|
|
&dev_attr_fail_over_mac.attr,
|
2002-04-10 02:14:34 +07:00
|
|
|
&dev_attr_arp_validate.attr,
|
bonding: add an option to fail when any of arp_ip_target is inaccessible
Currently, we fail only when all of the ips in arp_ip_target are gone.
However, in some situations we might need to fail if even one host from
arp_ip_target becomes unavailable.
All situations, obviously, rely on the idea that we need *completely*
functional network, with all interfaces/addresses working correctly.
One real world example might be:
vlans on top on bond (hybrid port). If bond and vlans have ips assigned
and we have their peers monitored via arp_ip_target - in case of switch
misconfiguration (trunk/access port), slave driver malfunction or
tagged/untagged traffic dropped on the way - we will be able to switch
to another slave.
Though any other configuration needs that if we need to have access to all
arp_ip_targets.
This patch adds this possibility by adding a new parameter -
arp_all_targets (both as a module parameter and as a sysfs knob). It can be
set to:
0 or any (the default) - which works exactly as it's working now -
the slave is up if any of the arp_ip_targets are up.
1 or all - the slave is up if all of the arp_ip_targets are up.
This parameter can be changed on the fly (via sysfs), and requires the mode
to be active-backup and arp_validate to be enabled (it obeys the
arp_validate config on which slaves to validate).
Internally it's done through:
1) Add target_last_arp_rx[BOND_MAX_ARP_TARGETS] array to slave struct. It's
an array of jiffies, meaning that slave->target_last_arp_rx[i] is the
last time we've received arp from bond->params.arp_targets[i] on this
slave.
2) If we successfully validate an arp from bond->params.arp_targets[i] in
bond_validate_arp() - update the slave->target_last_arp_rx[i] with the
current jiffies value.
3) When getting slave's last_rx via slave_last_rx(), we return the oldest
time when we've received an arp from any address in
bond->params.arp_targets[].
If the value of arp_all_targets == 0 - we still work the same way as
before.
Also, update the documentation to reflect the new parameter.
v3->v4:
Kill the forgotten rtnl_unlock(), rephrase the documentation part to be
more clear, don't fail setting arp_all_targets if arp_validate is not set -
it has no effect anyway but can be easier to set up. Also, print a warning
if the last arp_ip_target is removed while the arp_interval is on, but not
the arp_validate.
v2->v3:
Use _bh spinlock, remove useless rtnl_lock() and use jiffies for new
arp_ip_target last arp, instead of slave_last_rx(). On bond_enslave(),
use the same initialization value for target_last_arp_rx[] as is used
for the default last_arp_rx, to avoid useless interface flaps.
Also, instead of failing to remove the last arp_ip_target just print a
warning - otherwise it might break existing scripts.
v1->v2:
Correctly handle adding/removing hosts in arp_ip_target - we need to
shift/initialize all slave's target_last_arp_rx. Also, don't fail module
loading on arp_all_targets misconfiguration, just disable it, and some
minor style fixes.
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-24 16:49:34 +07:00
|
|
|
&dev_attr_arp_all_targets.attr,
|
2002-04-10 02:14:34 +07:00
|
|
|
&dev_attr_arp_interval.attr,
|
|
|
|
&dev_attr_arp_ip_target.attr,
|
|
|
|
&dev_attr_downdelay.attr,
|
|
|
|
&dev_attr_updelay.attr,
|
|
|
|
&dev_attr_lacp_rate.attr,
|
2008-11-05 08:51:16 +07:00
|
|
|
&dev_attr_ad_select.attr,
|
2002-04-10 02:14:34 +07:00
|
|
|
&dev_attr_xmit_hash_policy.attr,
|
2011-04-26 22:25:52 +07:00
|
|
|
&dev_attr_num_grat_arp.attr,
|
|
|
|
&dev_attr_num_unsol_na.attr,
|
2002-04-10 02:14:34 +07:00
|
|
|
&dev_attr_miimon.attr,
|
|
|
|
&dev_attr_primary.attr,
|
2009-09-25 10:28:09 +07:00
|
|
|
&dev_attr_primary_reselect.attr,
|
2002-04-10 02:14:34 +07:00
|
|
|
&dev_attr_use_carrier.attr,
|
|
|
|
&dev_attr_active_slave.attr,
|
|
|
|
&dev_attr_mii_status.attr,
|
|
|
|
&dev_attr_ad_aggregator.attr,
|
|
|
|
&dev_attr_ad_num_ports.attr,
|
|
|
|
&dev_attr_ad_actor_key.attr,
|
|
|
|
&dev_attr_ad_partner_key.attr,
|
|
|
|
&dev_attr_ad_partner_mac.attr,
|
2010-06-02 15:40:18 +07:00
|
|
|
&dev_attr_queue_id.attr,
|
2010-06-02 15:39:21 +07:00
|
|
|
&dev_attr_all_slaves_active.attr,
|
2010-10-05 21:23:59 +07:00
|
|
|
&dev_attr_resend_igmp.attr,
|
2011-06-22 16:54:39 +07:00
|
|
|
&dev_attr_min_links.attr,
|
2013-09-13 22:05:33 +07:00
|
|
|
&dev_attr_lp_interval.attr,
|
2013-11-05 19:51:41 +07:00
|
|
|
&dev_attr_packets_per_slave.attr,
|
2014-04-23 06:30:22 +07:00
|
|
|
&dev_attr_tlb_dynamic_lb.attr,
|
2015-05-09 14:01:55 +07:00
|
|
|
&dev_attr_ad_actor_sys_prio.attr,
|
2015-05-09 14:01:56 +07:00
|
|
|
&dev_attr_ad_actor_system.attr,
|
2015-05-09 14:01:57 +07:00
|
|
|
&dev_attr_ad_user_port_key.attr,
|
2005-11-10 01:36:41 +07:00
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct attribute_group bonding_group = {
|
|
|
|
.name = "bonding",
|
|
|
|
.attrs = per_bond_attrs,
|
|
|
|
};
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Initialize sysfs. This sets up the bonding_masters file in
|
2005-11-10 01:36:41 +07:00
|
|
|
* /sys/class/net.
|
|
|
|
*/
|
2011-10-13 04:56:25 +07:00
|
|
|
int bond_create_sysfs(struct bond_net *bn)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2008-06-14 08:12:04 +07:00
|
|
|
int ret;
|
2005-11-10 01:36:41 +07:00
|
|
|
|
2011-10-13 04:56:25 +07:00
|
|
|
bn->class_attr_bonding_masters = class_attr_bonding_masters;
|
2011-10-22 05:43:07 +07:00
|
|
|
sysfs_attr_init(&bn->class_attr_bonding_masters.attr);
|
2011-10-13 04:56:25 +07:00
|
|
|
|
2013-09-12 09:29:04 +07:00
|
|
|
ret = netdev_class_create_file_ns(&bn->class_attr_bonding_masters,
|
|
|
|
bn->net);
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Permit multiple loads of the module by ignoring failures to
|
bonding: modify sysfs support to permit multiple loads
The existing code would blindly attempt to create the
bonding_masters file (in /sys/class/net) every time the module was
loaded. When the module is loaded multiple times (which is the
historical method used by initscripts and sysconfig to create multiple
bonding interfaces), this caused load failure of the second module load
attempt, as the creation request would fail.
This changes the code to note the failure, arrange to not remove
the bonding_masters file upon module exit, and then return success.
Bonding interfaces created by the second or subsequent loads of
the module will not exist in bonding_masters. This is not a significant
change, as previously only the interfaces from the most recent load of
the module would be listed. Both situations are less than optimal, but
this case permits compatibility with existing distro configuration
scripts, and is consistent.
Note that previously, the sysfs create request would overwrite
the exsting bonding_masters file and succeed, allowing multiple loads of
the module. The sysfs code has recently changed to return an error if
the file being created already exists.
Patrick McHardy <kaber@trash.net>, who reported this problem,
observed crashes on the old kernel (before sysfs checked for
duplicates). I did not experience such crashes, but this change should
resolve them.
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2007-01-20 09:15:47 +07:00
|
|
|
* create the bonding_masters sysfs file. Bonding devices
|
|
|
|
* created by second or subsequent loads of the module will
|
|
|
|
* not be listed in, or controllable by, bonding_masters, but
|
|
|
|
* will have the usual "bonding" sysfs directory.
|
|
|
|
*
|
|
|
|
* This is done to preserve backwards compatibility for
|
|
|
|
* initscripts/sysconfig, which load bonding multiple times to
|
|
|
|
* configure multiple bonding devices.
|
|
|
|
*/
|
|
|
|
if (ret == -EEXIST) {
|
2008-05-15 12:35:04 +07:00
|
|
|
/* Is someone being kinky and naming a device bonding_master? */
|
2011-10-13 04:56:25 +07:00
|
|
|
if (__dev_get_by_name(bn->net,
|
2008-05-15 12:35:04 +07:00
|
|
|
class_attr_bonding_masters.attr.name))
|
2014-02-16 07:01:45 +07:00
|
|
|
pr_err("network device named %s already exists in sysfs\n",
|
2008-05-15 12:35:04 +07:00
|
|
|
class_attr_bonding_masters.attr.name);
|
2009-06-11 19:46:04 +07:00
|
|
|
ret = 0;
|
bonding: modify sysfs support to permit multiple loads
The existing code would blindly attempt to create the
bonding_masters file (in /sys/class/net) every time the module was
loaded. When the module is loaded multiple times (which is the
historical method used by initscripts and sysconfig to create multiple
bonding interfaces), this caused load failure of the second module load
attempt, as the creation request would fail.
This changes the code to note the failure, arrange to not remove
the bonding_masters file upon module exit, and then return success.
Bonding interfaces created by the second or subsequent loads of
the module will not exist in bonding_masters. This is not a significant
change, as previously only the interfaces from the most recent load of
the module would be listed. Both situations are less than optimal, but
this case permits compatibility with existing distro configuration
scripts, and is consistent.
Note that previously, the sysfs create request would overwrite
the exsting bonding_masters file and succeed, allowing multiple loads of
the module. The sysfs code has recently changed to return an error if
the file being created already exists.
Patrick McHardy <kaber@trash.net>, who reported this problem,
observed crashes on the old kernel (before sysfs checked for
duplicates). I did not experience such crashes, but this change should
resolve them.
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
2007-01-20 09:15:47 +07:00
|
|
|
}
|
2005-11-10 01:36:41 +07:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Remove /sys/class/net/bonding_masters. */
|
2011-10-13 04:56:25 +07:00
|
|
|
void bond_destroy_sysfs(struct bond_net *bn)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2013-09-12 09:29:04 +07:00
|
|
|
netdev_class_remove_file_ns(&bn->class_attr_bonding_masters, bn->net);
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|
2014-05-08 19:23:54 +07:00
|
|
|
/* Initialize sysfs for each bond. This sets up and registers
|
2005-11-10 01:36:41 +07:00
|
|
|
* the 'bondctl' directory for each individual bond under /sys/class/net.
|
|
|
|
*/
|
2009-10-29 21:18:22 +07:00
|
|
|
void bond_prepare_sysfs_group(struct bonding *bond)
|
2005-11-10 01:36:41 +07:00
|
|
|
{
|
2009-10-29 21:18:22 +07:00
|
|
|
bond->dev->sysfs_groups[0] = &bonding_group;
|
2005-11-10 01:36:41 +07:00
|
|
|
}
|
|
|
|
|