linux-stable.git/drivers/net/bonding, branch v3.16.7

bonding: fix div by zero while enslaving and transmitting

2014-10-15T10:05:28+00:00

[ Upstream commit 9a72c2da690d78e93cff24b9f616412508678dd5 ]

The problem is that the slave is first linked and slave_cnt is
incremented afterwards leading to a div by zero in the modes that use it
as a modulus. What happens is that in bond_start_xmit()
bond_has_slaves() is used to evaluate further transmission and it becomes
true after the slave is linked in, but when slave_cnt is used in the xmit
path it is still 0, so fetch it once and transmit based on that. Since
it is used only in round-robin and XOR modes, the fix is only for them.
Thanks to Eric Dumazet for pointing out the fault in my first try to fix
this.

Call trace (took it out of net-next kernel, but it's the same with net):
[46934.330038] divide error: 0000 [#1] SMP
[46934.330041] Modules linked in: bonding(O) 9p fscache
snd_hda_codec_generic crct10dif_pclmul
[46934.330041] bond0: Enslaving eth1 as an active interface with an up
link
[46934.330051]  ppdev joydev crc32_pclmul crc32c_intel 9pnet_virtio
ghash_clmulni_intel snd_hda_intel 9pnet snd_hda_controller parport_pc
serio_raw pcspkr snd_hda_codec parport virtio_balloon virtio_console
snd_hwdep snd_pcm pvpanic i2c_piix4 snd_timer i2ccore snd soundcore
virtio_blk virtio_net virtio_pci virtio_ring virtio ata_generic
pata_acpi floppy [last unloaded: bonding]
[46934.330053] CPU: 1 PID: 3382 Comm: ping Tainted: G           O
3.17.0-rc4+ #27
[46934.330053] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[46934.330054] task: ffff88005aebf2c0 ti: ffff88005b728000 task.ti:
ffff88005b728000
[46934.330059] RIP: 0010:[]  []
bond_start_xmit+0x1c3/0x450 [bonding]
[46934.330060] RSP: 0018:ffff88005b72b7f8  EFLAGS: 00010246
[46934.330060] RAX: 0000000000000679 RBX: ffff88004b077000 RCX:
000000000000002a
[46934.330061] RDX: 0000000000000000 RSI: ffff88004b3f0500 RDI:
ffff88004b077940
[46934.330061] RBP: ffff88005b72b830 R08: 00000000000000c0 R09:
ffff88004a83e000
[46934.330062] R10: 000000000000ffff R11: ffff88004b1f12c0 R12:
ffff88004b3f0500
[46934.330062] R13: ffff88004b3f0500 R14: 000000000000002a R15:
ffff88004b077940
[46934.330063] FS:  00007fbd91a4c740(0000) GS:ffff88005f080000(0000)
knlGS:0000000000000000
[46934.330064] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[46934.330064] CR2: 00007f803a8bb000 CR3: 000000004b2c9000 CR4:
00000000000406e0
[46934.330069] Stack:
[46934.330071]  ffffffff811e6169 00000000e772fa05 ffff88004b077000
ffff88004b3f0500
[46934.330072]  ffffffff81d17d18 000000000000002a 0000000000000000
ffff88005b72b8a0
[46934.330073]  ffffffff81620108 ffffffff8161fe0e ffff88005b72b8c4
ffff88005b302000
[46934.330073] Call Trace:
[46934.330077]  [] ?
__kmalloc_node_track_caller+0x119/0x300
[46934.330084]  [] dev_hard_start_xmit+0x188/0x410
[46934.330086]  [] ? harmonize_features+0x2e/0x90
[46934.330088]  [] __dev_queue_xmit+0x456/0x590
[46934.330089]  [] dev_queue_xmit+0x10/0x20
[46934.330090]  [] arp_xmit+0x22/0x60
[46934.330091]  [] arp_send.part.16+0x30/0x40
[46934.330092]  [] arp_solicit+0x115/0x2b0
[46934.330094]  [] ? copy_skb_header+0x17/0xa0
[46934.330096]  [] neigh_probe+0x4a/0x70
[46934.330097]  [] __neigh_event_send+0xac/0x230
[46934.330098]  [] neigh_resolve_output+0x13b/0x220
[46934.330100]  [] ? ip_forward_options+0x1c0/0x1c0
[46934.330101]  [] ip_finish_output+0x1f8/0x860
[46934.330102]  [] ip_output+0x58/0x90
[46934.330103]  [] ? __ip_local_out+0xa2/0xb0
[46934.330104]  [] ip_local_out_sk+0x30/0x40
[46934.330105]  [] ip_send_skb+0x16/0x50
[46934.330106]  [] ip_push_pending_frames+0x33/0x40
[46934.330107]  [] raw_sendmsg+0x88c/0xa30
[46934.330110]  [] ? skb_recv_datagram+0x41/0x60
[46934.330111]  [] ? raw_recvmsg+0xa9/0x1f0
[46934.330113]  [] inet_sendmsg+0x74/0xc0
[46934.330114]  [] ? inet_recvmsg+0x8b/0xb0
[46934.330115] bond0: Adding slave eth2
[46934.330116]  [] sock_sendmsg+0x9c/0xe0
[46934.330118]  [] ?
move_addr_to_kernel.part.20+0x28/0x80
[46934.330121]  [] ? might_fault+0x47/0x50
[46934.330122]  [] ___sys_sendmsg+0x3a9/0x3c0
[46934.330125]  [] ? n_tty_write+0x3aa/0x530
[46934.330127]  [] ? __wake_up+0x44/0x50
[46934.330129]  [] ? fsnotify+0x238/0x310
[46934.330130]  [] __sys_sendmsg+0x51/0x90
[46934.330131]  [] SyS_sendmsg+0x12/0x20
[46934.330134]  [] system_call_fastpath+0x16/0x1b
[46934.330144] Code: 48 8b 10 4c 89 ee 4c 89 ff e8 aa bc ff ff 31 c0 e9
1a ff ff ff 0f 1f 00 4c 89 ee 4c 89 ff e8 65 fb ff ff 31 d2 4c 89 ee 4c
89 ff  b3 64 09 00 00 e8 02 bd ff ff 31 c0 e9 f2 fe ff ff 0f 1f 00
[46934.330146] RIP  [] bond_start_xmit+0x1c3/0x450
[bonding]
[46934.330146]  RSP 

CC: Eric Dumazet 
CC: Andy Gospodarek 
CC: Jay Vosburgh 
CC: Veaceslav Falico 
Fixes: 278b208375 ("bonding: initial RCU conversion")
Signed-off-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

bonding: fix ad_select module param check

2014-07-14T21:36:58+00:00

Obvious copy/paste error when I converted the ad_select to the new
option API. "lacp_rate" there should be "ad_select" so we can get the
proper value.

CC: Jay Vosburgh 
CC: Veaceslav Falico 
CC: Andy Gospodarek 
CC: David S. Miller 

Fixes: 9e5f5eebe765 ("bonding: convert ad_select to use the new option
API")
Reported-by: Karim Scheik 
Signed-off-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

bonding: Advertize vxlan offload features when supported

2014-06-18T23:49:51+00:00

When the underlying device supports TCP offloads for VXLAN/UDP
encapulated traffic, we need to reflect that through the hw_enc_features
field of the bonding net-device. This will cause the xmit path
in the core networking stack to provide bonding with encapsulated
GSO frames to offload into the HW etc.

Signed-off-by: Or Gerlitz 
Signed-off-by: David S. Miller

bonding: Support macvlans on top of tlb/rlb mode bonds

2014-06-04T22:13:54+00:00

To make TLB mode work, the patch allows learning packets
to be sent using mac addresses assigned to macvlan devices,
also taking into an account vlans that may be between the
bond and macvlan device.

To make RLB work, all we have to do is accept ARP packets
for addresses added to the bond dev->uc list.  Since RLB
mode will take care to update the peers directly with
correct mac addresses, learning packets for these addresses
do not have be send to switch.

Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

bonding: Turn on IFF_UNICAST_FLT on bond devices

2014-06-04T22:13:54+00:00

Bonding devices manage the unicast filters of the underlying
interfaces, but do not turn on IFF_UNICAST_FLT flag.  Thus
anytime a unicast address is added to the bond, the bond is
places in promiscuous mode.

Turn on IFF_UNICAST_FLT on the bond device so that the bond does
not go into promiscuous mode needlesly.  If an underlying device
does not support unicast filtering, that device will automaticall
enter promiscuous mode already.

Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-05-24T04:32:30+00:00

Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller

bonding: Send ALB learning packets using the right source

2014-05-22T19:47:58+00:00

ALB learning packets are currentlyalways sent using the slave mac
address for all vlans configured on top of bond.   This is not always
correct, as vlans may change their mac address.
This patch introduced a concept of strict matching where the
source of learning packets can either strictly match the address
passed in, or it can determine a more correct address to use.

There are 3 casese to consider:
  1) Switchover.  In this case, we have a new active slave and we need
     tell the switch about all addresses available on the slave.
  2) Monitor.  We'll periodically refresh learning info for all slaves.
     In this case, we refresh all addresses for current active, and just
     the slave address for other slaves.
  3) Teaching of disabled adddress.  This happens as part of the
     failover and in this case, we alwyas to use just the address
     provided.

CC: Jay Vosburgh 
CC: Veaceslav Falico 
CC: Andy Gospodarek 
Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

bonding: remove NULL verification from bond_get_bond_by_slave()

2014-05-22T19:46:34+00:00

Every caller relies on the result being the actual bond, so this
verification just masks the real problem.

CC: Jay Vosburgh 
CC: Andy Gospodarek 
Signed-off-by: Veaceslav Falico 
Signed-off-by: David S. Miller

bonding: populate essential new_slave->bond/dev early

2014-05-22T19:46:34+00:00

The new bond_free_slave() needs new_slave->bond to verify if additional
structures were allocated, so populate it early so that, in case of failure
in bond_enslave(), we would be able to get it.

Also populate the new_slave->dev field, as it's too one of the most needed
things to assign early.

CC: Jay Vosburgh 
CC: Andy Gospodarek 
Signed-off-by: Veaceslav Falico 
Acked-by: Ding Tianhong 
Signed-off-by: David S. Miller

bonding: Don't assume 802.1Q when sending alb learning packets.

2014-05-22T19:44:58+00:00

TLB/ALB learning packets always assume 802.1Q vlan protocol, but
that is no longer the case since we now have support for Q-in-Q
on top of bonding.  Pass the vlan protocol to alb_send_lp_vid()
so that the packets are properly tagged.

CC: Jay Vosburgh 
CC: Veaceslav Falico 
CC: Andy Gospodarek 
Signed-off-by: Vlad Yasevich 
Acked-by: Veaceslav Falico 
Signed-off-by: David S. Miller