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

Merge branch 'mlx4-next' 



Or Gerlitz says:

====================
Add HA and LAG support to mlx4 RoCE and SRIOV services

This series takes advanges of bonding mlx4 Ethernet devices to support
a model of High-Availability and Link Aggregation for more environments.

The mlx4 driver reacts on netdev events generated by bonding when
slave state changes happen by programming a HW V2P (Virt-to-Phys)
port table. Bonding was extended to expose these state changes
through netdev events.

When an mlx4 interface such as the mlx4 IB/RoCE driver is subject to
this policy, QPs are created over virtual ports which are mapped
to one of the two physical ports. When a failure happens, the
re-programming of the V2P table allows traffic to keep flowing.

The mlx4 Ethernet driver interfaces are not subject to this
policy and act as usual.

A 2nd use-case for this model would be to add HA and Link Aggregation
support to single ported mlx4 Ethernet VFs. In this case, the PF Ethernet
intrfaces are bonded, all the VFs see single port devices (which is
supported already today), and VF QPs are subject to V2P.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 251c005a c6215745

drivers/infiniband/hw/mlx4/ah.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/slab.h>

#include <linux/inet.h>

#include <linux/string.h>

#include <linux/mlx4/driver.h>



#include "mlx4_ib.h"

drivers/infiniband/hw/mlx4/main.c

+143 −18
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, 
	enum ib_mtu tmp;

	struct mlx4_cmd_mailbox *mailbox;

	int err = 0;

	int is_bonded = mlx4_is_bonded(mdev->dev);



	mailbox = mlx4_alloc_cmd_mailbox(mdev->dev);

	if (IS_ERR(mailbox))
@@ -374,8 +375,12 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, 
	props->state		= IB_PORT_DOWN;

	props->phys_state	= state_to_phys_state(props->state);

	props->active_mtu	= IB_MTU_256;

	if (is_bonded)

		rtnl_lock(); /* required to get upper dev */

	spin_lock_bh(&iboe->lock);

	ndev = iboe->netdevs[port - 1];

	if (ndev && is_bonded)

		ndev = netdev_master_upper_dev_get(ndev);

	if (!ndev)

		goto out_unlock;
@@ -387,6 +392,8 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, 
	props->phys_state	= state_to_phys_state(props->state);

out_unlock:

	spin_unlock_bh(&iboe->lock);

	if (is_bonded)

		rtnl_unlock();

out:

	mlx4_free_cmd_mailbox(mdev->dev, mailbox);

	return err;
@@ -844,7 +851,7 @@ int mlx4_ib_add_mc(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp, 


struct mlx4_ib_steering {

	struct list_head list;

	u64 reg_id;

	struct mlx4_flow_reg_id reg_id;

	union ib_gid gid;

};
@@ -1135,9 +1142,11 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 
				    struct ib_flow_attr *flow_attr,

				    int domain)

{

	int err = 0, i = 0;

	int err = 0, i = 0, j = 0;

	struct mlx4_ib_flow *mflow;

	enum mlx4_net_trans_promisc_mode type[2];

	struct mlx4_dev *dev = (to_mdev(qp->device))->dev;

	int is_bonded = mlx4_is_bonded(dev);



	memset(type, 0, sizeof(type));
@@ -1172,26 +1181,55 @@ static struct ib_flow *mlx4_ib_create_flow(struct ib_qp *qp, 


	while (i < ARRAY_SIZE(type) && type[i]) {

		err = __mlx4_ib_create_flow(qp, flow_attr, domain, type[i],

					    &mflow->reg_id[i]);

					    &mflow->reg_id[i].id);

		if (err)

			goto err_create_flow;

		i++;

		if (is_bonded) {

			flow_attr->port = 2;

			err = __mlx4_ib_create_flow(qp, flow_attr,

						    domain, type[j],

						    &mflow->reg_id[j].mirror);

			flow_attr->port = 1;

			if (err)

				goto err_create_flow;

			j++;

		}



	}



	if (i < ARRAY_SIZE(type) && flow_attr->type == IB_FLOW_ATTR_NORMAL) {

		err = mlx4_ib_tunnel_steer_add(qp, flow_attr, &mflow->reg_id[i]);

		err = mlx4_ib_tunnel_steer_add(qp, flow_attr,

					       &mflow->reg_id[i].id);

		if (err)

			goto err_create_flow;

		i++;

		if (is_bonded) {

			flow_attr->port = 2;

			err = mlx4_ib_tunnel_steer_add(qp, flow_attr,

						       &mflow->reg_id[j].mirror);

			flow_attr->port = 1;

			if (err)

				goto err_create_flow;

			j++;

		}

		/* function to create mirror rule */

	}



	return &mflow->ibflow;



err_create_flow:

	while (i) {

		(void)__mlx4_ib_destroy_flow(to_mdev(qp->device)->dev, mflow->reg_id[i]);

		(void)__mlx4_ib_destroy_flow(to_mdev(qp->device)->dev,

					     mflow->reg_id[i].id);

		i--;

	}



	while (j) {

		(void)__mlx4_ib_destroy_flow(to_mdev(qp->device)->dev,

					     mflow->reg_id[j].mirror);

		j--;

	}

err_free:

	kfree(mflow);

	return ERR_PTR(err);
@@ -1204,10 +1242,16 @@ static int mlx4_ib_destroy_flow(struct ib_flow *flow_id) 
	struct mlx4_ib_dev *mdev = to_mdev(flow_id->qp->device);

	struct mlx4_ib_flow *mflow = to_mflow(flow_id);



	while (i < ARRAY_SIZE(mflow->reg_id) && mflow->reg_id[i]) {

		err = __mlx4_ib_destroy_flow(mdev->dev, mflow->reg_id[i]);

	while (i < ARRAY_SIZE(mflow->reg_id) && mflow->reg_id[i].id) {

		err = __mlx4_ib_destroy_flow(mdev->dev, mflow->reg_id[i].id);

		if (err)

			ret = err;

		if (mflow->reg_id[i].mirror) {

			err = __mlx4_ib_destroy_flow(mdev->dev,

						     mflow->reg_id[i].mirror);

			if (err)

				ret = err;

		}

		i++;

	}
@@ -1219,11 +1263,12 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
{

	int err;

	struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);

	struct mlx4_dev	*dev = mdev->dev;

	struct mlx4_ib_qp *mqp = to_mqp(ibqp);

	u64 reg_id;

	struct mlx4_ib_steering *ib_steering = NULL;

	enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?

		MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;

	struct mlx4_flow_reg_id	reg_id;



	if (mdev->dev->caps.steering_mode ==

	    MLX4_STEERING_MODE_DEVICE_MANAGED) {
@@ -1235,10 +1280,20 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, mqp->port,

				    !!(mqp->flags &

				       MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),

				    prot, &reg_id);

				    prot, &reg_id.id);

	if (err)

		goto err_malloc;



	reg_id.mirror = 0;

	if (mlx4_is_bonded(dev)) {

		err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, 2,

					    !!(mqp->flags &

					    MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),

					    prot, &reg_id.mirror);

		if (err)

			goto err_add;

	}



	err = add_gid_entry(ibqp, gid);

	if (err)

		goto err_add;
@@ -1254,7 +1309,10 @@ static int mlx4_ib_mcg_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 


err_add:

	mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,

			      prot, reg_id);

			      prot, reg_id.id);

	if (reg_id.mirror)

		mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,

				      prot, reg_id.mirror);

err_malloc:

	kfree(ib_steering);
@@ -1281,10 +1339,12 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
{

	int err;

	struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);

	struct mlx4_dev *dev = mdev->dev;

	struct mlx4_ib_qp *mqp = to_mqp(ibqp);

	struct net_device *ndev;

	struct mlx4_ib_gid_entry *ge;

	u64 reg_id = 0;

	struct mlx4_flow_reg_id reg_id = {0, 0};



	enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?

		MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
@@ -1309,10 +1369,17 @@ static int mlx4_ib_mcg_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
	}



	err = mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,

				    prot, reg_id);

				    prot, reg_id.id);

	if (err)

		return err;



	if (mlx4_is_bonded(dev)) {

		err = mlx4_multicast_detach(mdev->dev, &mqp->mqp, gid->raw,

					    prot, reg_id.mirror);

		if (err)

			return err;

	}



	mutex_lock(&mqp->mutex);

	ge = find_gid_entry(mqp, gid->raw);

	if (ge) {
@@ -1440,6 +1507,7 @@ static void update_gids_task(struct work_struct *work) 
	union ib_gid *gids;

	int err;

	struct mlx4_dev	*dev = gw->dev->dev;

	int is_bonded = mlx4_is_bonded(dev);



	if (!gw->dev->ib_active)

		return;
@@ -1459,7 +1527,10 @@ static void update_gids_task(struct work_struct *work) 
	if (err)

		pr_warn("set port command failed\n");

	else

		mlx4_ib_dispatch_event(gw->dev, gw->port, IB_EVENT_GID_CHANGE);

		if ((gw->port == 1) || !is_bonded)

			mlx4_ib_dispatch_event(gw->dev,

					       is_bonded ? 1 : gw->port,

					       IB_EVENT_GID_CHANGE);



	mlx4_free_cmd_mailbox(dev, mailbox);

	kfree(gw);
@@ -1875,7 +1946,8 @@ static void mlx4_ib_scan_netdevs(struct mlx4_ib_dev *ibdev, 
				 * don't want the bond IP based gids in the table since

				 * flows that select port by gid may get the down port.

				*/

				if (port_state == IB_PORT_DOWN) {

				if (port_state == IB_PORT_DOWN &&

				    !mlx4_is_bonded(ibdev->dev)) {

					reset_gid_table(ibdev, port);

					mlx4_ib_set_default_gid(ibdev,

								curr_netdev,
@@ -2047,6 +2119,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	int err;

	struct mlx4_ib_iboe *iboe;

	int ib_num_ports = 0;

	int num_req_counters;



	pr_info_once("%s", mlx4_ib_version);
@@ -2080,13 +2153,15 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	MLX4_INIT_DOORBELL_LOCK(&ibdev->uar_lock);



	ibdev->dev = dev;

	ibdev->bond_next_port	= 0;



	strlcpy(ibdev->ib_dev.name, "mlx4_%d", IB_DEVICE_NAME_MAX);

	ibdev->ib_dev.owner		= THIS_MODULE;

	ibdev->ib_dev.node_type		= RDMA_NODE_IB_CA;

	ibdev->ib_dev.local_dma_lkey	= dev->caps.reserved_lkey;

	ibdev->num_ports		= num_ports;

	ibdev->ib_dev.phys_port_cnt     = ibdev->num_ports;

	ibdev->ib_dev.phys_port_cnt     = mlx4_is_bonded(dev) ?

						1 : ibdev->num_ports;

	ibdev->ib_dev.num_comp_vectors	= dev->caps.num_comp_vectors;

	ibdev->ib_dev.dma_device	= &dev->persist->pdev->dev;
@@ -2207,7 +2282,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	if (init_node_data(ibdev))

		goto err_map;



	for (i = 0; i < ibdev->num_ports; ++i) {

	num_req_counters = mlx4_is_bonded(dev) ? 1 : ibdev->num_ports;

	for (i = 0; i < num_req_counters; ++i) {

		mutex_init(&ibdev->qp1_proxy_lock[i]);

		if (mlx4_ib_port_link_layer(&ibdev->ib_dev, i + 1) ==

						IB_LINK_LAYER_ETHERNET) {
@@ -2218,6 +2294,10 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
			ibdev->counters[i] = -1;

		}

	}

	if (mlx4_is_bonded(dev))

		for (i = 1; i < ibdev->num_ports ; ++i)

			ibdev->counters[i] = ibdev->counters[0];





	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_IB)

		ib_num_ports++;
@@ -2538,6 +2618,38 @@ out: 
	return;

}



static void handle_bonded_port_state_event(struct work_struct *work)

{

	struct ib_event_work *ew =

		container_of(work, struct ib_event_work, work);

	struct mlx4_ib_dev *ibdev = ew->ib_dev;

	enum ib_port_state bonded_port_state = IB_PORT_NOP;

	int i;

	struct ib_event ibev;



	kfree(ew);

	spin_lock_bh(&ibdev->iboe.lock);

	for (i = 0; i < MLX4_MAX_PORTS; ++i) {

		struct net_device *curr_netdev = ibdev->iboe.netdevs[i];



		enum ib_port_state curr_port_state =

			(netif_running(curr_netdev) &&

			 netif_carrier_ok(curr_netdev)) ?

			IB_PORT_ACTIVE : IB_PORT_DOWN;



		bonded_port_state = (bonded_port_state != IB_PORT_ACTIVE) ?

			curr_port_state : IB_PORT_ACTIVE;

	}

	spin_unlock_bh(&ibdev->iboe.lock);



	ibev.device = &ibdev->ib_dev;

	ibev.element.port_num = 1;

	ibev.event = (bonded_port_state == IB_PORT_ACTIVE) ?

		IB_EVENT_PORT_ACTIVE : IB_EVENT_PORT_ERR;



	ib_dispatch_event(&ibev);

}



static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr,

			  enum mlx4_dev_event event, unsigned long param)

{
@@ -2547,6 +2659,18 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr, 
	struct ib_event_work *ew;

	int p = 0;



	if (mlx4_is_bonded(dev) &&

	    ((event == MLX4_DEV_EVENT_PORT_UP) ||

	    (event == MLX4_DEV_EVENT_PORT_DOWN))) {

		ew = kmalloc(sizeof(*ew), GFP_ATOMIC);

		if (!ew)

			return;

		INIT_WORK(&ew->work, handle_bonded_port_state_event);

		ew->ib_dev = ibdev;

		queue_work(wq, &ew->work);

		return;

	}



	if (event == MLX4_DEV_EVENT_PORT_MGMT_CHANGE)

		eqe = (struct mlx4_eqe *)param;

	else
@@ -2607,7 +2731,7 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr, 
	}



	ibev.device	      = ibdev_ptr;

	ibev.element.port_num = (u8) p;

	ibev.element.port_num = mlx4_is_bonded(ibdev->dev) ? 1 : (u8)p;



	ib_dispatch_event(&ibev);

}
@@ -2616,7 +2740,8 @@ static struct mlx4_interface mlx4_ib_interface = { 
	.add		= mlx4_ib_add,

	.remove		= mlx4_ib_remove,

	.event		= mlx4_ib_event,

	.protocol	= MLX4_PROT_IB_IPV6

	.protocol	= MLX4_PROT_IB_IPV6,

	.flags		= MLX4_INTFF_BONDING

};



static int __init mlx4_ib_init(void)

drivers/infiniband/hw/mlx4/mlx4_ib.h

+16 −1
Original line number Diff line number Diff line
@@ -134,10 +134,17 @@ struct mlx4_ib_fmr { 
	struct mlx4_fmr         mfmr;

};



#define MAX_REGS_PER_FLOW 2



struct mlx4_flow_reg_id {

	u64 id;

	u64 mirror;

};



struct mlx4_ib_flow {

	struct ib_flow ibflow;

	/* translating DMFS verbs sniffer rule to FW API requires two reg IDs */

	u64 reg_id[2];

	struct mlx4_flow_reg_id reg_id[MAX_REGS_PER_FLOW];

};



struct mlx4_ib_wq {
@@ -527,6 +534,7 @@ struct mlx4_ib_dev { 
	struct mlx4_ib_qp      *qp1_proxy[MLX4_MAX_PORTS];

	/* lock when destroying qp1_proxy and getting netdev events */

	struct mutex		qp1_proxy_lock[MLX4_MAX_PORTS];

	u8			bond_next_port;

};



struct ib_event_work {
@@ -622,6 +630,13 @@ static inline struct mlx4_ib_ah *to_mah(struct ib_ah *ibah) 
	return container_of(ibah, struct mlx4_ib_ah, ibah);

}



static inline u8 mlx4_ib_bond_next_port(struct mlx4_ib_dev *dev)

{

	dev->bond_next_port = (dev->bond_next_port + 1) % dev->num_ports;



	return dev->bond_next_port + 1;

}



int mlx4_ib_init_sriov(struct mlx4_ib_dev *dev);

void mlx4_ib_close_sriov(struct mlx4_ib_dev *dev);

drivers/infiniband/hw/mlx4/qp.c

+20 −11
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <rdma/ib_addr.h>

#include <rdma/ib_mad.h>



#include <linux/mlx4/driver.h>

#include <linux/mlx4/qp.h>



#include "mlx4_ib.h"
@@ -93,17 +94,6 @@ enum { 
#ifndef ETH_ALEN

#define ETH_ALEN        6

#endif

static inline u64 mlx4_mac_to_u64(u8 *addr)

{

	u64 mac = 0;

	int i;



	for (i = 0; i < ETH_ALEN; i++) {

		mac <<= 8;

		mac |= addr[i];

	}

	return mac;

}



static const __be32 mlx4_ib_opcode[] = {

	[IB_WR_SEND]				= cpu_to_be32(MLX4_OPCODE_SEND),
@@ -1915,6 +1905,22 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		goto out;

	}



	if (mlx4_is_bonded(dev->dev) && (attr_mask & IB_QP_PORT)) {

		if ((cur_state == IB_QPS_RESET) && (new_state == IB_QPS_INIT)) {

			if ((ibqp->qp_type == IB_QPT_RC) ||

			    (ibqp->qp_type == IB_QPT_UD) ||

			    (ibqp->qp_type == IB_QPT_UC) ||

			    (ibqp->qp_type == IB_QPT_RAW_PACKET) ||

			    (ibqp->qp_type == IB_QPT_XRC_INI)) {

				attr->port_num = mlx4_ib_bond_next_port(dev);

			}

		} else {

			/* no sense in changing port_num

			 * when ports are bonded */

			attr_mask &= ~IB_QP_PORT;

		}

	}



	if ((attr_mask & IB_QP_PORT) &&

	    (attr->port_num == 0 || attr->port_num > dev->num_ports)) {

		pr_debug("qpn 0x%x: invalid port number (%d) specified "
@@ -1965,6 +1971,9 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 


	err = __mlx4_ib_modify_qp(ibqp, attr, attr_mask, cur_state, new_state);



	if (mlx4_is_bonded(dev->dev) && (attr_mask & IB_QP_PORT))

		attr->port_num = 1;



out:

	mutex_unlock(&qp->mutex);

	return err;

drivers/net/bonding/bond_main.c

+80 −26
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) 
			}



			new_active->delay = 0;

			new_active->link = BOND_LINK_UP;

			bond_set_slave_link_state(new_active, BOND_LINK_UP);



			if (BOND_MODE(bond) == BOND_MODE_8023AD)

				bond_3ad_handle_link_change(new_active, BOND_LINK_UP);
@@ -1181,6 +1181,62 @@ static void bond_free_slave(struct slave *slave) 
	kfree(slave);

}



static void bond_fill_ifbond(struct bonding *bond, struct ifbond *info)

{

	info->bond_mode = BOND_MODE(bond);

	info->miimon = bond->params.miimon;

	info->num_slaves = bond->slave_cnt;

}



static void bond_fill_ifslave(struct slave *slave, struct ifslave *info)

{

	strcpy(info->slave_name, slave->dev->name);

	info->link = slave->link;

	info->state = bond_slave_state(slave);

	info->link_failure_count = slave->link_failure_count;

}



static void bond_netdev_notify(struct slave *slave, struct net_device *dev)

{

	struct bonding *bond = slave->bond;

	struct netdev_bonding_info bonding_info;



	rtnl_lock();

	/* make sure that slave is still valid */

	if (dev->priv_flags & IFF_BONDING) {

		bond_fill_ifslave(slave, &bonding_info.slave);

		bond_fill_ifbond(bond, &bonding_info.master);

		netdev_bonding_info_change(slave->dev, &bonding_info);

	}

	rtnl_unlock();

}



static void bond_netdev_notify_work(struct work_struct *_work)

{

	struct netdev_notify_work *w =

		container_of(_work, struct netdev_notify_work, work.work);



	bond_netdev_notify(w->slave, w->dev);

	dev_put(w->dev);

}



void bond_queue_slave_event(struct slave *slave)

{

	struct netdev_notify_work *nnw = kzalloc(sizeof(*nnw), GFP_ATOMIC);



	if (!nnw)

		return;



	INIT_DELAYED_WORK(&nnw->work, bond_netdev_notify_work);

	nnw->slave = slave;

	nnw->dev = slave->dev;



	if (queue_delayed_work(slave->bond->wq, &nnw->work, 0))

		dev_hold(slave->dev);

	else

		kfree(nnw);

}



/* enslave device <slave> to bond device <master> */

int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)

{
@@ -1444,19 +1500,22 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	if (bond->params.miimon) {

		if (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS) {

			if (bond->params.updelay) {

				new_slave->link = BOND_LINK_BACK;

				bond_set_slave_link_state(new_slave,

							  BOND_LINK_BACK);

				new_slave->delay = bond->params.updelay;

			} else {

				new_slave->link = BOND_LINK_UP;

				bond_set_slave_link_state(new_slave,

							  BOND_LINK_UP);

			}

		} else {

			new_slave->link = BOND_LINK_DOWN;

			bond_set_slave_link_state(new_slave, BOND_LINK_DOWN);

		}

	} else if (bond->params.arp_interval) {

		new_slave->link = (netif_carrier_ok(slave_dev) ?

			BOND_LINK_UP : BOND_LINK_DOWN);

		bond_set_slave_link_state(new_slave,

					  (netif_carrier_ok(slave_dev) ?

					  BOND_LINK_UP : BOND_LINK_DOWN));

	} else {

		new_slave->link = BOND_LINK_UP;

		bond_set_slave_link_state(new_slave, BOND_LINK_UP);

	}



	if (new_slave->link != BOND_LINK_DOWN)
@@ -1572,6 +1631,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		    new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");



	/* enslave is successful */

	bond_queue_slave_event(new_slave);

	return 0;



/* Undo stages on error */
@@ -1821,11 +1881,7 @@ static int bond_release_and_destroy(struct net_device *bond_dev, 
static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)

{

	struct bonding *bond = netdev_priv(bond_dev);



	info->bond_mode = BOND_MODE(bond);

	info->miimon = bond->params.miimon;

	info->num_slaves = bond->slave_cnt;



	bond_fill_ifbond(bond, info);

	return 0;

}
@@ -1839,10 +1895,7 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in 
	bond_for_each_slave(bond, slave, iter) {

		if (i++ == (int)info->slave_id) {

			res = 0;

			strcpy(info->slave_name, slave->dev->name);

			info->link = slave->link;

			info->state = bond_slave_state(slave);

			info->link_failure_count = slave->link_failure_count;

			bond_fill_ifslave(slave, info);

			break;

		}

	}
@@ -1872,7 +1925,7 @@ static int bond_miimon_inspect(struct bonding *bond) 
			if (link_state)

				continue;



			slave->link = BOND_LINK_FAIL;

			bond_set_slave_link_state(slave, BOND_LINK_FAIL);

			slave->delay = bond->params.downdelay;

			if (slave->delay) {

				netdev_info(bond->dev, "link status down for %sinterface %s, disabling it in %d ms\n",
@@ -1887,7 +1940,7 @@ static int bond_miimon_inspect(struct bonding *bond) 
		case BOND_LINK_FAIL:

			if (link_state) {

				/* recovered before downdelay expired */

				slave->link = BOND_LINK_UP;

				bond_set_slave_link_state(slave, BOND_LINK_UP);

				slave->last_link_up = jiffies;

				netdev_info(bond->dev, "link status up again after %d ms for interface %s\n",

					    (bond->params.downdelay - slave->delay) *
@@ -1909,7 +1962,7 @@ static int bond_miimon_inspect(struct bonding *bond) 
			if (!link_state)

				continue;



			slave->link = BOND_LINK_BACK;

			bond_set_slave_link_state(slave, BOND_LINK_BACK);

			slave->delay = bond->params.updelay;



			if (slave->delay) {
@@ -1922,7 +1975,8 @@ static int bond_miimon_inspect(struct bonding *bond) 
			/*FALLTHRU*/

		case BOND_LINK_BACK:

			if (!link_state) {

				slave->link = BOND_LINK_DOWN;

				bond_set_slave_link_state(slave,

							  BOND_LINK_DOWN);

				netdev_info(bond->dev, "link status down again after %d ms for interface %s\n",

					    (bond->params.updelay - slave->delay) *

					    bond->params.miimon,
@@ -1960,7 +2014,7 @@ static void bond_miimon_commit(struct bonding *bond) 
			continue;



		case BOND_LINK_UP:

			slave->link = BOND_LINK_UP;

			bond_set_slave_link_state(slave, BOND_LINK_UP);

			slave->last_link_up = jiffies;



			primary = rtnl_dereference(bond->primary_slave);
@@ -2000,7 +2054,7 @@ static void bond_miimon_commit(struct bonding *bond) 
			if (slave->link_failure_count < UINT_MAX)

				slave->link_failure_count++;



			slave->link = BOND_LINK_DOWN;

			bond_set_slave_link_state(slave, BOND_LINK_DOWN);



			if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP ||

			    BOND_MODE(bond) == BOND_MODE_8023AD)
@@ -2583,7 +2637,7 @@ static void bond_ab_arp_commit(struct bonding *bond) 
				struct slave *current_arp_slave;



				current_arp_slave = rtnl_dereference(bond->current_arp_slave);

				slave->link = BOND_LINK_UP;

				bond_set_slave_link_state(slave, BOND_LINK_UP);

				if (current_arp_slave) {

					bond_set_slave_inactive_flags(

						current_arp_slave,
@@ -2606,7 +2660,7 @@ static void bond_ab_arp_commit(struct bonding *bond) 
			if (slave->link_failure_count < UINT_MAX)

				slave->link_failure_count++;



			slave->link = BOND_LINK_DOWN;

			bond_set_slave_link_state(slave, BOND_LINK_DOWN);

			bond_set_slave_inactive_flags(slave,

						      BOND_SLAVE_NOTIFY_NOW);
@@ -2685,7 +2739,7 @@ static bool bond_ab_arp_probe(struct bonding *bond) 
		 * up when it is actually down

		 */

		if (!bond_slave_is_up(slave) && slave->link == BOND_LINK_UP) {

			slave->link = BOND_LINK_DOWN;

			bond_set_slave_link_state(slave, BOND_LINK_DOWN);

			if (slave->link_failure_count < UINT_MAX)

				slave->link_failure_count++;
@@ -2705,7 +2759,7 @@ static bool bond_ab_arp_probe(struct bonding *bond) 
	if (!new_slave)

		goto check_state;



	new_slave->link = BOND_LINK_BACK;

	bond_set_slave_link_state(new_slave, BOND_LINK_BACK);

	bond_set_slave_active_flags(new_slave, BOND_SLAVE_NOTIFY_LATER);

	bond_arp_send_all(bond, new_slave);

	new_slave->last_link_up = jiffies;

CRA Git | Maintained and supported by SUSTech CRA and CCSE