hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bonding-sysfs' of git://git.tuxdriver.com/git/netdev-jwl

This commit is contained in:
Jeff Garzik 2005-11-15 04:49:03 -05:00
parent 06d61cbf7c 691b73b132
commit 83cbd33aae
9 changed files with 1735 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/bonding/Makefile
View File

@ -4,5 +4,5 @@
obj-$(CONFIG_BONDING) += bonding.o obj-$(CONFIG_BONDING) += bonding.o
bonding-objs := bond_main.o bond_3ad.o bond_alb.o bonding-objs := bond_main.o bond_3ad.o bond_alb.o bond_sysfs.o

74
drivers/net/bonding/bond_3ad.c
View File

@ -1198,10 +1198,10 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
// detect loopback situation // detect loopback situation
if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) { if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
// INFO_RECEIVED_LOOPBACK_FRAMES // INFO_RECEIVED_LOOPBACK_FRAMES
printk(KERN_ERR DRV_NAME ": An illegal loopback occurred on adapter (%s)\n", printk(KERN_ERR DRV_NAME ": %s: An illegal loopback occurred on "
port->slave->dev->name); "adapter (%s). Check the configuration to verify that all "
printk(KERN_ERR "Check the configuration to verify that all Adapters " "Adapters are connected to 802.3ad compliant switch ports\n",
"are connected to 802.3ad compliant switch ports\n"); port->slave->dev->master->name, port->slave->dev->name);
__release_rx_machine_lock(port); __release_rx_machine_lock(port);
return; return;
} }
@ -1378,8 +1378,9 @@ static void ad_port_selection_logic(struct port *port)
} }
} }
if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
printk(KERN_WARNING DRV_NAME ": Warning: Port %d (on %s) was " printk(KERN_WARNING DRV_NAME ": %s: Warning: Port %d (on %s) was "
"related to aggregator %d but was not on its port list\n", "related to aggregator %d but was not on its port list\n",
port->slave->dev->master->name,
port->actor_port_number, port->slave->dev->name, port->actor_port_number, port->slave->dev->name,
port->aggregator->aggregator_identifier); port->aggregator->aggregator_identifier);
} }
@ -1450,7 +1451,8 @@ static void ad_port_selection_logic(struct port *port)
dprintk("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier); dprintk("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
} else { } else {
printk(KERN_ERR DRV_NAME ": Port %d (on %s) did not find a suitable aggregator\n", printk(KERN_ERR DRV_NAME ": %s: Port %d (on %s) did not find a suitable aggregator\n",
port->slave->dev->master->name,
port->actor_port_number, port->slave->dev->name); port->actor_port_number, port->slave->dev->name);
} }
} }
@ -1582,8 +1584,9 @@ static void ad_agg_selection_logic(struct aggregator *aggregator)
// check if any partner replys // check if any partner replys
if (best_aggregator->is_individual) { if (best_aggregator->is_individual) {
printk(KERN_WARNING DRV_NAME ": Warning: No 802.3ad response from the link partner " printk(KERN_WARNING DRV_NAME ": %s: Warning: No 802.3ad response from "
"for any adapters in the bond\n"); "the link partner for any adapters in the bond\n",
best_aggregator->slave->dev->master->name);
} }
// check if there are more than one aggregator // check if there are more than one aggregator
@ -1915,7 +1918,8 @@ int bond_3ad_bind_slave(struct slave *slave)
struct aggregator *aggregator; struct aggregator *aggregator;
if (bond == NULL) { if (bond == NULL) {
printk(KERN_ERR "The slave %s is not attached to its bond\n", slave->dev->name); printk(KERN_ERR DRV_NAME ": %s: The slave %s is not attached to its bond\n",
slave->dev->master->name, slave->dev->name);
return -1; return -1;
} }
@ -1990,7 +1994,9 @@ void bond_3ad_unbind_slave(struct slave *slave)
// if slave is null, the whole port is not initialized // if slave is null, the whole port is not initialized
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Trying to unbind an uninitialized port on %s\n", slave->dev->name); printk(KERN_WARNING DRV_NAME ": Warning: %s: Trying to "
"unbind an uninitialized port on %s\n",
slave->dev->master->name, slave->dev->name);
return; return;
} }
@ -2021,7 +2027,8 @@ void bond_3ad_unbind_slave(struct slave *slave)
dprintk("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier); dprintk("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) { if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
printk(KERN_INFO DRV_NAME ": Removing an active aggregator\n"); printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
aggregator->slave->dev->master->name);
// select new active aggregator // select new active aggregator
select_new_active_agg = 1; select_new_active_agg = 1;
} }
@ -2051,15 +2058,17 @@ void bond_3ad_unbind_slave(struct slave *slave)
ad_agg_selection_logic(__get_first_agg(port)); ad_agg_selection_logic(__get_first_agg(port));
} }
} else { } else {
printk(KERN_WARNING DRV_NAME ": Warning: unbinding aggregator, " printk(KERN_WARNING DRV_NAME ": %s: Warning: unbinding aggregator, "
"and could not find a new aggregator for its ports\n"); "and could not find a new aggregator for its ports\n",
slave->dev->master->name);
} }
} else { // in case that the only port related to this aggregator is the one we want to remove } else { // in case that the only port related to this aggregator is the one we want to remove
select_new_active_agg = aggregator->is_active; select_new_active_agg = aggregator->is_active;
// clear the aggregator // clear the aggregator
ad_clear_agg(aggregator); ad_clear_agg(aggregator);
if (select_new_active_agg) { if (select_new_active_agg) {
printk(KERN_INFO "Removing an active aggregator\n"); printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
slave->dev->master->name);
// select new active aggregator // select new active aggregator
ad_agg_selection_logic(__get_first_agg(port)); ad_agg_selection_logic(__get_first_agg(port));
} }
@ -2085,7 +2094,8 @@ void bond_3ad_unbind_slave(struct slave *slave)
// clear the aggregator // clear the aggregator
ad_clear_agg(temp_aggregator); ad_clear_agg(temp_aggregator);
if (select_new_active_agg) { if (select_new_active_agg) {
printk(KERN_INFO "Removing an active aggregator\n"); printk(KERN_INFO DRV_NAME ": %s: Removing an active aggregator\n",
slave->dev->master->name);
// select new active aggregator // select new active aggregator
ad_agg_selection_logic(__get_first_agg(port)); ad_agg_selection_logic(__get_first_agg(port));
} }
@ -2131,7 +2141,8 @@ void bond_3ad_state_machine_handler(struct bonding *bond)
// select the active aggregator for the bond // select the active aggregator for the bond
if ((port = __get_first_port(bond))) { if ((port = __get_first_port(bond))) {
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Warning: bond's first port is uninitialized\n"); printk(KERN_WARNING DRV_NAME ": %s: Warning: bond's first port is "
"uninitialized\n", bond->dev->name);
goto re_arm; goto re_arm;
} }
@ -2143,7 +2154,8 @@ void bond_3ad_state_machine_handler(struct bonding *bond)
// for each port run the state machines // for each port run the state machines
for (port = __get_first_port(bond); port; port = __get_next_port(port)) { for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Warning: Found an uninitialized port\n"); printk(KERN_WARNING DRV_NAME ": %s: Warning: Found an uninitialized "
"port\n", bond->dev->name);
goto re_arm; goto re_arm;
} }
@ -2184,7 +2196,8 @@ static void bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, u
port = &(SLAVE_AD_INFO(slave).port); port = &(SLAVE_AD_INFO(slave).port);
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Warning: port of slave %s is uninitialized\n", slave->dev->name); printk(KERN_WARNING DRV_NAME ": %s: Warning: port of slave %s is "
"uninitialized\n", slave->dev->name, slave->dev->master->name);
return; return;
} }
@ -2230,8 +2243,9 @@ void bond_3ad_adapter_speed_changed(struct slave *slave)
// if slave is null, the whole port is not initialized // if slave is null, the whole port is not initialized
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Warning: speed changed for uninitialized port on %s\n", printk(KERN_WARNING DRV_NAME ": Warning: %s: speed "
slave->dev->name); "changed for uninitialized port on %s\n",
slave->dev->master->name, slave->dev->name);
return; return;
} }
@ -2257,8 +2271,9 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave)
// if slave is null, the whole port is not initialized // if slave is null, the whole port is not initialized
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Warning: duplex changed for uninitialized port on %s\n", printk(KERN_WARNING DRV_NAME ": %s: Warning: duplex changed "
slave->dev->name); "for uninitialized port on %s\n",
slave->dev->master->name, slave->dev->name);
return; return;
} }
@ -2285,8 +2300,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)
// if slave is null, the whole port is not initialized // if slave is null, the whole port is not initialized
if (!port->slave) { if (!port->slave) {
printk(KERN_WARNING DRV_NAME ": Warning: link status changed for uninitialized port on %s\n", printk(KERN_WARNING DRV_NAME ": Warning: %s: link status changed for "
slave->dev->name); "uninitialized port on %s\n",
slave->dev->master->name, slave->dev->name);
return; return;
} }
@ -2363,7 +2379,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
} }
if (bond_3ad_get_active_agg_info(bond, &ad_info)) { if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
printk(KERN_DEBUG "ERROR: bond_3ad_get_active_agg_info failed\n"); printk(KERN_DEBUG DRV_NAME ": %s: Error: "
"bond_3ad_get_active_agg_info failed\n", dev->name);
goto out; goto out;
} }
@ -2372,7 +2389,9 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
if (slaves_in_agg == 0) { if (slaves_in_agg == 0) {
/*the aggregator is empty*/ /*the aggregator is empty*/
printk(KERN_DEBUG "ERROR: active aggregator is empty\n"); printk(KERN_DEBUG DRV_NAME ": %s: Error: active "
"aggregator is empty\n",
dev->name);
goto out; goto out;
} }
@ -2390,7 +2409,8 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
} }
if (slave_agg_no >= 0) { if (slave_agg_no >= 0) {
printk(KERN_ERR DRV_NAME ": Error: Couldn't find a slave to tx on for aggregator ID %d\n", agg_id); printk(KERN_ERR DRV_NAME ": %s: Error: Couldn't find a slave to tx on "
"for aggregator ID %d\n", dev->name, agg_id);
goto out; goto out;
} }

56
drivers/net/bonding/bond_alb.c
View File

@ -198,20 +198,21 @@ static int tlb_initialize(struct bonding *bond)
{ {
struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
int size = TLB_HASH_TABLE_SIZE * sizeof(struct tlb_client_info); int size = TLB_HASH_TABLE_SIZE * sizeof(struct tlb_client_info);
struct tlb_client_info *new_hashtbl;
int i; int i;
spin_lock_init(&(bond_info->tx_hashtbl_lock)); spin_lock_init(&(bond_info->tx_hashtbl_lock));
_lock_tx_hashtbl(bond); new_hashtbl = kmalloc(size, GFP_KERNEL);
if (!new_hashtbl) {
bond_info->tx_hashtbl = kmalloc(size, GFP_KERNEL);
if (!bond_info->tx_hashtbl) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: %s: Failed to allocate TLB hash table\n", ": %s: Error: Failed to allocate TLB hash table\n",
bond->dev->name); bond->dev->name);
_unlock_tx_hashtbl(bond);
return -1; return -1;
} }
_lock_tx_hashtbl(bond);
bond_info->tx_hashtbl = new_hashtbl;
memset(bond_info->tx_hashtbl, 0, size); memset(bond_info->tx_hashtbl, 0, size);
@ -513,7 +514,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
client_info->mac_dst); client_info->mac_dst);
if (!skb) { if (!skb) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: failed to create an ARP packet\n"); ": %s: Error: failed to create an ARP packet\n",
client_info->slave->dev->master->name);
continue; continue;
} }
@ -523,7 +525,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
skb = vlan_put_tag(skb, client_info->vlan_id); skb = vlan_put_tag(skb, client_info->vlan_id);
if (!skb) { if (!skb) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: failed to insert VLAN tag\n"); ": %s: Error: failed to insert VLAN tag\n",
client_info->slave->dev->master->name);
continue; continue;
} }
} }
@ -606,8 +609,9 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, u32 src_ip)
if (!client_info->slave) { if (!client_info->slave) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: found a client with no channel in " ": %s: Error: found a client with no channel in "
"the client's hash table\n"); "the client's hash table\n",
bond->dev->name);
continue; continue;
} }
/*update all clients using this src_ip, that are not assigned /*update all clients using this src_ip, that are not assigned
@ -797,21 +801,22 @@ static int rlb_initialize(struct bonding *bond)
{ {
struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond)); struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
struct packet_type *pk_type = &(BOND_ALB_INFO(bond).rlb_pkt_type); struct packet_type *pk_type = &(BOND_ALB_INFO(bond).rlb_pkt_type);
struct rlb_client_info *new_hashtbl;
int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info); int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info);
int i; int i;
spin_lock_init(&(bond_info->rx_hashtbl_lock)); spin_lock_init(&(bond_info->rx_hashtbl_lock));
_lock_rx_hashtbl(bond); new_hashtbl = kmalloc(size, GFP_KERNEL);
if (!new_hashtbl) {
bond_info->rx_hashtbl = kmalloc(size, GFP_KERNEL);
if (!bond_info->rx_hashtbl) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: %s: Failed to allocate RLB hash table\n", ": %s: Error: Failed to allocate RLB hash table\n",
bond->dev->name); bond->dev->name);
_unlock_rx_hashtbl(bond);
return -1; return -1;
} }
_lock_rx_hashtbl(bond);
bond_info->rx_hashtbl = new_hashtbl;
bond_info->rx_hashtbl_head = RLB_NULL_INDEX; bond_info->rx_hashtbl_head = RLB_NULL_INDEX;
@ -927,7 +932,8 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
skb = vlan_put_tag(skb, vlan->vlan_id); skb = vlan_put_tag(skb, vlan->vlan_id);
if (!skb) { if (!skb) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: failed to insert VLAN tag\n"); ": %s: Error: failed to insert VLAN tag\n",
bond->dev->name);
continue; continue;
} }
} }
@ -956,11 +962,11 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
s_addr.sa_family = dev->type; s_addr.sa_family = dev->type;
if (dev_set_mac_address(dev, &s_addr)) { if (dev_set_mac_address(dev, &s_addr)) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: dev_set_mac_address of dev %s failed! ALB " ": %s: Error: dev_set_mac_address of dev %s failed! ALB "
"mode requires that the base driver support setting " "mode requires that the base driver support setting "
"the hw address also when the network device's " "the hw address also when the network device's "
"interface is open\n", "interface is open\n",
dev->name); dev->master->name, dev->name);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
return 0; return 0;
@ -1153,16 +1159,16 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
bond->alb_info.rlb_enabled); bond->alb_info.rlb_enabled);
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: the hw address of slave %s is in use by " ": %s: Warning: the hw address of slave %s is in use by "
"the bond; giving it the hw address of %s\n", "the bond; giving it the hw address of %s\n",
slave->dev->name, free_mac_slave->dev->name); bond->dev->name, slave->dev->name, free_mac_slave->dev->name);
} else if (has_bond_addr) { } else if (has_bond_addr) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: the hw address of slave %s is in use by the " ": %s: Error: the hw address of slave %s is in use by the "
"bond; couldn't find a slave with a free hw address to " "bond; couldn't find a slave with a free hw address to "
"give it (this should not have happened)\n", "give it (this should not have happened)\n",
slave->dev->name); bond->dev->name, slave->dev->name);
return -EFAULT; return -EFAULT;
} }
@ -1250,6 +1256,8 @@ int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
tlb_deinitialize(bond); tlb_deinitialize(bond);
return res; return res;
} }
} else {
bond->alb_info.rlb_enabled = 0;
} }
return 0; return 0;
@ -1409,7 +1417,7 @@ void bond_alb_monitor(struct bonding *bond)
read_lock(&bond->curr_slave_lock); read_lock(&bond->curr_slave_lock);
bond_for_each_slave(bond, slave, i) { bond_for_each_slave(bond, slave, i) {
alb_send_learning_packets(slave,slave->dev->dev_addr); alb_send_learning_packets(slave, slave->dev->dev_addr);
} }
read_unlock(&bond->curr_slave_lock); read_unlock(&bond->curr_slave_lock);

343
drivers/net/bonding/bond_main.c
View File

@ -489,6 +489,28 @@
* Set version to 2.6.3. * Set version to 2.6.3.
* 2005/09/26 - Jay Vosburgh <fubar@us.ibm.com> * 2005/09/26 - Jay Vosburgh <fubar@us.ibm.com>
* - Removed backwards compatibility for old ifenslaves. Version 2.6.4. * - Removed backwards compatibility for old ifenslaves. Version 2.6.4.
* 2005/09/27 - Mitch Williams <mitch.a.williams at intel dot com>
* - Radheka Godse <radheka.godse at intel dot com>
* - Split out bond creation code to allow for sysfs interface.
* - Removed static declaration on some functions and data items.
* - Added sysfs support, including capability to add/remove/change
* any bond at runtime.
*
* - Miscellaneous:
* - Added bonding: <bondname>: prefix to sysfs log messages
* - Added arp_ip_targets to /proc entry
* - Allow ARP target table to have empty entries
* - trivial fix: added missing modes description to modinfo
* - Corrected bug in ALB init where kmalloc is called inside
* a held lock
* - Corrected behavior to maintain bond link when changing
* from arp monitor to miimon and vice versa
* - Added missing bonding: <bondname>: prefix to alb, ad log messages
* - Fixed stack dump warnings seen if changing between miimon
* and arp monitoring when the bond interface is down.
* - Fixed stack dump warnings seen when enslaving an e100
* driver
* - Set version to 3.0.0
*/ */
//#define BONDING_DEBUG 1 //#define BONDING_DEBUG 1
@ -557,6 +579,7 @@ static char *lacp_rate = NULL;
static char *xmit_hash_policy = NULL; static char *xmit_hash_policy = NULL;
static int arp_interval = BOND_LINK_ARP_INTERV; static int arp_interval = BOND_LINK_ARP_INTERV;
static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, }; static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, };
struct bond_params bonding_defaults;
module_param(max_bonds, int, 0); module_param(max_bonds, int, 0);
MODULE_PARM_DESC(max_bonds, "Max number of bonded devices"); MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
@ -565,17 +588,24 @@ MODULE_PARM_DESC(miimon, "Link check interval in milliseconds");
module_param(updelay, int, 0); module_param(updelay, int, 0);
MODULE_PARM_DESC(updelay, "Delay before considering link up, in milliseconds"); MODULE_PARM_DESC(updelay, "Delay before considering link up, in milliseconds");
module_param(downdelay, int, 0); module_param(downdelay, int, 0);
MODULE_PARM_DESC(downdelay, "Delay before considering link down, in milliseconds"); MODULE_PARM_DESC(downdelay, "Delay before considering link down, "
"in milliseconds");
module_param(use_carrier, int, 0); module_param(use_carrier, int, 0);
MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; 0 for off, 1 for on (default)"); MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; "
"0 for off, 1 for on (default)");
module_param(mode, charp, 0); module_param(mode, charp, 0);
MODULE_PARM_DESC(mode, "Mode of operation : 0 for round robin, 1 for active-backup, 2 for xor"); MODULE_PARM_DESC(mode, "Mode of operation : 0 for balance-rr, "
"1 for active-backup, 2 for balance-xor, "
"3 for broadcast, 4 for 802.3ad, 5 for balance-tlb, "
"6 for balance-alb");
module_param(primary, charp, 0); module_param(primary, charp, 0);
MODULE_PARM_DESC(primary, "Primary network device to use"); MODULE_PARM_DESC(primary, "Primary network device to use");
module_param(lacp_rate, charp, 0); module_param(lacp_rate, charp, 0);
MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner (slow/fast)"); MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner "
"(slow/fast)");
module_param(xmit_hash_policy, charp, 0); module_param(xmit_hash_policy, charp, 0);
MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method : 0 for layer 2 (default), 1 for layer 3+4"); MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method: 0 for layer 2 (default)"
", 1 for layer 3+4");
module_param(arp_interval, int, 0); module_param(arp_interval, int, 0);
MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds"); MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
module_param_array(arp_ip_target, charp, NULL, 0); module_param_array(arp_ip_target, charp, NULL, 0);
@ -586,30 +616,27 @@ MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");
static const char *version = static const char *version =
DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"; DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
static LIST_HEAD(bond_dev_list); LIST_HEAD(bond_dev_list);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
static struct proc_dir_entry *bond_proc_dir = NULL; static struct proc_dir_entry *bond_proc_dir = NULL;
#endif #endif
extern struct rw_semaphore bonding_rwsem;
static u32 arp_target[BOND_MAX_ARP_TARGETS] = { 0, } ; static u32 arp_target[BOND_MAX_ARP_TARGETS] = { 0, } ;
static int arp_ip_count = 0; static int arp_ip_count = 0;
static int bond_mode = BOND_MODE_ROUNDROBIN; static int bond_mode = BOND_MODE_ROUNDROBIN;
static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2; static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2;
static int lacp_fast = 0; static int lacp_fast = 0;
struct bond_parm_tbl {
char *modename;
int mode;
};
static struct bond_parm_tbl bond_lacp_tbl[] = { struct bond_parm_tbl bond_lacp_tbl[] = {
{ "slow", AD_LACP_SLOW}, { "slow", AD_LACP_SLOW},
{ "fast", AD_LACP_FAST}, { "fast", AD_LACP_FAST},
{ NULL, -1}, { NULL, -1},
}; };
static struct bond_parm_tbl bond_mode_tbl[] = { struct bond_parm_tbl bond_mode_tbl[] = {
{ "balance-rr", BOND_MODE_ROUNDROBIN}, { "balance-rr", BOND_MODE_ROUNDROBIN},
{ "active-backup", BOND_MODE_ACTIVEBACKUP}, { "active-backup", BOND_MODE_ACTIVEBACKUP},
{ "balance-xor", BOND_MODE_XOR}, { "balance-xor", BOND_MODE_XOR},
@ -620,7 +647,7 @@ static struct bond_parm_tbl bond_mode_tbl[] = {
{ NULL, -1}, { NULL, -1},
}; };
static struct bond_parm_tbl xmit_hashtype_tbl[] = { struct bond_parm_tbl xmit_hashtype_tbl[] = {
{ "layer2", BOND_XMIT_POLICY_LAYER2}, { "layer2", BOND_XMIT_POLICY_LAYER2},
{ "layer3+4", BOND_XMIT_POLICY_LAYER34}, { "layer3+4", BOND_XMIT_POLICY_LAYER34},
{ NULL, -1}, { NULL, -1},
@ -628,12 +655,11 @@ static struct bond_parm_tbl xmit_hashtype_tbl[] = {
/*-------------------------- Forward declarations ---------------------------*/ /*-------------------------- Forward declarations ---------------------------*/
static inline void bond_set_mode_ops(struct bonding *bond, int mode);
static void bond_send_gratuitous_arp(struct bonding *bond); static void bond_send_gratuitous_arp(struct bonding *bond);
/*---------------------------- General routines -----------------------------*/ /*---------------------------- General routines -----------------------------*/
static const char *bond_mode_name(int mode) const char *bond_mode_name(int mode)
{ {
switch (mode) { switch (mode) {
case BOND_MODE_ROUNDROBIN : case BOND_MODE_ROUNDROBIN :
@ -910,7 +936,7 @@ static void bond_vlan_rx_add_vid(struct net_device *bond_dev, uint16_t vid)
res = bond_add_vlan(bond, vid); res = bond_add_vlan(bond, vid);
if (res) { if (res) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": %s: Failed to add vlan id %d\n", ": %s: Error: Failed to add vlan id %d\n",
bond_dev->name, vid); bond_dev->name, vid);
} }
} }
@ -944,7 +970,7 @@ static void bond_vlan_rx_kill_vid(struct net_device *bond_dev, uint16_t vid)
res = bond_del_vlan(bond, vid); res = bond_del_vlan(bond, vid);
if (res) { if (res) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": %s: Failed to remove vlan id %d\n", ": %s: Error: Failed to remove vlan id %d\n",
bond_dev->name, vid); bond_dev->name, vid);
} }
} }
@ -1449,7 +1475,7 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
* *
* Warning: Caller must hold curr_slave_lock for writing. * Warning: Caller must hold curr_slave_lock for writing.
*/ */
static void bond_change_active_slave(struct bonding *bond, struct slave *new_active) void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
{ {
struct slave *old_active = bond->curr_active_slave; struct slave *old_active = bond->curr_active_slave;
@ -1523,7 +1549,7 @@ static void bond_change_active_slave(struct bonding *bond, struct slave *new_act
* *
* Warning: Caller must hold curr_slave_lock for writing. * Warning: Caller must hold curr_slave_lock for writing.
*/ */
static void bond_select_active_slave(struct bonding *bond) void bond_select_active_slave(struct bonding *bond)
{ {
struct slave *best_slave; struct slave *best_slave;
@ -1591,7 +1617,7 @@ static void bond_detach_slave(struct bonding *bond, struct slave *slave)
/*---------------------------------- IOCTL ----------------------------------*/ /*---------------------------------- IOCTL ----------------------------------*/
static int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev) int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
{ {
dprintk("bond_dev=%p\n", bond_dev); dprintk("bond_dev=%p\n", bond_dev);
dprintk("slave_dev=%p\n", slave_dev); dprintk("slave_dev=%p\n", slave_dev);
@ -1631,7 +1657,7 @@ static int bond_compute_features(struct bonding *bond)
} }
/* enslave device <slave> to bond device <master> */ /* enslave device <slave> to bond device <master> */
static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
struct slave *new_slave = NULL; struct slave *new_slave = NULL;
@ -1644,8 +1670,8 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL && if (!bond->params.use_carrier && slave_dev->ethtool_ops == NULL &&
slave_dev->do_ioctl == NULL) { slave_dev->do_ioctl == NULL) {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning : no link monitoring support for %s\n", ": %s: Warning: no link monitoring support for %s\n",
slave_dev->name); bond_dev->name, slave_dev->name);
} }
/* bond must be initialized by bond_open() before enslaving */ /* bond must be initialized by bond_open() before enslaving */
@ -1666,17 +1692,17 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
dprintk("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name); dprintk("%s: NETIF_F_VLAN_CHALLENGED\n", slave_dev->name);
if (!list_empty(&bond->vlan_list)) { if (!list_empty(&bond->vlan_list)) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: cannot enslave VLAN " ": %s: Error: cannot enslave VLAN "
"challenged slave %s on VLAN enabled " "challenged slave %s on VLAN enabled "
"bond %s\n", slave_dev->name, "bond %s\n", bond_dev->name, slave_dev->name,
bond_dev->name); bond_dev->name);
return -EPERM; return -EPERM;
} else { } else {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: enslaved VLAN challenged " ": %s: Warning: enslaved VLAN challenged "
"slave %s. Adding VLANs will be blocked as " "slave %s. Adding VLANs will be blocked as "
"long as %s is part of bond %s\n", "long as %s is part of bond %s\n",
slave_dev->name, slave_dev->name, bond_dev->name, slave_dev->name, slave_dev->name,
bond_dev->name); bond_dev->name);
bond_dev->features |= NETIF_F_VLAN_CHALLENGED; bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
} }
@ -1706,12 +1732,11 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
if (slave_dev->set_mac_address == NULL) { if (slave_dev->set_mac_address == NULL) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: The slave device you specified does " ": %s: Error: The slave device you specified does "
"not support setting the MAC address.\n"); "not support setting the MAC address. "
printk(KERN_ERR "Your kernel likely does not support slave "
"Your kernel likely does not support slave devices.\n"); "devices.\n", bond_dev->name);
res = -EOPNOTSUPP;
res = -EOPNOTSUPP;
goto err_undo_flags; goto err_undo_flags;
} }
@ -1827,21 +1852,21 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
* the messages for netif_carrier. * the messages for netif_carrier.
*/ */
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: MII and ETHTOOL support not " ": %s: Warning: MII and ETHTOOL support not "
"available for interface %s, and " "available for interface %s, and "
"arp_interval/arp_ip_target module parameters " "arp_interval/arp_ip_target module parameters "
"not specified, thus bonding will not detect " "not specified, thus bonding will not detect "
"link failures! see bonding.txt for details.\n", "link failures! see bonding.txt for details.\n",
slave_dev->name); bond_dev->name, slave_dev->name);
} else if (link_reporting == -1) { } else if (link_reporting == -1) {
/* unable get link status using mii/ethtool */ /* unable get link status using mii/ethtool */
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: can't get link status from " ": %s: Warning: can't get link status from "
"interface %s; the network driver associated " "interface %s; the network driver associated "
"with this interface does not support MII or " "with this interface does not support MII or "
"ETHTOOL link status reporting, thus miimon " "ETHTOOL link status reporting, thus miimon "
"has no effect on this interface.\n", "has no effect on this interface.\n",
slave_dev->name); bond_dev->name, slave_dev->name);
} }
} }
@ -1868,15 +1893,15 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
if (bond_update_speed_duplex(new_slave) && if (bond_update_speed_duplex(new_slave) &&
(new_slave->link != BOND_LINK_DOWN)) { (new_slave->link != BOND_LINK_DOWN)) {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: failed to get speed and duplex from %s, " ": %s: Warning: failed to get speed and duplex from %s, "
"assumed to be 100Mb/sec and Full.\n", "assumed to be 100Mb/sec and Full.\n",
new_slave->dev->name); bond_dev->name, new_slave->dev->name);
if (bond->params.mode == BOND_MODE_8023AD) { if (bond->params.mode == BOND_MODE_8023AD) {
printk(KERN_WARNING printk(KERN_WARNING DRV_NAME
"Operation of 802.3ad mode requires ETHTOOL " ": %s: Warning: Operation of 802.3ad mode requires ETHTOOL "
"support in base driver for proper aggregator " "support in base driver for proper aggregator "
"selection.\n"); "selection.\n", bond_dev->name);
} }
} }
@ -1958,6 +1983,10 @@ static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_de
write_unlock_bh(&bond->lock); write_unlock_bh(&bond->lock);
res = bond_create_slave_symlinks(bond_dev, slave_dev);
if (res)
goto err_unset_master;
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
": %s: enslaving %s as a%s interface with a%s link.\n", ": %s: enslaving %s as a%s interface with a%s link.\n",
bond_dev->name, slave_dev->name, bond_dev->name, slave_dev->name,
@ -1999,7 +2028,7 @@ err_undo_flags:
* for Bonded connections: * for Bonded connections:
* The first up interface should be left on and all others downed. * The first up interface should be left on and all others downed.
*/ */
static int bond_release(struct net_device *bond_dev, struct net_device *slave_dev) int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
struct slave *slave, *oldcurrent; struct slave *slave, *oldcurrent;
@ -2010,7 +2039,7 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
if (!(slave_dev->flags & IFF_SLAVE) || if (!(slave_dev->flags & IFF_SLAVE) ||
(slave_dev->master != bond_dev)) { (slave_dev->master != bond_dev)) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: %s: cannot release %s.\n", ": %s: Error: cannot release %s.\n",
bond_dev->name, slave_dev->name); bond_dev->name, slave_dev->name);
return -EINVAL; return -EINVAL;
} }
@ -2031,11 +2060,12 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
ETH_ALEN); ETH_ALEN);
if (!mac_addr_differ && (bond->slave_cnt > 1)) { if (!mac_addr_differ && (bond->slave_cnt > 1)) {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: the permanent HWaddr of %s " ": %s: Warning: the permanent HWaddr of %s "
"- %02X:%02X:%02X:%02X:%02X:%02X - is " "- %02X:%02X:%02X:%02X:%02X:%02X - is "
"still in use by %s. Set the HWaddr of " "still in use by %s. Set the HWaddr of "
"%s to a different address to avoid " "%s to a different address to avoid "
"conflicts.\n", "conflicts.\n",
bond_dev->name,
slave_dev->name, slave_dev->name,
slave->perm_hwaddr[0], slave->perm_hwaddr[0],
slave->perm_hwaddr[1], slave->perm_hwaddr[1],
@ -2111,24 +2141,28 @@ static int bond_release(struct net_device *bond_dev, struct net_device *slave_de
bond_dev->features |= NETIF_F_VLAN_CHALLENGED; bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
} else { } else {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: clearing HW address of %s while it " ": %s: Warning: clearing HW address of %s while it "
"still has VLANs.\n", "still has VLANs.\n",
bond_dev->name); bond_dev->name, bond_dev->name);
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": When re-adding slaves, make sure the bond's " ": %s: When re-adding slaves, make sure the bond's "
"HW address matches its VLANs'.\n"); "HW address matches its VLANs'.\n",
bond_dev->name);
} }
} else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) && } else if ((bond_dev->features & NETIF_F_VLAN_CHALLENGED) &&
!bond_has_challenged_slaves(bond)) { !bond_has_challenged_slaves(bond)) {
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
": last VLAN challenged slave %s " ": %s: last VLAN challenged slave %s "
"left bond %s. VLAN blocking is removed\n", "left bond %s. VLAN blocking is removed\n",
slave_dev->name, bond_dev->name); bond_dev->name, slave_dev->name, bond_dev->name);
bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED; bond_dev->features &= ~NETIF_F_VLAN_CHALLENGED;
} }
write_unlock_bh(&bond->lock); write_unlock_bh(&bond->lock);
/* must do this from outside any spinlocks */
bond_destroy_slave_symlinks(bond_dev, slave_dev);
bond_del_vlans_from_slave(bond, slave_dev); bond_del_vlans_from_slave(bond, slave_dev);
/* If the mode USES_PRIMARY, then we should only remove its /* If the mode USES_PRIMARY, then we should only remove its
@ -2220,6 +2254,7 @@ static int bond_release_all(struct net_device *bond_dev)
*/ */
write_unlock_bh(&bond->lock); write_unlock_bh(&bond->lock);
bond_destroy_slave_symlinks(bond_dev, slave_dev);
bond_del_vlans_from_slave(bond, slave_dev); bond_del_vlans_from_slave(bond, slave_dev);
/* If the mode USES_PRIMARY, then we should only remove its /* If the mode USES_PRIMARY, then we should only remove its
@ -2274,12 +2309,13 @@ static int bond_release_all(struct net_device *bond_dev)
bond_dev->features |= NETIF_F_VLAN_CHALLENGED; bond_dev->features |= NETIF_F_VLAN_CHALLENGED;
} else { } else {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: clearing HW address of %s while it " ": %s: Warning: clearing HW address of %s while it "
"still has VLANs.\n", "still has VLANs.\n",
bond_dev->name); bond_dev->name, bond_dev->name);
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": When re-adding slaves, make sure the bond's " ": %s: When re-adding slaves, make sure the bond's "
"HW address matches its VLANs'.\n"); "HW address matches its VLANs'.\n",
bond_dev->name);
} }
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
@ -2397,7 +2433,7 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in
/*-------------------------------- Monitoring -------------------------------*/ /*-------------------------------- Monitoring -------------------------------*/
/* this function is called regularly to monitor each slave's link. */ /* this function is called regularly to monitor each slave's link. */
static void bond_mii_monitor(struct net_device *bond_dev) void bond_mii_monitor(struct net_device *bond_dev)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
struct slave *slave, *oldcurrent; struct slave *slave, *oldcurrent;
@ -2596,8 +2632,11 @@ static void bond_mii_monitor(struct net_device *bond_dev)
break; break;
default: default:
/* Should not happen */ /* Should not happen */
printk(KERN_ERR "bonding: Error: %s Illegal value (link=%d)\n", printk(KERN_ERR DRV_NAME
slave->dev->name, slave->link); ": %s: Error: %s Illegal value (link=%d)\n",
bond_dev->name,
slave->dev->name,
slave->link);
goto out; goto out;
} /* end of switch (slave->link) */ } /* end of switch (slave->link) */
@ -2721,7 +2760,9 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
struct flowi fl; struct flowi fl;
struct rtable *rt; struct rtable *rt;
for (i = 0; (i < BOND_MAX_ARP_TARGETS) && targets[i]; i++) { for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
if (!targets[i])
continue;
dprintk("basa: target %x\n", targets[i]); dprintk("basa: target %x\n", targets[i]);
if (list_empty(&bond->vlan_list)) { if (list_empty(&bond->vlan_list)) {
dprintk("basa: empty vlan: arp_send\n"); dprintk("basa: empty vlan: arp_send\n");
@ -2825,7 +2866,7 @@ static void bond_send_gratuitous_arp(struct bonding *bond)
* arp is transmitted to generate traffic. see activebackup_arp_monitor for * arp is transmitted to generate traffic. see activebackup_arp_monitor for
* arp monitoring in active backup mode. * arp monitoring in active backup mode.
*/ */
static void bond_loadbalance_arp_mon(struct net_device *bond_dev) void bond_loadbalance_arp_mon(struct net_device *bond_dev)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
struct slave *slave, *oldcurrent; struct slave *slave, *oldcurrent;
@ -2963,7 +3004,7 @@ out:
* may have received. * may have received.
* see loadbalance_arp_monitor for arp monitoring in load balancing mode * see loadbalance_arp_monitor for arp monitoring in load balancing mode
*/ */
static void bond_activebackup_arp_mon(struct net_device *bond_dev) void bond_activebackup_arp_mon(struct net_device *bond_dev)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
struct slave *slave; struct slave *slave;
@ -3249,6 +3290,8 @@ static void bond_info_show_master(struct seq_file *seq)
{ {
struct bonding *bond = seq->private; struct bonding *bond = seq->private;
struct slave *curr; struct slave *curr;
int i;
u32 target;
read_lock(&bond->curr_slave_lock); read_lock(&bond->curr_slave_lock);
curr = bond->curr_active_slave; curr = bond->curr_active_slave;
@ -3257,10 +3300,17 @@ static void bond_info_show_master(struct seq_file *seq)
seq_printf(seq, "Bonding Mode: %s\n", seq_printf(seq, "Bonding Mode: %s\n",
bond_mode_name(bond->params.mode)); bond_mode_name(bond->params.mode));
if (bond->params.mode == BOND_MODE_XOR ||
bond->params.mode == BOND_MODE_8023AD) {
seq_printf(seq, "Transmit Hash Policy: %s (%d)\n",
xmit_hashtype_tbl[bond->params.xmit_policy].modename,
bond->params.xmit_policy);
}
if (USES_PRIMARY(bond->params.mode)) { if (USES_PRIMARY(bond->params.mode)) {
seq_printf(seq, "Primary Slave: %s\n", seq_printf(seq, "Primary Slave: %s\n",
(bond->params.primary[0]) ? (bond->primary_slave) ?
bond->params.primary : "None"); bond->primary_slave->dev->name : "None");
seq_printf(seq, "Currently Active Slave: %s\n", seq_printf(seq, "Currently Active Slave: %s\n",
(curr) ? curr->dev->name : "None"); (curr) ? curr->dev->name : "None");
@ -3273,6 +3323,27 @@ static void bond_info_show_master(struct seq_file *seq)
seq_printf(seq, "Down Delay (ms): %d\n", seq_printf(seq, "Down Delay (ms): %d\n",
bond->params.downdelay * bond->params.miimon); bond->params.downdelay * bond->params.miimon);
/* ARP information */
if(bond->params.arp_interval > 0) {
int printed=0;
seq_printf(seq, "ARP Polling Interval (ms): %d\n",
bond->params.arp_interval);
seq_printf(seq, "ARP IP target/s (n.n.n.n form):");
for(i = 0; (i < BOND_MAX_ARP_TARGETS) ;i++) {
if (!bond->params.arp_targets[i])
continue;
if (printed)
seq_printf(seq, ",");
target = ntohl(bond->params.arp_targets[i]);
seq_printf(seq, " %d.%d.%d.%d", HIPQUAD(target));
printed = 1;
}
seq_printf(seq, "\n");
}
if (bond->params.mode == BOND_MODE_8023AD) { if (bond->params.mode == BOND_MODE_8023AD) {
struct ad_info ad_info; struct ad_info ad_info;
@ -3478,7 +3549,10 @@ static int bond_event_changename(struct bonding *bond)
bond_remove_proc_entry(bond); bond_remove_proc_entry(bond);
bond_create_proc_entry(bond); bond_create_proc_entry(bond);
#endif #endif
down_write(&(bonding_rwsem));
bond_destroy_sysfs_entry(bond);
bond_create_sysfs_entry(bond);
up_write(&(bonding_rwsem));
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -3955,6 +4029,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
return -EPERM; return -EPERM;
} }
down_write(&(bonding_rwsem));
slave_dev = dev_get_by_name(ifr->ifr_slave); slave_dev = dev_get_by_name(ifr->ifr_slave);
dprintk("slave_dev=%p: \n", slave_dev); dprintk("slave_dev=%p: \n", slave_dev);
@ -3987,6 +4062,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
dev_put(slave_dev); dev_put(slave_dev);
} }
up_write(&(bonding_rwsem));
return res; return res;
} }
@ -4071,6 +4147,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
bond_for_each_slave(bond, slave, i) { bond_for_each_slave(bond, slave, i) {
dprintk("s %p s->p %p c_m %p\n", slave, dprintk("s %p s->p %p c_m %p\n", slave,
slave->prev, slave->dev->change_mtu); slave->prev, slave->dev->change_mtu);
res = dev_set_mtu(slave->dev, new_mtu); res = dev_set_mtu(slave->dev, new_mtu);
if (res) { if (res) {
@ -4397,8 +4474,9 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
if (!skb2) { if (!skb2) {
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: bond_xmit_broadcast(): " ": %s: Error: bond_xmit_broadcast(): "
"skb_clone() failed\n"); "skb_clone() failed\n",
bond_dev->name);
continue; continue;
} }
@ -4431,7 +4509,7 @@ out:
/* /*
* set bond mode specific net device operations * set bond mode specific net device operations
*/ */
static inline void bond_set_mode_ops(struct bonding *bond, int mode) void bond_set_mode_ops(struct bonding *bond, int mode)
{ {
struct net_device *bond_dev = bond->dev; struct net_device *bond_dev = bond->dev;
@ -4467,7 +4545,8 @@ static inline void bond_set_mode_ops(struct bonding *bond, int mode)
default: default:
/* Should never happen, mode already checked */ /* Should never happen, mode already checked */
printk(KERN_ERR DRV_NAME printk(KERN_ERR DRV_NAME
": Error: Unknown bonding mode %d\n", ": %s: Error: Unknown bonding mode %d\n",
bond_dev->name,
mode); mode);
break; break;
} }
@ -4491,7 +4570,7 @@ static struct ethtool_ops bond_ethtool_ops = {
* Does not allocate but creates a /proc entry. * Does not allocate but creates a /proc entry.
* Allowed to fail. * Allowed to fail.
*/ */
static int __init bond_init(struct net_device *bond_dev, struct bond_params *params) static int bond_init(struct net_device *bond_dev, struct bond_params *params)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
@ -4565,7 +4644,7 @@ static int __init bond_init(struct net_device *bond_dev, struct bond_params *par
/* De-initialize device specific data. /* De-initialize device specific data.
* Caller must hold rtnl_lock. * Caller must hold rtnl_lock.
*/ */
static inline void bond_deinit(struct net_device *bond_dev) void bond_deinit(struct net_device *bond_dev)
{ {
struct bonding *bond = bond_dev->priv; struct bonding *bond = bond_dev->priv;
@ -4601,7 +4680,7 @@ static void bond_free_all(void)
* Convert string input module parms. Accept either the * Convert string input module parms. Accept either the
* number of the mode or its string name. * number of the mode or its string name.
*/ */
static inline int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl) int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
{ {
int i; int i;
@ -4670,7 +4749,7 @@ static int bond_check_params(struct bond_params *params)
if (max_bonds < 1 || max_bonds > INT_MAX) { if (max_bonds < 1 || max_bonds > INT_MAX) {
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": Warning: max_bonds (%d) not in range %d-%d, so it " ": Warning: max_bonds (%d) not in range %d-%d, so it "
"was reset to BOND_DEFAULT_MAX_BONDS (%d)", "was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
max_bonds, 1, INT_MAX, BOND_DEFAULT_MAX_BONDS); max_bonds, 1, INT_MAX, BOND_DEFAULT_MAX_BONDS);
max_bonds = BOND_DEFAULT_MAX_BONDS; max_bonds = BOND_DEFAULT_MAX_BONDS;
} }
@ -4881,81 +4960,96 @@ static int bond_check_params(struct bond_params *params)
return 0; return 0;
} }
/* Create a new bond based on the specified name and bonding parameters.
* Caller must NOT hold rtnl_lock; we need to release it here before we
* set up our sysfs entries.
*/
int bond_create(char *name, struct bond_params *params, struct bonding **newbond)
{
struct net_device *bond_dev;
int res;
rtnl_lock();
bond_dev = alloc_netdev(sizeof(struct bonding), name, ether_setup);
if (!bond_dev) {
printk(KERN_ERR DRV_NAME
": %s: eek! can't alloc netdev!\n",
name);
res = -ENOMEM;
goto out_rtnl;
}
/* bond_init() must be called after dev_alloc_name() (for the
* /proc files), but before register_netdevice(), because we
* need to set function pointers.
*/
res = bond_init(bond_dev, params);
if (res < 0) {
goto out_netdev;
}
SET_MODULE_OWNER(bond_dev);
res = register_netdevice(bond_dev);
if (res < 0) {
goto out_bond;
}
if (newbond)
*newbond = bond_dev->priv;
rtnl_unlock(); /* allows sysfs registration of net device */
res = bond_create_sysfs_entry(bond_dev->priv);
goto done;
out_bond:
bond_deinit(bond_dev);
out_netdev:
free_netdev(bond_dev);
out_rtnl:
rtnl_unlock();
done:
return res;
}
static int __init bonding_init(void) static int __init bonding_init(void)
{ {
struct bond_params params;
int i; int i;
int res; int res;
char new_bond_name[8]; /* Enough room for 999 bonds at init. */
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
res = bond_check_params(&params); res = bond_check_params(&bonding_defaults);
if (res) { if (res) {
return res; goto out;
} }
rtnl_lock();
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
bond_create_proc_dir(); bond_create_proc_dir();
#endif #endif
for (i = 0; i < max_bonds; i++) { for (i = 0; i < max_bonds; i++) {
struct net_device *bond_dev; sprintf(new_bond_name, "bond%d",i);
res = bond_create(new_bond_name,&bonding_defaults, NULL);
bond_dev = alloc_netdev(sizeof(struct bonding), "", ether_setup); if (res)
if (!bond_dev) { goto err;
res = -ENOMEM;
goto out_err;
}
res = dev_alloc_name(bond_dev, "bond%d");
if (res < 0) {
free_netdev(bond_dev);
goto out_err;
}
/* bond_init() must be called after dev_alloc_name() (for the
* /proc files), but before register_netdevice(), because we
* need to set function pointers.
*/
res = bond_init(bond_dev, &params);
if (res < 0) {
free_netdev(bond_dev);
goto out_err;
}
SET_MODULE_OWNER(bond_dev);
res = register_netdevice(bond_dev);
if (res < 0) {
bond_deinit(bond_dev);
free_netdev(bond_dev);
goto out_err;
}
} }
rtnl_unlock(); res = bond_create_sysfs();
if (res)
goto err;
register_netdevice_notifier(&bond_netdev_notifier); register_netdevice_notifier(&bond_netdev_notifier);
register_inetaddr_notifier(&bond_inetaddr_notifier); register_inetaddr_notifier(&bond_inetaddr_notifier);
return 0; goto out;
err:
out_err:
/*
* rtnl_unlock() will run netdev_run_todo(), putting the
* thus-far-registered bonding devices into a state which
* unregigister_netdevice() will accept
*/
rtnl_unlock();
rtnl_lock(); rtnl_lock();
/* free and unregister all bonds that were successfully added */
bond_free_all(); bond_free_all();
bond_destroy_sysfs();
rtnl_unlock(); rtnl_unlock();
out:
return res; return res;
} }
static void __exit bonding_exit(void) static void __exit bonding_exit(void)
@ -4965,6 +5059,7 @@ static void __exit bonding_exit(void)
rtnl_lock(); rtnl_lock();
bond_free_all(); bond_free_all();
bond_destroy_sysfs();
rtnl_unlock(); rtnl_unlock();
} }

1399
drivers/net/bonding/bond_sysfs.c Normal file
View File

File diff suppressed because it is too large Load Diff

37
drivers/net/bonding/bonding.h
View File

@ -29,6 +29,10 @@
* 2005/05/05 - Jason Gabler <jygabler at lbl dot gov> * 2005/05/05 - Jason Gabler <jygabler at lbl dot gov>
* - added "xmit_policy" kernel parameter for alternate hashing policy * - added "xmit_policy" kernel parameter for alternate hashing policy
* support for mode 2 * support for mode 2
*
* 2005/09/27 - Mitch Williams <mitch.a.williams at intel dot com>
* Radheka Godse <radheka.godse at intel dot com>
* - Added bonding sysfs interface
*/ */
#ifndef _LINUX_BONDING_H #ifndef _LINUX_BONDING_H
@ -37,11 +41,12 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/if_bonding.h> #include <linux/if_bonding.h>
#include <linux/kobject.h>
#include "bond_3ad.h" #include "bond_3ad.h"
#include "bond_alb.h" #include "bond_alb.h"
#define DRV_VERSION "2.6.5" #define DRV_VERSION "3.0.0"
#define DRV_RELDATE "November 4, 2005" #define DRV_RELDATE "November 8, 2005"
#define DRV_NAME "bonding" #define DRV_NAME "bonding"
#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
@ -152,6 +157,11 @@ struct bond_params {
u32 arp_targets[BOND_MAX_ARP_TARGETS]; u32 arp_targets[BOND_MAX_ARP_TARGETS];
}; };
struct bond_parm_tbl {
char *modename;
int mode;
};
struct vlan_entry { struct vlan_entry {
struct list_head vlan_list; struct list_head vlan_list;
u32 vlan_ip; u32 vlan_ip;
@ -159,7 +169,7 @@ struct vlan_entry {
}; };
struct slave { struct slave {
struct net_device *dev; /* first - usefull for panic debug */ struct net_device *dev; /* first - useful for panic debug */
struct slave *next; struct slave *next;
struct slave *prev; struct slave *prev;
s16 delay; s16 delay;
@ -185,7 +195,7 @@ struct slave {
* beforehand. * beforehand.
*/ */
struct bonding { struct bonding {
struct net_device *dev; /* first - usefull for panic debug */ struct net_device *dev; /* first - useful for panic debug */
struct slave *first_slave; struct slave *first_slave;
struct slave *curr_active_slave; struct slave *curr_active_slave;
struct slave *current_arp_slave; struct slave *current_arp_slave;
@ -255,6 +265,25 @@ extern inline void bond_set_slave_active_flags(struct slave *slave)
struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr); struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);
int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);
int bond_create(char *name, struct bond_params *params, struct bonding **newbond);
void bond_deinit(struct net_device *bond_dev);
int bond_create_sysfs(void);
void bond_destroy_sysfs(void);
void bond_destroy_sysfs_entry(struct bonding *bond);
int bond_create_sysfs_entry(struct bonding *bond);
int bond_create_slave_symlinks(struct net_device *master, struct net_device *slave);
void bond_destroy_slave_symlinks(struct net_device *master, struct net_device *slave);
int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);
int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);
int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev);
void bond_mii_monitor(struct net_device *bond_dev);
void bond_loadbalance_arp_mon(struct net_device *bond_dev);
void bond_activebackup_arp_mon(struct net_device *bond_dev);
void bond_set_mode_ops(struct bonding *bond, int mode);
int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl);
const char *bond_mode_name(int mode);
void bond_select_active_slave(struct bonding *bond);
void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
#endif /* _LINUX_BONDING_H */ #endif /* _LINUX_BONDING_H */

1
include/linux/netdevice.h
View File

@ -684,6 +684,7 @@ extern int netif_rx(struct sk_buff *skb);
extern int netif_rx_ni(struct sk_buff *skb); extern int netif_rx_ni(struct sk_buff *skb);
#define HAVE_NETIF_RECEIVE_SKB 1 #define HAVE_NETIF_RECEIVE_SKB 1
extern int netif_receive_skb(struct sk_buff *skb); extern int netif_receive_skb(struct sk_buff *skb);
extern int dev_valid_name(const char *name);
extern int dev_ioctl(unsigned int cmd, void __user *); extern int dev_ioctl(unsigned int cmd, void __user *);
extern int dev_ethtool(struct ifreq *); extern int dev_ethtool(struct ifreq *);
extern unsigned dev_get_flags(const struct net_device *); extern unsigned dev_get_flags(const struct net_device *);

3
net/core/dev.c
View File

@ -626,7 +626,7 @@ struct net_device * dev_get_by_flags(unsigned short if_flags, unsigned short mas
* Network device names need to be valid file names to * Network device names need to be valid file names to
* to allow sysfs to work * to allow sysfs to work
*/ */
static int dev_valid_name(const char *name) int dev_valid_name(const char *name)
{ {
return !(*name == '\0' return !(*name == '\0'
|| !strcmp(name, ".") || !strcmp(name, ".")
@ -3269,6 +3269,7 @@ EXPORT_SYMBOL(__dev_get_by_index);
EXPORT_SYMBOL(__dev_get_by_name); EXPORT_SYMBOL(__dev_get_by_name);
EXPORT_SYMBOL(__dev_remove_pack); EXPORT_SYMBOL(__dev_remove_pack);
EXPORT_SYMBOL(__skb_linearize); EXPORT_SYMBOL(__skb_linearize);
EXPORT_SYMBOL(dev_valid_name);
EXPORT_SYMBOL(dev_add_pack); EXPORT_SYMBOL(dev_add_pack);
EXPORT_SYMBOL(dev_alloc_name); EXPORT_SYMBOL(dev_alloc_name);
EXPORT_SYMBOL(dev_close); EXPORT_SYMBOL(dev_close);

2
net/core/utils.c
View File

@ -175,7 +175,7 @@ __u32 in_aton(const char *str)
if (*str != '\0') if (*str != '\0')
{ {
val = 0; val = 0;
while (*str != '\0' && *str != '.') while (*str != '\0' && *str != '.' && *str != '\n')
{ {
val *= 10; val *= 10;
val += *str - '0'; val += *str - '0';