linux-stable.git/drivers/net, branch v3.18.22

net/mlx4_core: Fix wrong index in propagating port change event to VFs

2015-09-28T22:57:02+00:00

[ Upstream commit 1c1bf34951e8d17941bf708d1901c47e81b15d55 ]

The port-change event processing in procedure mlx4_eq_int() uses "slave"
as the vf_oper array index. Since the value of "slave" is the PF function
index, the result is that the PF link state is used for deciding to
propagate the event for all the VFs. The VF link state should be used,
so the VF function index should be used here.

Fixes: 948e306d7d64 ('net/mlx4: Add VF link state support')
Signed-off-by: Jack Morgenstein 
Signed-off-by: Matan Barak 
Signed-off-by: Or Gerlitz 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

bonding: correct the MAC address for "follow" fail_over_mac policy

2015-09-28T22:57:01+00:00

[ Upstream commit a951bc1e6ba58f11df5ed5ddc41311e10f5fd20b ]

The "follow" fail_over_mac policy is useful for multiport devices that
either become confused or incur a performance penalty when multiple
ports are programmed with the same MAC address, but the same MAC
address still may happened by this steps for this policy:

1) echo +eth0 > /sys/class/net/bond0/bonding/slaves
   bond0 has the same mac address with eth0, it is MAC1.

2) echo +eth1 > /sys/class/net/bond0/bonding/slaves
   eth1 is backup, eth1 has MAC2.

3) ifconfig eth0 down
   eth1 became active slave, bond will swap MAC for eth0 and eth1,
   so eth1 has MAC1, and eth0 has MAC2.

4) ifconfig eth1 down
   there is no active slave, and eth1 still has MAC1, eth2 has MAC2.

5) ifconfig eth0 up
   the eth0 became active slave again, the bond set eth0 to MAC1.

Something wrong here, then if you set eth1 up, the eth0 and eth1 will have the same
MAC address, it will break this policy for ACTIVE_BACKUP mode.

This patch will fix this problem by finding the old active slave and
swap them MAC address before change active slave.

Signed-off-by: Ding Tianhong 
Tested-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

bonding: fix destruction of bond with devices different from arphrd_ether

2015-09-28T22:57:01+00:00

[ Upstream commit 06f6d1094aa0992432b1e2a0920b0ee86ccd83bf ]

When the bonding is being unloaded and the netdevice notifier is
unregistered it executes NETDEV_UNREGISTER for each device which should
remove the bond's proc entry but if the device enslaved is not of
ARPHRD_ETHER type and is in front of the bonding, it may execute
bond_release_and_destroy() first which would release the last slave and
destroy the bond device leaving the proc entry and thus we will get the
following error (with dynamic debug on for bond_netdev_event to see the
events order):
[  908.963051] eql: event: 9
[  908.963052] eql: IFF_SLAVE
[  908.963054] eql: event: 2
[  908.963056] eql: IFF_SLAVE
[  908.963058] eql: event: 6
[  908.963059] eql: IFF_SLAVE
[  908.963110] bond0: Releasing active interface eql
[  908.976168] bond0: Destroying bond bond0
[  908.976266] bond0 (unregistering): Released all slaves
[  908.984097] ------------[ cut here ]------------
[  908.984107] WARNING: CPU: 0 PID: 1787 at fs/proc/generic.c:575
remove_proc_entry+0x112/0x160()
[  908.984110] remove_proc_entry: removing non-empty directory
'net/bonding', leaking at least 'bond0'
[  908.984111] Modules linked in: bonding(-) eql(O) 9p nfsd auth_rpcgss
oid_registry nfs_acl nfs lockd grace fscache sunrpc crct10dif_pclmul
crc32_pclmul crc32c_intel ghash_clmulni_intel ppdev qxl drm_kms_helper
snd_hda_codec_generic aesni_intel ttm aes_x86_64 glue_helper pcspkr lrw
gf128mul ablk_helper cryptd snd_hda_intel virtio_console snd_hda_codec
psmouse serio_raw snd_hwdep snd_hda_core 9pnet_virtio 9pnet evdev joydev
drm virtio_balloon snd_pcm snd_timer snd soundcore i2c_piix4 i2c_core
pvpanic acpi_cpufreq parport_pc parport processor thermal_sys button
autofs4 ext4 crc16 mbcache jbd2 hid_generic usbhid hid sg sr_mod cdrom
ata_generic virtio_blk virtio_net floppy ata_piix e1000 libata ehci_pci
virtio_pci scsi_mod uhci_hcd ehci_hcd virtio_ring virtio usbcore
usb_common [last unloaded: bonding]

[  908.984168] CPU: 0 PID: 1787 Comm: rmmod Tainted: G        W  O
4.2.0-rc2+ #8
[  908.984170] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
[  908.984172]  0000000000000000 ffffffff81732d41 ffffffff81525b34
ffff8800358dfda8
[  908.984175]  ffffffff8106c521 ffff88003595af78 ffff88003595af40
ffff88003e3a4280
[  908.984178]  ffffffffa058d040 0000000000000000 ffffffff8106c59a
ffffffff8172ebd0
[  908.984181] Call Trace:
[  908.984188]  [] ? dump_stack+0x40/0x50
[  908.984193]  [] ? warn_slowpath_common+0x81/0xb0
[  908.984196]  [] ? warn_slowpath_fmt+0x4a/0x50
[  908.984199]  [] ? remove_proc_entry+0x112/0x160
[  908.984205]  [] ? bond_destroy_proc_dir+0x26/0x30
[bonding]
[  908.984208]  [] ? bond_net_exit+0x8e/0xa0 [bonding]
[  908.984217]  [] ? ops_exit_list.isra.4+0x37/0x70
[  908.984225]  [] ?
unregister_pernet_operations+0x8d/0xd0
[  908.984228]  [] ?
unregister_pernet_subsys+0x1d/0x30
[  908.984232]  [] ? bonding_exit+0x23/0xdba [bonding]
[  908.984236]  [] ? SyS_delete_module+0x18a/0x250
[  908.984241]  [] ? task_work_run+0x89/0xc0
[  908.984244]  [] ?
entry_SYSCALL_64_fastpath+0x16/0x75
[  908.984247] ---[ end trace 7c006ed4abbef24b ]---

Thus remove the proc entry manually if bond_release_and_destroy() is
used. Because of the checks in bond_remove_proc_entry() it's not a
problem for a bond device to change namespaces (the bug fixed by the
Fixes commit) but since commit
f9399814927ad ("bonding: Don't allow bond devices to change network
namespaces.") that can't happen anyway.

Reported-by: Carol Soto 
Signed-off-by: Nikolay Aleksandrov 
Fixes: a64d49c3dd50 ("bonding: Manage /proc/net/bonding/ entries from
                      the netdev events")
Tested-by: Carol L Soto 
Signed-off-by: David S. Miller 

Signed-off-by: Sasha Levin

rtlwifi: rtl8723be: Add module parameter for MSI interrupts

2015-09-15T17:58:23+00:00

[ Upstream commit 741e3b9902d11585e18bfc7f8d47e913616bb070 ]

The driver code allows for the disabling of MSI interrupts; however the
module_parm line was missed and the option fails to show with modinfo.

Signed-off-by: Larry Finger 
Cc: Stable  [3.15+]
Signed-off-by: Kalle Valo 
Signed-off-by: Sasha Levin

Revert "can: fix loss of CAN frames in raw_rcv"

2015-08-04T17:32:39+00:00

This reverts commit c215cf258214858a5a6c3e63cd7ee78b92d210b2.

Signed-off-by: Sasha Levin

can: fix loss of CAN frames in raw_rcv

2015-07-12T16:50:46+00:00

[ Upstream commit 36c01245eb8046c16eee6431e7dbfbb302635fa8 ]

As reported by Manfred Schlaegl here

   http://marc.info/?l=linux-netdev&m=143482089824232&w=2

commit 514ac99c64b "can: fix multiple delivery of a single CAN frame for
overlapping CAN filters" requires the skb->tstamp to be set to check for
identical CAN skbs.

As net timestamping is influenced by several players (netstamp_needed and
netdev_tstamp_prequeue) Manfred missed a proper timestamp which leads to
CAN frame loss.

As skb timestamping became now mandatory for CAN related skbs this patch
makes sure that received CAN skbs always have a proper timestamp set.
Maybe there's a better solution in the future but this patch fixes the
CAN frame loss so far.

Reported-by: Manfred Schlaegl 
Signed-off-by: Oliver Hartkopp 
Cc: linux-stable 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Sasha Levin

bnx2x: fix lockdep splat

2015-07-05T14:13:00+00:00

[ Upstream commit d53c66a5b80698620f7c9ba2372fff4017e987b8 ]

Michel reported following lockdep splat

[   44.718117] INFO: trying to register non-static key.
[   44.723081] the code is fine but needs lockdep annotation.
[   44.728559] turning off the locking correctness validator.
[   44.734036] CPU: 8 PID: 5483 Comm: ethtool Not tainted 4.1.0
[   44.770289] Call Trace:
[   44.772741]  [] dump_stack+0x4c/0x65
[   44.777879]  [] ? console_unlock+0x1f1/0x510
[   44.783708]  [] __lock_acquire+0x1d05/0x1f10
[   44.789538]  [] ? mark_held_locks+0x6a/0x90
[   44.795276]  [] ? trace_hardirqs_on_caller+0x105/0x1d0
[   44.801967]  [] ? trace_hardirqs_on+0xd/0x10
[   44.807793]  [] ? hrtimer_try_to_cancel+0x4a/0x250
[   44.814142]  [] lock_acquire+0xb6/0x290
[   44.819537]  [] ? flush_work+0x5/0x280
[   44.824844]  [] flush_work+0x3d/0x280
[   44.830061]  [] ? flush_work+0x5/0x280
[   44.835366]  [] ? schedule_hrtimeout_range+0x13/0x20
[   44.841889]  [] ? usleep_range+0x4b/0x50
[   44.847365]  [] ? mark_held_locks+0x6a/0x90
[   44.853102]  [] ? __cancel_work_timer+0x105/0x1c0
[   44.859359]  [] ? trace_hardirqs_on_caller+0x105/0x1d0
[   44.866045]  [] __cancel_work_timer+0x9f/0x1c0
[   44.872048]  [] ? bnx2x_func_stop+0x42/0x90 [bnx2x]
[   44.878481]  [] cancel_work_sync+0x10/0x20
[   44.884134]  [] bnx2x_chip_cleanup+0x245/0x730 [bnx2x]
[   44.890829]  [] ? up+0x32/0x50
[   44.895439]  [] ? del_timer_sync+0x5/0xd0
[   44.901005]  [] bnx2x_nic_unload+0x20d/0x8e0 [bnx2x]
[   44.907527]  [] ? might_fault+0x5f/0xb0
[   44.912921]  [] bnx2x_reload_if_running+0x2c/0x50 [bnx2x]
[   44.919879]  [] bnx2x_set_ringparam+0x2b5/0x460 [bnx2x]
[   44.926664]  [] dev_ethtool+0x55b/0x1c40
[   44.932148]  [] ? rtnl_lock+0x17/0x20
[   44.937364]  [] dev_ioctl+0x17b/0x630
[   44.942582]  [] sock_do_ioctl+0x5d/0x70
[   44.947972]  [] sock_ioctl+0x73/0x280
[   44.953192]  [] do_vfs_ioctl+0x88/0x5b0
[   44.958587]  [] ? up_read+0x23/0x40
[   44.963631]  [] ? __fget_light+0x6c/0xa0
[   44.969105]  [] SyS_ioctl+0x91/0xb0
[   44.974149]  [] system_call_fastpath+0x12/0x6f

As bnx2x_init_ptp() is only called if bp->flags contains PTP_SUPPORTED,
we also need to guard bnx2x_stop_ptp() with same condition, otherwise
ptp_task workqueue is not initialized and kernel barfs on
cancel_work_sync()

Fixes: eeed018cbfa30 ("bnx2x: Add timestamping and PTP hardware clock support")
Reported-by: Michel Lespinasse 
Signed-off-by: Eric Dumazet 
Cc: Michal Kalderon 
Cc: Ariel Elior 
Cc: Yuval Mintz 
Cc: David Decotigny 
Acked-by: Sony Chacko 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

net: phy: fix phy link up when limiting speed via device tree

2015-07-05T14:13:00+00:00

[ Upstream commit eb686231fce3770299760f24fdcf5ad041f44153 ]

When limiting phy link speed using "max-speed" to 100mbps or less on a
giga bit phy, phy never completes auto negotiation and phy state
machine is held in PHY_AN. Fixing this issue by comparing the giga
bit advertise though phydev->supported doesn't have it but phy has
BMSR_ESTATEN set. So that auto negotiation is restarted as old and
new advertise are different and link comes up fine.

Signed-off-by: Mugunthan V N 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

net/mlx4_en: Wake TX queues only when there's enough room

2015-07-05T14:12:59+00:00

[ Upstream commit 488a9b48e398b157703766e2cd91ea45ac6997c5 ]

Indication of a single completed packet, marked by txbbs_skipped
being bigger then zero, in not enough in order to wake up a
stopped TX queue. The completed packet may contain a single TXBB,
while next packet to be sent (after the wake up) may have multiple
TXBBs (LSO/TSO packets for example), causing overflow in queue followed
by WQE corruption and TX queue timeout.
Instead, wake the stopped queue only when there's enough room for the
worst case (maximum sized WQE) packet that we should need to handle after
the queue is opened again.

Also created an helper routine - mlx4_en_is_tx_ring_full, which checks
if the current TX ring is full or not. It provides better code readability
and removes code duplication.

Signed-off-by: Ido Shamay 
Signed-off-by: Or Gerlitz 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

net: mvneta: disable IP checksum with jumbo frames for Armada 370

2015-07-05T14:12:55+00:00

[ Upstream commit b65657fc240ae6c1d2a1e62db9a0e61ac9631d7a ]

The Ethernet controller found in the Armada 370, 380 and 385 SoCs don't
support TCP/IP checksumming with frame sizes larger than 1600 bytes.

This patch fixes the issue by disabling the features NETIF_F_IP_CSUM and
NETIF_F_TSO for the Armada 370 and compatibles SoCs when the MTU is set
to a value greater than 1600 bytes.

Signed-off-by: Simon Guinot 
Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network unit")
Cc:  # v3.8+
Acked-by: Thomas Petazzoni 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin