]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 30 Nov 2011 03:51:44 +0000 (14:51 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
Stephen Rothwell [Wed, 30 Nov 2011 03:50:18 +0000 (14:50 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:48:53 +0000 (14:48 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:43:32 +0000 (14:43 +1100)]
Merge remote-tracking branch 'tmem/tmem'
Conflicts:
mm/swapfile.c
Stephen Rothwell [Wed, 30 Nov 2011 03:41:55 +0000 (14:41 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:40:19 +0000 (14:40 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/iio/adc/ad799x_core.c
drivers/staging/iio/industrialio-core.c
Stephen Rothwell [Wed, 30 Nov 2011 03:38:15 +0000 (14:38 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:36:24 +0000 (14:36 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Conflicts:
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
Stephen Rothwell [Wed, 30 Nov 2011 03:30:13 +0000 (14:30 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:28:47 +0000 (14:28 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:27:15 +0000 (14:27 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 03:25:43 +0000 (14:25 +1100)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Wed, 30 Nov 2011 03:24:12 +0000 (14:24 +1100)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Wed, 30 Nov 2011 03:18:12 +0000 (14:18 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Wed, 30 Nov 2011 03:16:48 +0000 (14:16 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Kconfig
Stephen Rothwell [Wed, 30 Nov 2011 03:10:01 +0000 (14:10 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Wed, 30 Nov 2011 03:03:08 +0000 (14:03 +1100)]
Merge remote-tracking branch 'uprobes/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:56:23 +0000 (13:56 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
Stephen Rothwell [Wed, 30 Nov 2011 02:52:32 +0000 (13:52 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:51:04 +0000 (13:51 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:44:17 +0000 (13:44 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
kernel/cgroup_freezer.c
Stephen Rothwell [Wed, 30 Nov 2011 02:41:40 +0000 (13:41 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:41:31 +0000 (13:41 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:35:20 +0000 (13:35 +1100)]
Merge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Wed, 30 Nov 2011 02:33:58 +0000 (13:33 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 30 Nov 2011 02:32:29 +0000 (13:32 +1100)]
Merge remote-tracking branch 'watchdog/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:29:49 +0000 (13:29 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
lib/Makefile
Stephen Rothwell [Wed, 30 Nov 2011 02:23:50 +0000 (13:23 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:22:20 +0000 (13:22 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:20:47 +0000 (13:20 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:19:08 +0000 (13:19 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:17:43 +0000 (13:17 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:17:33 +0000 (13:17 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:16:03 +0000 (13:16 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:14:33 +0000 (13:14 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:13:02 +0000 (13:13 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:11:29 +0000 (13:11 +1100)]
Merge remote-tracking branch 'input/next'
Conflicts:
drivers/input/keyboard/samsung-keypad.c
Stephen Rothwell [Wed, 30 Nov 2011 02:10:03 +0000 (13:10 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 30 Nov 2011 02:09:48 +0000 (13:09 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 30 Nov 2011 02:08:23 +0000 (13:08 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:06:49 +0000 (13:06 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 02:05:17 +0000 (13:05 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:03:49 +0000 (13:03 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:02:18 +0000 (13:02 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 30 Nov 2011 02:00:32 +0000 (13:00 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:54:39 +0000 (12:54 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:50:59 +0000 (12:50 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Conflicts:
drivers/dma/pl330.c
Stephen Rothwell [Wed, 30 Nov 2011 01:49:34 +0000 (12:49 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Wed, 30 Nov 2011 01:48:06 +0000 (12:48 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:46:38 +0000 (12:46 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:45:15 +0000 (12:45 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 30 Nov 2011 01:45:09 +0000 (12:45 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:43:41 +0000 (12:43 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:40:15 +0000 (12:40 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/staging/media/as102/as102_drv.h
Stephen Rothwell [Wed, 30 Nov 2011 01:38:56 +0000 (12:38 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:37:40 +0000 (12:37 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 30 Nov 2011 01:36:18 +0000 (12:36 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Stephen Rothwell [Wed, 30 Nov 2011 01:34:24 +0000 (12:34 +1100)]
Merge commit 'refs/next/
20111128 /hid'
Stephen Rothwell [Wed, 30 Nov 2011 01:25:37 +0000 (12:25 +1100)]
Merge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:24:11 +0000 (12:24 +1100)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:22:55 +0000 (12:22 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:21:22 +0000 (12:21 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:20:02 +0000 (12:20 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:18:43 +0000 (12:18 +1100)]
Merge remote-tracking branch 'logfs/master'
Conflicts:
fs/logfs/file.c
Stephen Rothwell [Wed, 30 Nov 2011 01:17:02 +0000 (12:17 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:16:58 +0000 (12:16 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:15:38 +0000 (12:15 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:14:14 +0000 (12:14 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 30 Nov 2011 01:12:51 +0000 (12:12 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 30 Nov 2011 01:12:21 +0000 (12:12 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:09:50 +0000 (12:09 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:08:29 +0000 (12:08 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:06:38 +0000 (12:06 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:05:12 +0000 (12:05 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Conflicts:
arch/m68k/Kconfig.debug
Stephen Rothwell [Wed, 30 Nov 2011 01:03:45 +0000 (12:03 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 01:02:28 +0000 (12:02 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 30 Nov 2011 01:01:12 +0000 (12:01 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 30 Nov 2011 00:59:22 +0000 (11:59 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:53:59 +0000 (11:53 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:52:34 +0000 (11:52 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:51:18 +0000 (11:51 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
Stephen Rothwell [Wed, 30 Nov 2011 00:49:50 +0000 (11:49 +1100)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h
Stephen Rothwell [Wed, 30 Nov 2011 00:39:07 +0000 (11:39 +1100)]
Merge remote-tracking branch 'at91/at91-next'
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam926x_time.c
arch/arm/mach-at91/at91sam9_alt_reset.S
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/gpio.c
arch/arm/mach-at91/include/mach/at91cap9.h
arch/arm/mach-at91/include/mach/at91sam9260.h
arch/arm/mach-at91/include/mach/at91sam9261.h
arch/arm/mach-at91/include/mach/at91sam9263.h
arch/arm/mach-at91/include/mach/at91sam9g45.h
arch/arm/mach-at91/include/mach/at91sam9rl.h
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-at91/pm.c
arch/arm/mach-at91/setup.c
Stephen Rothwell [Wed, 30 Nov 2011 00:13:48 +0000 (11:13 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Wed, 30 Nov 2011 00:12:27 +0000 (11:12 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c
arch/arm/plat-omap/include/plat/common.h
arch/arm/tools/mach-types
Stephen Rothwell [Wed, 30 Nov 2011 00:11:04 +0000 (11:11 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c
Stephen Rothwell [Wed, 30 Nov 2011 00:05:11 +0000 (11:05 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:35 +0000 (11:01 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:34 +0000 (11:01 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:32 +0000 (11:01 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:30 +0000 (11:01 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:29 +0000 (11:01 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 30 Nov 2011 00:01:25 +0000 (11:01 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Igor Maravic [Fri, 25 Nov 2011 07:44:54 +0000 (07:44 +0000)]
net: Fix skb_update_prio RCU usage.
Change function rcu_dereference to rcu_dereference_bh to avoid warning
[ INFO: suspicious RCU usage. ]
-------------------------------
net/core/dev.c:2459 suspicious rcu_dereference_check() usage!
because we are locking with
rcu_read_lock_bh();
in function dev_queue_xmit(struct sk_buff *skb)
Signed-off-by: Igor Maravic <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>
Guennadi Liakhovetski [Tue, 29 Nov 2011 22:52:07 +0000 (23:52 +0100)]
PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset
Fix the following compalitaion breakage:
In file included from linux/drivers/sh/pm_runtime.c:15:
linux/include/linux/pm_domain.h: In function 'dev_to_genpd':
linux/include/linux/pm_domain.h:142: error: implicit declaration of function 'ERR_PTR'
linux/include/linux/pm_domain.h:142: warning: return makes pointer from integer without a cast
In file included from linux/include/linux/sh_clk.h:10,
from linux/drivers/sh/pm_runtime.c:19:
linux/include/linux/err.h: At top level:
linux/include/linux/err.h:22: error: conflicting types for 'ERR_PTR'
linux/include/linux/pm_domain.h:142: note: previous implicit declaration of 'ERR_PTR' was here
make[3]: *** [drivers/sh/pm_runtime.o] Error 1
Reported-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Wolfram Sang [Wed, 23 Nov 2011 14:57:06 +0000 (15:57 +0100)]
mtd: gpmi: add missing include 'module.h'
Fixes:
drivers/mtd/nand/gpmi-nand/gpmi-nand.c: In function 'gpmi_nfc_init':
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1475:16: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1475:16: note: each undeclared identifier is reported only once for each function it appears in
drivers/mtd/nand/gpmi-nand/gpmi-nand.c: At top level:
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:15: error: expected declaration specifiers or '...' before string constant
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:1: warning: data definition has no type or storage class
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'
and some more...
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@intel.com>
Paul Moore [Tue, 29 Nov 2011 10:10:54 +0000 (10:10 +0000)]
netlabel: Fix build problems when IPv6 is not enabled
A recent fix to the the NetLabel code caused build problem with
configurations that did not have IPv6 enabled; see below:
netlabel_kapi.c: In function 'netlbl_cfg_unlbl_map_add':
netlabel_kapi.c:165:4:
error: implicit declaration of function 'netlbl_af6list_add'
This patch fixes this problem by making the IPv6 specific code conditional
on the IPv6 configuration flags as we done in the rest of NetLabel and the
network stack as a whole. We have to move some variable declarations
around as a result so things may not be quite as pretty, but at least it
builds cleanly now.
Some additional IPv6 conditionals were added to the NetLabel code as well
for the sake of consistency.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Roland Dreier [Tue, 29 Nov 2011 21:37:18 +0000 (13:37 -0800)]
Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next
Eric Dumazet [Tue, 29 Nov 2011 21:31:23 +0000 (22:31 +0100)]
IB: Fix RCU lockdep splats
Commit
f2c31e32b37 ("net: fix NULL dereferences in check_peer_redir()")
forgot to take care of infiniband uses of dst neighbours.
Many thanks to Marc Aurele who provided a nice bug report and feedback.
Reported-by: Marc Aurele La France <tsi@ualberta.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: David Miller <davem@davemloft.net>
CC: Roland Dreier <roland@kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Mike Marciniszyn [Mon, 21 Nov 2011 13:43:54 +0000 (08:43 -0500)]
IB/ipoib: Prevent hung task or softlockup processing multicast response
This following can occur with ipoib when processing a multicast reponse:
BUG: soft lockup - CPU#0 stuck for 67s! [ib_mad1:982]
Modules linked in: ...
CPU 0:
Modules linked in: ...
Pid: 982, comm: ib_mad1 Not tainted 2.6.32-131.0.15.el6.x86_64 #1 ProLiant DL160 G5
RIP: 0010:[<
ffffffff814ddb27 >] [<
ffffffff814ddb27 >] _spin_unlock_irqrestore+0x17/0x20
RSP: 0018:
ffff8802119ed860 EFLAGS:
00000246
0000000000000004 RBX:
ffff8802119ed860 RCX:
000000000000a299
RDX:
ffff88021086c700 RSI:
0000000000000246 RDI:
0000000000000246
RBP:
ffffffff8100bc8e R08:
ffff880210ac229c R09:
0000000000000000
R10:
ffff88021278aab8 R11:
0000000000000000 R12:
ffff8802119ed860
R13:
ffffffff8100be6e R14:
0000000000000001 R15:
0000000000000003
FS:
0000000000000000 (0000) GS:
ffff880028200000 (0000) knlGS:
0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0:
000000008005003b
CR2:
00000000006d4840 CR3:
0000000209aa5000 CR4:
00000000000406f0
DR0:
0000000000000000 DR1:
0000000000000000 DR2:
0000000000000000
DR3:
0000000000000000 DR6:
00000000ffff0ff0 DR7:
0000000000000400
Call Trace:
[<
ffffffffa032c247 >] ? ipoib_mcast_send+0x157/0x480 [ib_ipoib]
[<
ffffffff8100bc8e >] ? apic_timer_interrupt+0xe/0x20
[<
ffffffff8100bc8e >] ? apic_timer_interrupt+0xe/0x20
[<
ffffffffa03283d4 >] ? ipoib_path_lookup+0x124/0x2d0 [ib_ipoib]
[<
ffffffffa03286fc >] ? ipoib_start_xmit+0x17c/0x430 [ib_ipoib]
[<
ffffffff8141e758 >] ? dev_hard_start_xmit+0x2c8/0x3f0
[<
ffffffff81439d0a >] ? sch_direct_xmit+0x15a/0x1c0
[<
ffffffff81423098 >] ? dev_queue_xmit+0x388/0x4d0
[<
ffffffffa032d6b7 >] ? ipoib_mcast_join_finish+0x2c7/0x510 [ib_ipoib]
[<
ffffffffa032dab8 >] ? ipoib_mcast_sendonly_join_complete+0x1b8/0x1f0 [ib_ipoib]
[<
ffffffffa02a0946 >] ? mcast_work_handler+0x1a6/0x710 [ib_sa]
[<
ffffffffa015f01e >] ? ib_send_mad+0xfe/0x3c0 [ib_mad]
[<
ffffffffa00f6c93 >] ? ib_get_cached_lmc+0xa3/0xb0 [ib_core]
[<
ffffffffa02a0f9b >] ? join_handler+0xeb/0x200 [ib_sa]
[<
ffffffffa029e4fc >] ? ib_sa_mcmember_rec_callback+0x5c/0xa0 [ib_sa]
[<
ffffffffa029e79c >] ? recv_handler+0x3c/0x70 [ib_sa]
[<
ffffffffa01603a4 >] ? ib_mad_completion_handler+0x844/0x9d0 [ib_mad]
[<
ffffffffa015fb60 >] ? ib_mad_completion_handler+0x0/0x9d0 [ib_mad]
[<
ffffffff81088830 >] ? worker_thread+0x170/0x2a0
[<
ffffffff8108e160 >] ? autoremove_wake_function+0x0/0x40
[<
ffffffff810886c0 >] ? worker_thread+0x0/0x2a0
[<
ffffffff8108ddf6 >] ? kthread+0x96/0xa0
[<
ffffffff8100c1ca >] ? child_rip+0xa/0x20
Coinciding with stack trace is the following message:
ib0: ib_address_create failed
The code below in ipoib_mcast_join_finish() will note the above
failure in the address handle but otherwise continue:
ah = ipoib_create_ah(dev, priv->pd, &av);
if (!ah) {
ipoib_warn(priv, "ib_address_create failed\n");
} else {
The while loop at the bottom of ipoib_mcast_join_finish() will attempt
to send queued multicast packets in mcast->pkt_queue and eventually
end up in ipoib_mcast_send():
if (!mcast->ah) {
if (skb_queue_len(&mcast->pkt_queue) < IPOIB_MAX_MCAST_QUEUE)
skb_queue_tail(&mcast->pkt_queue, skb);
else {
++dev->stats.tx_dropped;
dev_kfree_skb_any(skb);
}
My read is that the code will requeue the packet and return to the
ipoib_mcast_join_finish() while loop and the stage is set for the
"hung" task diagnostic as the while loop never sees a non-NULL ah, and
will do nothing to resolve.
There are GFP_ATOMIC allocates in the provider routines, so this is
possible and should be dealt with.
The test that induced the failure is associated with a host SM on the
same server during a shutdown.
This patch causes ipoib_mcast_join_finish() to exit with an error
which will flush the queued mcast packets. Nothing is done to unwind
the QP attached state so that subsequent sends from above will retry
the join.
Reviewed-by: Ram Vepa <ram.vepa@qlogic.com>
Reviewed-by: Gary Leshner <gary.leshner@qlogic.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>