Commit 90b8b7e7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bonding-clean-up-and-standarize-logging-printks' 



Jarod Wilson says:

====================
bonding: clean up and standarize logging printks

This set improves a few somewhat terse bonding debug messages, fixes some
errors in others, and then standarizes the majority of them, using new
slave_* printk macros that wrap around netdev_* to ensure both master
and slave information is provided consistently, where relevant. This set
proves very useful in debugging issues on hosts with multiple bonds.

I've run an array of LNST tests over this set, creating and destroying
quite a few different bonds of the course of testing, fixed the little
gotchas here and there, and everything looks stable and reasonable to me,
but I can't guarantee I've tested every possible message and scenario to
catch every possible "slave could be NULL" case.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 517a772c f887e54c

drivers/net/bonding/bond_3ad.c

+116 −106
Original line number Diff line number Diff line
@@ -325,16 +325,16 @@ static u16 __get_link_speed(struct port *port) 
		default:

			/* unknown speed value from ethtool. shouldn't happen */

			if (slave->speed != SPEED_UNKNOWN)

				pr_warn_once("%s: unknown ethtool speed (%d) for port %d (set it to 0)\n",

				pr_warn_once("%s: (slave %s): unknown ethtool speed (%d) for port %d (set it to 0)\n",

					     slave->bond->dev->name,

					     slave->speed,

					     slave->dev->name, slave->speed,

					     port->actor_port_number);

			speed = 0;

			break;

		}

	}



	netdev_dbg(slave->bond->dev, "Port %d Received link speed %d update from adapter\n",

	slave_dbg(slave->bond->dev, slave->dev, "Port %d Received link speed %d update from adapter\n",

		  port->actor_port_number, speed);

	return speed;

}
@@ -359,13 +359,13 @@ static u8 __get_duplex(struct port *port) 
		switch (slave->duplex) {

		case DUPLEX_FULL:

			retval = 0x1;

			netdev_dbg(slave->bond->dev, "Port %d Received status full duplex update from adapter\n",

			slave_dbg(slave->bond->dev, slave->dev, "Port %d Received status full duplex update from adapter\n",

				  port->actor_port_number);

			break;

		case DUPLEX_HALF:

		default:

			retval = 0x0;

			netdev_dbg(slave->bond->dev, "Port %d Received status NOT full duplex update from adapter\n",

			slave_dbg(slave->bond->dev, slave->dev, "Port %d Received status NOT full duplex update from adapter\n",

				  port->actor_port_number);

			break;

		}
@@ -500,10 +500,12 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port) 
		if ((port->sm_vars & AD_PORT_MATCHED) &&

		    (lacpdu->actor_state & AD_STATE_SYNCHRONIZATION)) {

			partner->port_state |= AD_STATE_SYNCHRONIZATION;

			pr_debug("%s partner sync=1\n", port->slave->dev->name);

			slave_dbg(port->slave->bond->dev, port->slave->dev,

				  "partner sync=1\n");

		} else {

			partner->port_state &= ~AD_STATE_SYNCHRONIZATION;

			pr_debug("%s partner sync=0\n", port->slave->dev->name);

			slave_dbg(port->slave->bond->dev, port->slave->dev,

				  "partner sync=0\n");

		}

	}

}
@@ -789,8 +791,9 @@ static inline void __update_lacpdu_from_port(struct port *port) 
	lacpdu->actor_port_priority = htons(port->actor_port_priority);

	lacpdu->actor_port = htons(port->actor_port_number);

	lacpdu->actor_state = port->actor_oper_port_state;

	pr_debug("update lacpdu: %s, actor port state %x\n",

		 port->slave->dev->name, port->actor_oper_port_state);

	slave_dbg(port->slave->bond->dev, port->slave->dev,

		  "update lacpdu: actor port state %x\n",

		  port->actor_oper_port_state);



	/* lacpdu->reserved_3_1              initialized

	 * lacpdu->tlv_type_partner_info     initialized
@@ -1022,9 +1025,9 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr) 


	/* check if the state machine was changed */

	if (port->sm_mux_state != last_state) {

		pr_debug("Mux Machine: Port=%d (%s), Last State=%d, Curr State=%d\n",

		slave_dbg(port->slave->bond->dev, port->slave->dev,

			  "Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",

			  port->actor_port_number,

			 port->slave->dev->name,

			  last_state,

			  port->sm_mux_state);

		switch (port->sm_mux_state) {
@@ -1140,9 +1143,9 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 


	/* check if the State machine was changed or new lacpdu arrived */

	if ((port->sm_rx_state != last_state) || (lacpdu)) {

		pr_debug("Rx Machine: Port=%d (%s), Last State=%d, Curr State=%d\n",

		slave_dbg(port->slave->bond->dev, port->slave->dev,

			  "Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",

			  port->actor_port_number,

			 port->slave->dev->name,

			  last_state,

			  port->sm_rx_state);

		switch (port->sm_rx_state) {
@@ -1192,9 +1195,8 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port) 
			/* detect loopback situation */

			if (MAC_ADDRESS_EQUAL(&(lacpdu->actor_system),

					      &(port->actor_system))) {

				netdev_err(port->slave->bond->dev, "An illegal loopback occurred on adapter (%s)\n"

				       "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",

				       port->slave->dev->name);

				slave_err(port->slave->bond->dev, port->slave->dev, "An illegal loopback occurred on slave\n"

					  "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n");

				return;

			}

			__update_selected(lacpdu, port);
@@ -1263,7 +1265,9 @@ static void ad_tx_machine(struct port *port) 
			__update_lacpdu_from_port(port);



			if (ad_lacpdu_send(port) >= 0) {

				pr_debug("Sent LACPDU on port %d\n",

				slave_dbg(port->slave->bond->dev,

					  port->slave->dev,

					  "Sent LACPDU on port %d\n",

					  port->actor_port_number);



				/* mark ntt as false, so it will not be sent
@@ -1343,7 +1347,8 @@ static void ad_periodic_machine(struct port *port) 


	/* check if the state machine was changed */

	if (port->sm_periodic_state != last_state) {

		pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",

		slave_dbg(port->slave->bond->dev, port->slave->dev,

			  "Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",

			  port->actor_port_number, last_state,

			  port->sm_periodic_state);

		switch (port->sm_periodic_state) {
@@ -1421,7 +1426,7 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr) 
				port->next_port_in_aggregator = NULL;

				port->actor_port_aggregator_identifier = 0;



				netdev_dbg(bond->dev, "Port %d left LAG %d\n",

				slave_dbg(bond->dev, port->slave->dev, "Port %d left LAG %d\n",

					  port->actor_port_number,

					  temp_aggregator->aggregator_identifier);

				/* if the aggregator is empty, clear its
@@ -1436,10 +1441,10 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr) 
			/* meaning: the port was related to an aggregator

			 * but was not on the aggregator port list

			 */

			net_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",

			net_warn_ratelimited("%s: (slave %s): Warning: Port %d was related to aggregator %d but was not on its port list\n",

					     port->slave->bond->dev->name,

					     port->actor_port_number,

					     port->slave->dev->name,

					     port->actor_port_number,

					     port->aggregator->aggregator_identifier);

		}

	}
@@ -1470,7 +1475,7 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr) 
			port->next_port_in_aggregator = aggregator->lag_ports;

			port->aggregator->num_of_ports++;

			aggregator->lag_ports = port;

			netdev_dbg(bond->dev, "Port %d joined LAG %d(existing LAG)\n",

			slave_dbg(bond->dev, slave->dev, "Port %d joined LAG %d (existing LAG)\n",

				  port->actor_port_number,

				  port->aggregator->aggregator_identifier);
@@ -1517,12 +1522,13 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr) 
			/* mark this port as selected */

			port->sm_vars |= AD_PORT_SELECTED;



			netdev_dbg(bond->dev, "Port %d joined LAG %d(new LAG)\n",

			slave_dbg(bond->dev, port->slave->dev, "Port %d joined LAG %d (new LAG)\n",

				  port->actor_port_number,

				  port->aggregator->aggregator_identifier);

		} else {

			netdev_err(bond->dev, "Port %d (on %s) did not find a suitable aggregator\n",

			       port->actor_port_number, port->slave->dev->name);

			slave_err(bond->dev, port->slave->dev,

				  "Port %d did not find a suitable aggregator\n",

				  port->actor_port_number);

		}

	}

	/* if all aggregator's ports are READY_N == TRUE, set ready=TRUE
@@ -1601,8 +1607,9 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best, 
		break;



	default:

		net_warn_ratelimited("%s: Impossible agg select mode %d\n",

		net_warn_ratelimited("%s: (slave %s): Impossible agg select mode %d\n",

				     curr->slave->bond->dev->name,

				     curr->slave->dev->name,

				     __get_agg_selection_mode(curr->lag_ports));

		break;

	}
@@ -1703,36 +1710,37 @@ static void ad_agg_selection_logic(struct aggregator *agg, 


	/* if there is new best aggregator, activate it */

	if (best) {

		netdev_dbg(bond->dev, "best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",

		netdev_dbg(bond->dev, "(slave %s): best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",

			   best->slave ? best->slave->dev->name : "NULL",

			   best->aggregator_identifier, best->num_of_ports,

			   best->actor_oper_aggregator_key,

			   best->partner_oper_aggregator_key,

			   best->is_individual, best->is_active);

		netdev_dbg(bond->dev, "best ports %p slave %p %s\n",

			   best->lag_ports, best->slave,

			   best->slave ? best->slave->dev->name : "NULL");

		netdev_dbg(bond->dev, "(slave %s): best ports %p slave %p\n",

			   best->slave ? best->slave->dev->name : "NULL",

			   best->lag_ports, best->slave);



		bond_for_each_slave_rcu(bond, slave, iter) {

			agg = &(SLAVE_AD_INFO(slave)->aggregator);



			netdev_dbg(bond->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",

			slave_dbg(bond->dev, slave->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",

				  agg->aggregator_identifier, agg->num_of_ports,

				  agg->actor_oper_aggregator_key,

				  agg->partner_oper_aggregator_key,

				  agg->is_individual, agg->is_active);

		}



		/* check if any partner replys */

		if (best->is_individual) {

		/* check if any partner replies */

		if (best->is_individual)

			net_warn_ratelimited("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",

					     best->slave ?

					     best->slave->bond->dev->name : "NULL");

		}

					     bond->dev->name);



		best->is_active = 1;

		netdev_dbg(bond->dev, "LAG %d chosen as the active LAG\n",

		netdev_dbg(bond->dev, "(slave %s): LAG %d chosen as the active LAG\n",

			   best->slave ? best->slave->dev->name : "NULL",

			   best->aggregator_identifier);

		netdev_dbg(bond->dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",

		netdev_dbg(bond->dev, "(slave %s): Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",

			   best->slave ? best->slave->dev->name : "NULL",

			   best->aggregator_identifier, best->num_of_ports,

			   best->actor_oper_aggregator_key,

			   best->partner_oper_aggregator_key,
@@ -1788,7 +1796,9 @@ static void ad_clear_agg(struct aggregator *aggregator) 
		aggregator->lag_ports = NULL;

		aggregator->is_active = 0;

		aggregator->num_of_ports = 0;

		pr_debug("LAG %d was cleared\n",

		pr_debug("%s: LAG %d was cleared\n",

			 aggregator->slave ?

			 aggregator->slave->dev->name : "NULL",

			 aggregator->aggregator_identifier);

	}

}
@@ -1885,7 +1895,8 @@ static void ad_enable_collecting_distributing(struct port *port, 
					      bool *update_slave_arr)

{

	if (port->aggregator->is_active) {

		pr_debug("Enabling port %d(LAG %d)\n",

		slave_dbg(port->slave->bond->dev, port->slave->dev,

			  "Enabling port %d (LAG %d)\n",

			  port->actor_port_number,

			  port->aggregator->aggregator_identifier);

		__enable_port(port);
@@ -1905,7 +1916,8 @@ static void ad_disable_collecting_distributing(struct port *port, 
	if (port->aggregator &&

	    !MAC_ADDRESS_EQUAL(&(port->aggregator->partner_system),

			       &(null_mac_addr))) {

		pr_debug("Disabling port %d(LAG %d)\n",

		slave_dbg(port->slave->bond->dev, port->slave->dev,

			  "Disabling port %d (LAG %d)\n",

			  port->actor_port_number,

			  port->aggregator->aggregator_identifier);

		__disable_port(port);
@@ -1933,11 +1945,11 @@ static void ad_marker_info_received(struct bond_marker *marker_info, 
	marker.tlv_type = AD_MARKER_RESPONSE_SUBTYPE;



	/* send the marker response */

	if (ad_marker_send(port, &marker) >= 0) {

		pr_debug("Sent Marker Response on port %d\n",

	if (ad_marker_send(port, &marker) >= 0)

		slave_dbg(port->slave->bond->dev, port->slave->dev,

			  "Sent Marker Response on port %d\n",

			  port->actor_port_number);

}

}



/**

 * ad_marker_response_received - handle receive of a marker response frame
@@ -2085,12 +2097,11 @@ void bond_3ad_unbind_slave(struct slave *slave) 


	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		netdev_warn(bond->dev, "Trying to unbind an uninitialized port on %s\n",

			    slave->dev->name);

		slave_warn(bond->dev, slave->dev, "Trying to unbind an uninitialized port\n");

		goto out;

	}



	netdev_dbg(bond->dev, "Unbinding Link Aggregation Group %d\n",

	slave_dbg(bond->dev, slave->dev, "Unbinding Link Aggregation Group %d\n",

		  aggregator->aggregator_identifier);



	/* Tell the partner that this port is not suitable for aggregation */
@@ -2129,13 +2140,13 @@ void bond_3ad_unbind_slave(struct slave *slave) 
			 * new aggregator

			 */

			if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {

				netdev_dbg(bond->dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",

				slave_dbg(bond->dev, slave->dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",

					  aggregator->aggregator_identifier,

					  new_aggregator->aggregator_identifier);



				if ((new_aggregator->lag_ports == port) &&

				    new_aggregator->is_active) {

					netdev_info(bond->dev, "Removing an active aggregator\n");

					slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");

					select_new_active_agg = 1;

				}
@@ -2166,7 +2177,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
					ad_agg_selection_logic(__get_first_agg(port),

							       &dummy_slave_update);

			} else {

				netdev_warn(bond->dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");

				slave_warn(bond->dev, slave->dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");

			}

		} else {

			/* in case that the only port related to this
@@ -2175,7 +2186,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
			select_new_active_agg = aggregator->is_active;

			ad_clear_agg(aggregator);

			if (select_new_active_agg) {

				netdev_info(bond->dev, "Removing an active aggregator\n");

				slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");

				/* select new active aggregator */

				temp_aggregator = __get_first_agg(port);

				if (temp_aggregator)
@@ -2185,7 +2196,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
		}

	}



	netdev_dbg(bond->dev, "Unbinding port %d\n", port->actor_port_number);

	slave_dbg(bond->dev, slave->dev, "Unbinding port %d\n", port->actor_port_number);



	/* find the aggregator that this port is connected to */

	bond_for_each_slave(bond, slave_iter, iter) {
@@ -2208,7 +2219,7 @@ void bond_3ad_unbind_slave(struct slave *slave) 
					select_new_active_agg = temp_aggregator->is_active;

					ad_clear_agg(temp_aggregator);

					if (select_new_active_agg) {

						netdev_info(bond->dev, "Removing an active aggregator\n");

						slave_info(bond->dev, slave->dev, "Removing an active aggregator\n");

						/* select new active aggregator */

						ad_agg_selection_logic(__get_first_agg(port),

							               &dummy_slave_update);
@@ -2379,9 +2390,9 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave) 
	switch (lacpdu->subtype) {

	case AD_TYPE_LACPDU:

		ret = RX_HANDLER_CONSUMED;

		netdev_dbg(slave->bond->dev,

			   "Received LACPDU on port %d slave %s\n",

			   port->actor_port_number, slave->dev->name);

		slave_dbg(slave->bond->dev, slave->dev,

			  "Received LACPDU on port %d\n",

			  port->actor_port_number);

		/* Protect against concurrent state machines */

		spin_lock(&slave->bond->mode_lock);

		ad_rx_machine(lacpdu, port);
@@ -2395,17 +2406,17 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave) 
		marker = (struct bond_marker *)lacpdu;

		switch (marker->tlv_type) {

		case AD_MARKER_INFORMATION_SUBTYPE:

			netdev_dbg(slave->bond->dev, "Received Marker Information on port %d\n",

			slave_dbg(slave->bond->dev, slave->dev, "Received Marker Information on port %d\n",

				  port->actor_port_number);

			ad_marker_info_received(marker, port);

			break;

		case AD_MARKER_RESPONSE_SUBTYPE:

			netdev_dbg(slave->bond->dev, "Received Marker Response on port %d\n",

			slave_dbg(slave->bond->dev, slave->dev, "Received Marker Response on port %d\n",

				  port->actor_port_number);

			ad_marker_response_received(marker, port);

			break;

		default:

			netdev_dbg(slave->bond->dev, "Received an unknown Marker subtype on slot %d\n",

			slave_dbg(slave->bond->dev, slave->dev, "Received an unknown Marker subtype on port %d\n",

				  port->actor_port_number);

			stat = &SLAVE_AD_INFO(slave)->stats.marker_unknown_rx;

			atomic64_inc(stat);
@@ -2456,9 +2467,10 @@ static void ad_update_actor_keys(struct port *port, bool reset) 


		if (!reset) {

			if (!speed) {

				netdev_err(port->slave->dev,

					   "speed changed to 0 for port %s",

					   port->slave->dev->name);

				slave_err(port->slave->bond->dev,

					  port->slave->dev,

					  "speed changed to 0 on port %d\n",

					  port->actor_port_number);

			} else if (duplex && ospeed != speed) {

				/* Speed change restarts LACP state-machine */

				port->sm_vars |= AD_PORT_BEGIN;
@@ -2483,17 +2495,16 @@ void bond_3ad_adapter_speed_duplex_changed(struct slave *slave) 


	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		netdev_warn(slave->bond->dev,

			    "speed/duplex changed for uninitialized port %s\n",

			    slave->dev->name);

		slave_warn(slave->bond->dev, slave->dev,

			   "speed/duplex changed for uninitialized port\n");

		return;

	}



	spin_lock_bh(&slave->bond->mode_lock);

	ad_update_actor_keys(port, false);

	spin_unlock_bh(&slave->bond->mode_lock);

	netdev_dbg(slave->bond->dev, "Port %d slave %s changed speed/duplex\n",

		   port->actor_port_number, slave->dev->name);

	slave_dbg(slave->bond->dev, slave->dev, "Port %d changed speed/duplex\n",

		  port->actor_port_number);

}



/**
@@ -2513,8 +2524,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 


	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		netdev_warn(slave->bond->dev, "link status changed for uninitialized port on %s\n",

			    slave->dev->name);

		slave_warn(slave->bond->dev, slave->dev, "link status changed for uninitialized port\n");

		return;

	}
@@ -2539,7 +2549,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 


	spin_unlock_bh(&slave->bond->mode_lock);



	netdev_dbg(slave->bond->dev, "Port %d changed link status to %s\n",

	slave_dbg(slave->bond->dev, slave->dev, "Port %d changed link status to %s\n",

		  port->actor_port_number,

		  link == BOND_LINK_UP ? "UP" : "DOWN");

drivers/net/bonding/bond_alb.c

+15 −15
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int rlb_arp_recv(const struct sk_buff *skb, struct bonding *bond, 
	if (arp->op_code == htons(ARPOP_REPLY)) {

		/* update rx hash table for this ARP */

		rlb_update_entry_from_arp(bond, arp);

		netdev_dbg(bond->dev, "Server received an ARP Reply from client\n");

		slave_dbg(bond->dev, slave->dev, "Server received an ARP Reply from client\n");

	}

out:

	return RX_HANDLER_ANOTHER;
@@ -442,7 +442,8 @@ static void rlb_update_client(struct rlb_client_info *client_info) 
				 client_info->slave->dev->dev_addr,

				 client_info->mac_dst);

		if (!skb) {

			netdev_err(client_info->slave->bond->dev,

			slave_err(client_info->slave->bond->dev,

				  client_info->slave->dev,

				  "failed to create an ARP packet\n");

			continue;

		}
@@ -667,14 +668,15 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) 
		if (tx_slave)

			bond_hw_addr_copy(arp->mac_src, tx_slave->dev->dev_addr,

					  tx_slave->dev->addr_len);

		netdev_dbg(bond->dev, "Server sent ARP Reply packet\n");

		netdev_dbg(bond->dev, "(slave %s): Server sent ARP Reply packet\n",

			   tx_slave ? tx_slave->dev->name : "NULL");

	} else if (arp->op_code == htons(ARPOP_REQUEST)) {

		/* Create an entry in the rx_hashtbl for this client as a

		 * place holder.

		 * When the arp reply is received the entry will be updated

		 * with the correct unicast address of the client.

		 */

		rlb_choose_channel(skb, bond);

		tx_slave = rlb_choose_channel(skb, bond);



		/* The ARP reply packets must be delayed so that

		 * they can cancel out the influence of the ARP request.
@@ -687,7 +689,8 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) 
		 * updated with their assigned mac.

		 */

		rlb_req_update_subnet_clients(bond, arp->ip_src);

		netdev_dbg(bond->dev, "Server sent ARP Request packet\n");

		netdev_dbg(bond->dev, "(slave %s): Server sent ARP Request packet\n",

			   tx_slave ? tx_slave->dev->name : "NULL");

	}



	return tx_slave;
@@ -923,9 +926,8 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[], 
	skb->priority = TC_PRIO_CONTROL;

	skb->dev = slave->dev;



	netdev_dbg(slave->bond->dev,

		   "Send learning packet: dev %s mac %pM vlan %d\n",

		   slave->dev->name, mac_addr, vid);

	slave_dbg(slave->bond->dev, slave->dev,

		  "Send learning packet: mac %pM vlan %d\n", mac_addr, vid);



	if (vid)

		__vlan_hwaccel_put_tag(skb, vlan_proto, vid);
@@ -1016,8 +1018,7 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], 
	memcpy(ss.__data, addr, len);

	ss.ss_family = dev->type;

	if (dev_set_mac_address(dev, (struct sockaddr *)&ss, NULL)) {

		netdev_err(slave->bond->dev, "dev_set_mac_address of dev %s failed! ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",

			   dev->name);

		slave_err(slave->bond->dev, dev, "dev_set_mac_address on slave failed! ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n");

		return -EOPNOTSUPP;

	}

	return 0;
@@ -1192,12 +1193,11 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 
		alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,

				       free_mac_slave->dev->addr_len);



		netdev_warn(bond->dev, "the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",

			    slave->dev->name, free_mac_slave->dev->name);

		slave_warn(bond->dev, slave->dev, "the slave hw address is in use by the bond; giving it the hw address of %s\n",

			   free_mac_slave->dev->name);



	} else if (has_bond_addr) {

		netdev_err(bond->dev, "the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",

			   slave->dev->name);

		slave_err(bond->dev, slave->dev, "the slave hw address is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n");

		return -EFAULT;

	}

drivers/net/bonding/bond_main.c

+141 −168

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/bonding/bond_options.c

+12 −18
Original line number Diff line number Diff line
@@ -783,14 +783,12 @@ static int bond_option_active_slave_set(struct bonding *bond, 


	if (slave_dev) {

		if (!netif_is_bond_slave(slave_dev)) {

			netdev_err(bond->dev, "Device %s is not bonding slave\n",

				   slave_dev->name);

			slave_err(bond->dev, slave_dev, "Device is not bonding slave\n");

			return -EINVAL;

		}



		if (bond->dev != netdev_master_upper_dev_get(slave_dev)) {

			netdev_err(bond->dev, "Device %s is not our slave\n",

				   slave_dev->name);

			slave_err(bond->dev, slave_dev, "Device is not our slave\n");

			return -EINVAL;

		}

	}
@@ -809,17 +807,14 @@ static int bond_option_active_slave_set(struct bonding *bond, 


		if (new_active == old_active) {

			/* do nothing */

			netdev_dbg(bond->dev, "%s is already the current active slave\n",

				   new_active->dev->name);

			slave_dbg(bond->dev, new_active->dev, "is already the current active slave\n");

		} else {

			if (old_active && (new_active->link == BOND_LINK_UP) &&

			    bond_slave_is_up(new_active)) {

				netdev_dbg(bond->dev, "Setting %s as active slave\n",

					   new_active->dev->name);

				slave_dbg(bond->dev, new_active->dev, "Setting as active slave\n");

				bond_change_active_slave(bond, new_active);

			} else {

				netdev_err(bond->dev, "Could not set %s as active slave; either %s is down or the link is down\n",

					   new_active->dev->name,

				slave_err(bond->dev, new_active->dev, "Could not set as active slave; either %s is down or the link is down\n",

					  new_active->dev->name);

				ret = -EINVAL;

			}
@@ -1132,8 +1127,7 @@ static int bond_option_primary_set(struct bonding *bond, 


	bond_for_each_slave(bond, slave, iter) {

		if (strncmp(slave->dev->name, primary, IFNAMSIZ) == 0) {

			netdev_dbg(bond->dev, "Setting %s as primary slave\n",

				   slave->dev->name);

			slave_dbg(bond->dev, slave->dev, "Setting as primary slave\n");

			rcu_assign_pointer(bond->primary_slave, slave);

			strcpy(bond->params.primary, slave->dev->name);

			bond->force_primary = true;
@@ -1150,8 +1144,8 @@ static int bond_option_primary_set(struct bonding *bond, 
	strncpy(bond->params.primary, primary, IFNAMSIZ);

	bond->params.primary[IFNAMSIZ - 1] = 0;



	netdev_dbg(bond->dev, "Recording %s as primary, but it has not been enslaved to %s yet\n",

		   primary, bond->dev->name);

	netdev_dbg(bond->dev, "Recording %s as primary, but it has not been enslaved yet\n",

		   primary);



out:

	unblock_netpoll_tx();
@@ -1378,12 +1372,12 @@ static int bond_option_slaves_set(struct bonding *bond, 


	switch (command[0]) {

	case '+':

		netdev_dbg(bond->dev, "Adding slave %s\n", dev->name);

		slave_dbg(bond->dev, dev, "Enslaving interface\n");

		ret = bond_enslave(bond->dev, dev, NULL);

		break;



	case '-':

		netdev_dbg(bond->dev, "Removing slave %s\n", dev->name);

		slave_dbg(bond->dev, dev, "Releasing interface\n");

		ret = bond_release(bond->dev, dev);

		break;
@@ -1447,7 +1441,7 @@ static int bond_option_ad_actor_system_set(struct bonding *bond, 
	return 0;



err:

	netdev_err(bond->dev, "Invalid MAC address.\n");

	netdev_err(bond->dev, "Invalid ad_actor_system MAC address.\n");

	return -EINVAL;

}

include/net/bonding.h

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,15 @@ 
#define __long_aligned __attribute__((aligned((sizeof(long)))))

#endif



#define slave_info(bond_dev, slave_dev, fmt, ...) \

	netdev_info(bond_dev, "(slave %s): " fmt, (slave_dev)->name, ##__VA_ARGS__)

#define slave_warn(bond_dev, slave_dev, fmt, ...) \

	netdev_warn(bond_dev, "(slave %s): " fmt, (slave_dev)->name, ##__VA_ARGS__)

#define slave_dbg(bond_dev, slave_dev, fmt, ...) \

	netdev_dbg(bond_dev, "(slave %s): " fmt, (slave_dev)->name, ##__VA_ARGS__)

#define slave_err(bond_dev, slave_dev, fmt, ...) \

	netdev_err(bond_dev, "(slave %s): " fmt, (slave_dev)->name, ##__VA_ARGS__)



#define BOND_MODE(bond) ((bond)->params.mode)



/* slave list primitives */

CRA Git | Maintained and supported by SUSTech CRA and CCSE