mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 17:50:54 +07:00
bonding: Fix ALB mode to balance traffic on VLANs
The current ALB function that processes incoming ARPs does not handle traffic for VLANs configured above bonding. This causes traffic on those VLANs to all be assigned the same slave. This patch corrects that misbehavior by locating the bonding interface nested below the VLAN interface. Bug reported by Sven Anders <anders@anduras.de>, who also tested an earlier version of this patch and confirmed that it resolved the problem. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
305d552acc
commit
6146b1a4da
@ -346,14 +346,18 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
|
||||
|
||||
static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct packet_type *ptype, struct net_device *orig_dev)
|
||||
{
|
||||
struct bonding *bond = bond_dev->priv;
|
||||
struct bonding *bond;
|
||||
struct arp_pkt *arp = (struct arp_pkt *)skb->data;
|
||||
int res = NET_RX_DROP;
|
||||
|
||||
if (dev_net(bond_dev) != &init_net)
|
||||
goto out;
|
||||
|
||||
if (!(bond_dev->flags & IFF_MASTER))
|
||||
while (bond_dev->priv_flags & IFF_802_1Q_VLAN)
|
||||
bond_dev = vlan_dev_real_dev(bond_dev);
|
||||
|
||||
if (!(bond_dev->priv_flags & IFF_BONDING) ||
|
||||
!(bond_dev->flags & IFF_MASTER))
|
||||
goto out;
|
||||
|
||||
if (!arp) {
|
||||
@ -368,6 +372,9 @@ static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct
|
||||
|
||||
if (arp->op_code == htons(ARPOP_REPLY)) {
|
||||
/* update rx hash table for this ARP */
|
||||
printk("rar: update orig %s bond_dev %s\n", orig_dev->name,
|
||||
bond_dev->name);
|
||||
bond = bond_dev->priv;
|
||||
rlb_update_entry_from_arp(bond, arp);
|
||||
dprintk("Server received an ARP Reply from client\n");
|
||||
}
|
||||
@ -818,7 +825,7 @@ static int rlb_initialize(struct bonding *bond)
|
||||
|
||||
/*initialize packet type*/
|
||||
pk_type->type = __constant_htons(ETH_P_ARP);
|
||||
pk_type->dev = bond->dev;
|
||||
pk_type->dev = NULL;
|
||||
pk_type->func = rlb_arp_recv;
|
||||
|
||||
/* register to receive ARPs */
|
||||
|
Loading…
Reference in New Issue
Block a user