Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6475ae4c authored by Veaceslav Falico's avatar Veaceslav Falico Committed by David S. Miller
Browse files

bonding: rework rlb_next_rx_slave() to use bond_for_each_slave() 



Currently, we're using bond_for_each_slave_from(), which is really hard to
implement under RCU and/or neighbour list.

Remove it and use bond_for_each_slave() instead, taking care of the last
used slave.

Also, rename next_rx_slave to rx_slave and store the current (last)
rx_slave.

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarVeaceslav Falico <vfalico@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c33d7887

drivers/net/bonding/bond_alb.c

+21 −20
Original line number Original line Diff line number Diff line
@@ -383,30 +383,31 @@ static int rlb_arp_recv(const struct sk_buff *skb, struct bonding *bond, 
static struct slave *rlb_next_rx_slave(struct bonding *bond)

static struct slave *rlb_next_rx_slave(struct bonding *bond)

{

{

	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));

	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));

	struct slave *rx_slave, *slave, *start_at;

	struct slave *before = NULL, *rx_slave = NULL, *slave;

	int i = 0;

	struct list_head *iter;



	bool found = false;

	if (bond_info->next_rx_slave)

		start_at = bond_info->next_rx_slave;

	else

		start_at = bond_first_slave(bond);



	rx_slave = NULL;





	bond_for_each_slave_from(bond, slave, i, start_at) {

	bond_for_each_slave(bond, slave, iter) {

		if (SLAVE_IS_OK(slave)) {

		if (!SLAVE_IS_OK(slave))

			if (!rx_slave) {

			continue;

				rx_slave = slave;

		if (!found) {

			} else if (slave->speed > rx_slave->speed) {

			if (!before || before->speed < slave->speed)

				before = slave;

		} else {

			if (!rx_slave || rx_slave->speed < slave->speed)

				rx_slave = slave;

				rx_slave = slave;

		}

		}

		if (slave == bond_info->rx_slave)

			found = true;

	}

	}

	}

	/* we didn't find anything after the current or we have something

	 * better before and up to the current slave

	 */

	if (!rx_slave || (before && rx_slave->speed < before->speed))

		rx_slave = before;





	if (rx_slave) {

	if (rx_slave)

		slave = bond_next_slave(bond, rx_slave);

		bond_info->rx_slave = rx_slave;

		bond_info->next_rx_slave = slave;

	}





	return rx_slave;

	return rx_slave;

}

}
@@ -1611,7 +1612,7 @@ void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave) 
	tlb_clear_slave(bond, slave, 0);

	tlb_clear_slave(bond, slave, 0);





	if (bond->alb_info.rlb_enabled) {

	if (bond->alb_info.rlb_enabled) {

		bond->alb_info.next_rx_slave = NULL;

		bond->alb_info.rx_slave = NULL;

		rlb_clear_slave(bond, slave);

		rlb_clear_slave(bond, slave);

	}

	}

}

}

drivers/net/bonding/bond_alb.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -154,9 +154,7 @@ struct alb_bond_info { 
	u8			rx_ntt;	/* flag - need to transmit

	u8			rx_ntt;	/* flag - need to transmit

					 * to all rx clients

					 * to all rx clients

					 */

					 */

	struct slave		*next_rx_slave;/* next slave to be assigned

	struct slave		*rx_slave;/* last slave to xmit from */

						* to a new rx client for

						*/

	u8			primary_is_promisc;	   /* boolean */

	u8			primary_is_promisc;	   /* boolean */

	u32			rlb_promisc_timeout_counter;/* counts primary

	u32			rlb_promisc_timeout_counter;/* counts primary

							     * promiscuity time

							     * promiscuity time