Vlad Yasevich c674ac30c5 macvlan: Fix lockdep warnings with stacked macvlan devices ... Macvlan devices try to avoid stacking, but that's not always successfull or even desired. As an example, the following configuration is perefectly legal and valid: eth0 <--- macvlan0 <---- vlan0.10 <--- macvlan1 However, this configuration produces the following lockdep trace: [ 115.620418] ====================================================== [ 115.620477] [ INFO: possible circular locking dependency detected ] [ 115.620516] 3.15.0-rc1+ #24 Not tainted [ 115.620540] ------------------------------------------------------- [ 115.620577] ip/1704 is trying to acquire lock: [ 115.620604] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff815df49c>] dev_uc_sync+0x3c/0x80 [ 115.620686] but task is already holding lock: [ 115.620723] (&macvlan_netdev_addr_lock_key){+.....}, at: [<ffffffff815da5be>] dev_set_rx_mode+0x1e/0x40 [ 115.620795] which lock already depends on the new lock. [ 115.620853] the existing dependency chain (in reverse order) is: [ 115.620894] -> #1 (&macvlan_netdev_addr_lock_key){+.....}: [ 115.620935] [<ffffffff810d57f2>] lock_acquire+0xa2/0x130 [ 115.620974] [<ffffffff816f62e7>] _raw_spin_lock_nested+0x37/0x50 [ 115.621019] [<ffffffffa07296c3>] vlan_dev_set_rx_mode+0x53/0x110 [8021q] [ 115.621066] [<ffffffff815da557>] __dev_set_rx_mode+0x57/0xa0 [ 115.621105] [<ffffffff815da5c6>] dev_set_rx_mode+0x26/0x40 [ 115.621143] [<ffffffff815da6be>] __dev_open+0xde/0x140 [ 115.621174] [<ffffffff815da9ad>] __dev_change_flags+0x9d/0x170 [ 115.621174] [<ffffffff815daaa9>] dev_change_flags+0x29/0x60 [ 115.621174] [<ffffffff815e7f11>] do_setlink+0x321/0x9a0 [ 115.621174] [<ffffffff815ea59f>] rtnl_newlink+0x51f/0x730 [ 115.621174] [<ffffffff815e6e75>] rtnetlink_rcv_msg+0x95/0x250 [ 115.621174] [<ffffffff81608b19>] netlink_rcv_skb+0xa9/0xc0 [ 115.621174] [<ffffffff815e6dca>] rtnetlink_rcv+0x2a/0x40 [ 115.621174] [<ffffffff81608150>] netlink_unicast+0xf0/0x1c0 [ 115.621174] [<ffffffff8160851f>] netlink_sendmsg+0x2ff/0x740 [ 115.621174] [<ffffffff815bc9db>] sock_sendmsg+0x8b/0xc0 [ 115.621174] [<ffffffff815bd4b9>] ___sys_sendmsg+0x369/0x380 [ 115.621174] [<ffffffff815bdbb2>] __sys_sendmsg+0x42/0x80 [ 115.621174] [<ffffffff815bdc02>] SyS_sendmsg+0x12/0x20 [ 115.621174] [<ffffffff816ffd69>] system_call_fastpath+0x16/0x1b [ 115.621174] -> #0 (&vlan_netdev_addr_lock_key/1){+.....}: [ 115.621174] [<ffffffff810d4d43>] __lock_acquire+0x1773/0x1a60 [ 115.621174] [<ffffffff810d57f2>] lock_acquire+0xa2/0x130 [ 115.621174] [<ffffffff816f62e7>] _raw_spin_lock_nested+0x37/0x50 [ 115.621174] [<ffffffff815df49c>] dev_uc_sync+0x3c/0x80 [ 115.621174] [<ffffffffa0696d2a>] macvlan_set_mac_lists+0xca/0x110 [macvlan] [ 115.621174] [<ffffffff815da557>] __dev_set_rx_mode+0x57/0xa0 [ 115.621174] [<ffffffff815da5c6>] dev_set_rx_mode+0x26/0x40 [ 115.621174] [<ffffffff815da6be>] __dev_open+0xde/0x140 [ 115.621174] [<ffffffff815da9ad>] __dev_change_flags+0x9d/0x170 [ 115.621174] [<ffffffff815daaa9>] dev_change_flags+0x29/0x60 [ 115.621174] [<ffffffff815e7f11>] do_setlink+0x321/0x9a0 [ 115.621174] [<ffffffff815ea59f>] rtnl_newlink+0x51f/0x730 [ 115.621174] [<ffffffff815e6e75>] rtnetlink_rcv_msg+0x95/0x250 [ 115.621174] [<ffffffff81608b19>] netlink_rcv_skb+0xa9/0xc0 [ 115.621174] [<ffffffff815e6dca>] rtnetlink_rcv+0x2a/0x40 [ 115.621174] [<ffffffff81608150>] netlink_unicast+0xf0/0x1c0 [ 115.621174] [<ffffffff8160851f>] netlink_sendmsg+0x2ff/0x740 [ 115.621174] [<ffffffff815bc9db>] sock_sendmsg+0x8b/0xc0 [ 115.621174] [<ffffffff815bd4b9>] ___sys_sendmsg+0x369/0x380 [ 115.621174] [<ffffffff815bdbb2>] __sys_sendmsg+0x42/0x80 [ 115.621174] [<ffffffff815bdc02>] SyS_sendmsg+0x12/0x20 [ 115.621174] [<ffffffff816ffd69>] system_call_fastpath+0x16/0x1b [ 115.621174] other info that might help us debug this: [ 115.621174] Possible unsafe locking scenario: [ 115.621174] CPU0 CPU1 [ 115.621174] ---- ---- [ 115.621174] lock(&macvlan_netdev_addr_lock_key); [ 115.621174] lock(&vlan_netdev_addr_lock_key/1); [ 115.621174] lock(&macvlan_netdev_addr_lock_key); [ 115.621174] lock(&vlan_netdev_addr_lock_key/1); [ 115.621174] *** DEADLOCK *** [ 115.621174] 2 locks held by ip/1704: [ 115.621174] #0: (rtnl_mutex){+.+.+.}, at: [<ffffffff815e6dbb>] rtnetlink_rcv+0x1b/0x40 [ 115.621174] #1: (&macvlan_netdev_addr_lock_key){+.....}, at: [<ffffffff815da5be>] dev_set_rx_mode+0x1e/0x40 [ 115.621174] stack backtrace: [ 115.621174] CPU: 3 PID: 1704 Comm: ip Not tainted 3.15.0-rc1+ #24 [ 115.621174] Hardware name: Hewlett-Packard HP xw8400 Workstation/0A08h, BIOS 786D5 v02.38 10/25/2010 [ 115.621174] ffffffff82339ae0 ffff880465f79568 ffffffff816ee20c ffffffff82339ae0 [ 115.621174] ffff880465f795a8 ffffffff816e9e1b ffff880465f79600 ffff880465b019c8 [ 115.621174] 0000000000000001 0000000000000002 ffff880465b019c8 ffff880465b01230 [ 115.621174] Call Trace: [ 115.621174] [<ffffffff816ee20c>] dump_stack+0x4d/0x66 [ 115.621174] [<ffffffff816e9e1b>] print_circular_bug+0x200/0x20e [ 115.621174] [<ffffffff810d4d43>] __lock_acquire+0x1773/0x1a60 [ 115.621174] [<ffffffff810d3172>] ? trace_hardirqs_on_caller+0xb2/0x1d0 [ 115.621174] [<ffffffff810d57f2>] lock_acquire+0xa2/0x130 [ 115.621174] [<ffffffff815df49c>] ? dev_uc_sync+0x3c/0x80 [ 115.621174] [<ffffffff816f62e7>] _raw_spin_lock_nested+0x37/0x50 [ 115.621174] [<ffffffff815df49c>] ? dev_uc_sync+0x3c/0x80 [ 115.621174] [<ffffffff815df49c>] dev_uc_sync+0x3c/0x80 [ 115.621174] [<ffffffffa0696d2a>] macvlan_set_mac_lists+0xca/0x110 [macvlan] [ 115.621174] [<ffffffff815da557>] __dev_set_rx_mode+0x57/0xa0 [ 115.621174] [<ffffffff815da5c6>] dev_set_rx_mode+0x26/0x40 [ 115.621174] [<ffffffff815da6be>] __dev_open+0xde/0x140 [ 115.621174] [<ffffffff815da9ad>] __dev_change_flags+0x9d/0x170 [ 115.621174] [<ffffffff815daaa9>] dev_change_flags+0x29/0x60 [ 115.621174] [<ffffffff811e1db1>] ? mem_cgroup_bad_page_check+0x21/0x30 [ 115.621174] [<ffffffff815e7f11>] do_setlink+0x321/0x9a0 [ 115.621174] [<ffffffff810d394c>] ? __lock_acquire+0x37c/0x1a60 [ 115.621174] [<ffffffff815ea59f>] rtnl_newlink+0x51f/0x730 [ 115.621174] [<ffffffff815ea169>] ? rtnl_newlink+0xe9/0x730 [ 115.621174] [<ffffffff815e6e75>] rtnetlink_rcv_msg+0x95/0x250 [ 115.621174] [<ffffffff810d329d>] ? trace_hardirqs_on+0xd/0x10 [ 115.621174] [<ffffffff815e6dbb>] ? rtnetlink_rcv+0x1b/0x40 [ 115.621174] [<ffffffff815e6de0>] ? rtnetlink_rcv+0x40/0x40 [ 115.621174] [<ffffffff81608b19>] netlink_rcv_skb+0xa9/0xc0 [ 115.621174] [<ffffffff815e6dca>] rtnetlink_rcv+0x2a/0x40 [ 115.621174] [<ffffffff81608150>] netlink_unicast+0xf0/0x1c0 [ 115.621174] [<ffffffff8160851f>] netlink_sendmsg+0x2ff/0x740 [ 115.621174] [<ffffffff815bc9db>] sock_sendmsg+0x8b/0xc0 [ 115.621174] [<ffffffff8119d4af>] ? might_fault+0x5f/0xb0 [ 115.621174] [<ffffffff8119d4f8>] ? might_fault+0xa8/0xb0 [ 115.621174] [<ffffffff8119d4af>] ? might_fault+0x5f/0xb0 [ 115.621174] [<ffffffff815cb51e>] ? verify_iovec+0x5e/0xe0 [ 115.621174] [<ffffffff815bd4b9>] ___sys_sendmsg+0x369/0x380 [ 115.621174] [<ffffffff816faa0d>] ? __do_page_fault+0x11d/0x570 [ 115.621174] [<ffffffff810cfe9f>] ? up_read+0x1f/0x40 [ 115.621174] [<ffffffff816fab04>] ? __do_page_fault+0x214/0x570 [ 115.621174] [<ffffffff8120a10b>] ? mntput_no_expire+0x6b/0x1c0 [ 115.621174] [<ffffffff8120a0b7>] ? mntput_no_expire+0x17/0x1c0 [ 115.621174] [<ffffffff8120a284>] ? mntput+0x24/0x40 [ 115.621174] [<ffffffff815bdbb2>] __sys_sendmsg+0x42/0x80 [ 115.621174] [<ffffffff815bdc02>] SyS_sendmsg+0x12/0x20 [ 115.621174] [<ffffffff816ffd69>] system_call_fastpath+0x16/0x1b Fix this by correctly providing macvlan lockdep class. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-16 22:14:49 -04:00
..
accessibility
acpi	Merge branches 'acpi-ec' and 'acpi-processor'	2014-05-03 00:20:31 +02:00
amba	ARM: SoC: driver changes	2014-04-05 15:37:40 -07:00
ata	Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2014-04-24 09:57:02 -07:00
atm	atm: idt77105: Use del_timer_sync() in exit path	2014-03-25 21:06:02 -04:00
auxdisplay
base	drivercore: deferral race condition fix	2014-04-29 15:44:05 +01:00
bcma	bcma: gpio: register 32 GPIOs on BCM5357	2014-03-27 14:20:04 -04:00
block	floppy: don't write kernel-only members to FDRAWCMD ioctl output	2014-05-05 07:46:56 -07:00
bluetooth	Bluetooth: Add support for Lite-on [04ca:3007]	2014-04-25 09:47:16 +03:00
bus	ARM: SoC: driver changes	2014-04-05 15:37:40 -07:00
cdrom
char	TTY/Serial driver fixes for 3.15-rc2	2014-04-18 16:57:53 -07:00
clk	vexpress: Initialise the sysregs before setting up the clocks	2014-05-04 11:35:29 +01:00
clocksource	Merge branch 'clockevents/3.15-fixes' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent	2014-04-29 19:26:58 +02:00
connector	net: Use netlink_ns_capable to verify the permisions of netlink messages	2014-04-24 13:44:54 -04:00
cpufreq	cpufreq: ppc-corenet-cpufreq: Fix __udivdi3 modpost error	2014-04-29 01:28:17 +02:00
cpuidle	Merge branch 'pm-cpuidle'	2014-04-08 13:27:40 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2014-04-03 09:28:16 -07:00
dca
devfreq
dio
dma	dma: fix eDMA driver as a subsys_initcall	2014-04-16 12:03:47 +05:30
edac	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-04-04 09:50:07 -07:00
eisa
extcon
firewire
firmware	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-04-11 11:58:33 -07:00
fmc
gpio	A few fixes for the GPIO tree:	2014-04-22 09:28:02 -07:00
gpu	drm/exynos: use %pad for dma_addr_t	2014-04-30 09:48:54 +10:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2014-04-18 10:31:34 -07:00
hsi
hv	Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts	2014-04-16 14:14:07 -07:00
hwmon	Revert "hwmon: (coretemp) Refine TjMax detection"	2014-05-01 04:07:52 -07:00
hwspinlock
i2c	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2014-04-09 08:45:40 -07:00
ide
idle	intel_idle: fix IVT idle state table setting	2014-04-21 23:36:07 +02:00
iio	iio: adc: Nothing in ADC should be a bool CONFIG	2014-04-26 11:22:16 +01:00
infiniband	IB/mlx4: Invoke UPDATE_QP for proxy QP1 on MAC changes	2014-05-16 15:12:45 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2014-04-23 07:48:03 -07:00
iommu	Merge git://git.infradead.org/iommu-2.6 into iommu/fixes	2014-04-16 16:09:40 +02:00
ipack
irqchip	mvebu irqchip ifxes for v3.15	2014-04-29 19:23:22 +02:00
isdn	hisax/icc: add missing semicolon after label	2014-04-22 21:22:47 -04:00
leds	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds	2014-04-10 09:06:10 -07:00
lguest	drivers/lguest/page_tables.c: rename do_set_pte()	2014-04-07 16:35:52 -07:00
macintosh
mailbox
mcb	drivers: mcb: fix memory leak in chameleon_parse_cells() error path	2014-04-16 12:28:47 -07:00
md	A few dm-thinp fixes for changes merged in 3.15-rc1.	2014-05-02 14:14:02 -07:00
media	platform: Fix timberdale dependencies	2014-04-16 11:57:27 +05:30
memory
memstick
message	PCI changes for the v3.15 merge window:	2014-04-01 15:14:04 -07:00
mfd	MMC highlights for 3.15:	2014-04-09 08:39:39 -07:00
misc	misc: Grammar s/addition/additional/	2014-04-16 12:28:47 -07:00
mmc	MMC highlights for 3.15:	2014-04-09 08:39:39 -07:00
mtd	UBI: avoid workqueue format string leak	2014-05-05 09:31:33 +03:00
net	macvlan: Fix lockdep warnings with stacked macvlan devices	2014-05-16 22:14:49 -04:00
nfc
ntb	ntb: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-04-07 10:59:20 -07:00
nubus
of	of/irq: do irq resolution in platform_get_irq	2014-04-24 21:40:22 +01:00
oprofile
parisc
parport
pci	PCI: tegra: Use new OF interrupt mapping when possible	2014-04-16 10:24:32 -06:00
pcmcia	PCI changes for the v3.15 merge window:	2014-04-01 15:14:04 -07:00
phy	phy: fix kernel oops in phy_lookup()	2014-04-24 12:53:38 -07:00
pinctrl	sh-pfc: r8a7791: Fix definition of MOD_SEL3	2014-04-23 16:09:53 +02:00
platform	alienware-wmi: cover some scenarios where memory allocations would fail	2014-04-10 12:11:56 -04:00
pnp	PNP / ACPI: Do not return errors if _DIS or _SRS are not present	2014-04-30 22:36:33 +02:00
power	power/reset: vexpress: Fix restart/power off operation	2014-04-24 17:20:50 +01:00
powercap	CPU hotplug notifiers registration fixes for 3.15-rc1	2014-04-07 14:55:46 -07:00
pps
ps3
ptp	ptp: fix kconfig dependency warnings	2014-05-12 00:27:26 -04:00
pwm	Shiraz has moved	2014-04-18 16:40:08 -07:00
rapidio	rapidio: rework device hierarchy and introduce mport class of devices	2014-04-07 16:36:07 -07:00
regulator	regulator: pbias: Convert to use regmap helper functions	2014-04-14 22:16:25 +01:00
remoteproc
reset	Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers	2014-03-27 01:28:19 +01:00
rpmsg
rtc	ARM: SoC: driver changes	2014-04-05 15:37:40 -07:00
s390	s390/chsc: fix SEI usage on old FW levels	2014-04-17 12:46:28 +02:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-05 15:59:46 -07:00
sfi
sh	ARM: SoC: sh driver changes	2014-04-05 15:38:41 -07:00
sn
spi	Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bfin5xx', 'spi/fix/hspi' and 'spi/fix/sirf' into spi-linus	2014-04-23 13:50:18 +01:00
spmi
ssb
staging	Second set of fixes for IIO in the 3.15 cycle.	2014-04-30 14:19:23 -07:00
target	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-04-12 17:31:22 -07:00
tc
thermal	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2014-04-10 09:15:46 -07:00
tty	tty: Fix lockless tty buffer race	2014-05-03 18:14:28 -04:00
uio
usb	USB: Nokia 5300 should be treated as unusual dev	2014-05-03 19:41:07 -04:00
uwb	uwb: don't call spin_unlock_irq in a USB completion handler	2014-04-24 12:45:40 -07:00
vfio	VFIO updates for v3.15 include:	2014-04-03 14:05:02 -07:00
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-04-12 16:51:08 -07:00
video	video: Kconfig: move drm and fb into separate menus	2014-04-17 08:10:20 +03:00
virt
virtio
vlynq
vme	vme_tsi148: Utilize to_pci_dev() macro	2014-04-16 14:08:37 -07:00
w1	w1: avoid recursive device_add	2014-04-16 14:07:51 -07:00
watchdog	CPU hotplug notifiers registration fixes for 3.15-rc1	2014-04-07 14:55:46 -07:00
xen	Xen regression and bug fixes for 3.15-rc1.	2014-04-17 10:54:07 -07:00
zorro
Kconfig
Makefile	video: move fbdev to drivers/video/fbdev	2014-04-17 08:10:19 +03:00