Kim Phillips 4a90507713 crypto: caam - fix possible deadlock condition ... commit "crypto: caam - use non-irq versions of spinlocks for job rings" made two bad assumptions: (a) The caam_jr_enqueue lock isn't used in softirq context. Not true: jr_enqueue can be interrupted by an incoming net interrupt and the received packet may be sent for encryption, via caam_jr_enqueue in softirq context, thereby inducing a deadlock. This is evidenced when running netperf over an IPSec tunnel between two P4080's, with spinlock debugging turned on: [ 892.092569] BUG: spinlock lockup on CPU#7, netperf/10634, e8bf5f70 [ 892.098747] Call Trace: [ 892.101197] [eff9fc10] [c00084c0] show_stack+0x48/0x15c (unreliable) [ 892.107563] [eff9fc50] [c0239c2c] do_raw_spin_lock+0x16c/0x174 [ 892.113399] [eff9fc80] [c0596494] _raw_spin_lock+0x3c/0x50 [ 892.118889] [eff9fc90] [c0445e74] caam_jr_enqueue+0xf8/0x250 [ 892.124550] [eff9fcd0] [c044a644] aead_decrypt+0x6c/0xc8 [ 892.129625] BUG: spinlock lockup on CPU#5, swapper/5/0, e8bf5f70 [ 892.129629] Call Trace: [ 892.129637] [effa7c10] [c00084c0] show_stack+0x48/0x15c (unreliable) [ 892.129645] [effa7c50] [c0239c2c] do_raw_spin_lock+0x16c/0x174 [ 892.129652] [effa7c80] [c0596494] _raw_spin_lock+0x3c/0x50 [ 892.129660] [effa7c90] [c0445e74] caam_jr_enqueue+0xf8/0x250 [ 892.129666] [effa7cd0] [c044a644] aead_decrypt+0x6c/0xc8 [ 892.129674] [effa7d00] [c0509724] esp_input+0x178/0x334 [ 892.129681] [effa7d50] [c0519778] xfrm_input+0x77c/0x818 [ 892.129688] [effa7da0] [c050e344] xfrm4_rcv_encap+0x20/0x30 [ 892.129697] [effa7db0] [c04b90c8] ip_local_deliver+0x190/0x408 [ 892.129703] [effa7de0] [c04b966c] ip_rcv+0x32c/0x898 [ 892.129709] [effa7e10] [c048b998] __netif_receive_skb+0x27c/0x4e8 [ 892.129715] [effa7e80] [c048d744] netif_receive_skb+0x4c/0x13c [ 892.129726] [effa7eb0] [c03c28ac] _dpa_rx+0x1a8/0x354 [ 892.129732] [effa7ef0] [c03c2ac4] ingress_rx_default_dqrr+0x6c/0x108 [ 892.129742] [effa7f10] [c0467ae0] qman_poll_dqrr+0x170/0x1d4 [ 892.129748] [effa7f40] [c03c153c] dpaa_eth_poll+0x20/0x94 [ 892.129754] [effa7f60] [c048dbd0] net_rx_action+0x13c/0x1f4 [ 892.129763] [effa7fa0] [c003d1b8] __do_softirq+0x108/0x1b0 [ 892.129769] [effa7ff0] [c000df58] call_do_softirq+0x14/0x24 [ 892.129775] [ebacfe70] [c0004868] do_softirq+0xd8/0x104 [ 892.129780] [ebacfe90] [c003d5a4] irq_exit+0xb8/0xd8 [ 892.129786] [ebacfea0] [c0004498] do_IRQ+0xa4/0x1b0 [ 892.129792] [ebacfed0] [c000fad8] ret_from_except+0x0/0x18 [ 892.129798] [ebacff90] [c0009010] cpu_idle+0x94/0xf0 [ 892.129804] [ebacffb0] [c059ff88] start_secondary+0x42c/0x430 [ 892.129809] [ebacfff0] [c0001e28] __secondary_start+0x30/0x84 [ 892.281474] [ 892.282959] [eff9fd00] [c0509724] esp_input+0x178/0x334 [ 892.288186] [eff9fd50] [c0519778] xfrm_input+0x77c/0x818 [ 892.293499] [eff9fda0] [c050e344] xfrm4_rcv_encap+0x20/0x30 [ 892.299074] [eff9fdb0] [c04b90c8] ip_local_deliver+0x190/0x408 [ 892.304907] [eff9fde0] [c04b966c] ip_rcv+0x32c/0x898 [ 892.309872] [eff9fe10] [c048b998] __netif_receive_skb+0x27c/0x4e8 [ 892.315966] [eff9fe80] [c048d744] netif_receive_skb+0x4c/0x13c [ 892.321803] [eff9feb0] [c03c28ac] _dpa_rx+0x1a8/0x354 [ 892.326855] [eff9fef0] [c03c2ac4] ingress_rx_default_dqrr+0x6c/0x108 [ 892.333212] [eff9ff10] [c0467ae0] qman_poll_dqrr+0x170/0x1d4 [ 892.338872] [eff9ff40] [c03c153c] dpaa_eth_poll+0x20/0x94 [ 892.344271] [eff9ff60] [c048dbd0] net_rx_action+0x13c/0x1f4 [ 892.349846] [eff9ffa0] [c003d1b8] __do_softirq+0x108/0x1b0 [ 892.355338] [eff9fff0] [c000df58] call_do_softirq+0x14/0x24 [ 892.360910] [e7169950] [c0004868] do_softirq+0xd8/0x104 [ 892.366135] [e7169970] [c003d5a4] irq_exit+0xb8/0xd8 [ 892.371101] [e7169980] [c0004498] do_IRQ+0xa4/0x1b0 [ 892.375979] [e71699b0] [c000fad8] ret_from_except+0x0/0x18 [ 892.381466] [e7169a70] [c0445e74] caam_jr_enqueue+0xf8/0x250 [ 892.387127] [e7169ab0] [c044ad4c] aead_givencrypt+0x6ac/0xa70 [ 892.392873] [e7169b20] [c050a0b8] esp_output+0x2b4/0x570 [ 892.398186] [e7169b80] [c0519b9c] xfrm_output_resume+0x248/0x7c0 [ 892.404194] [e7169bb0] [c050e89c] xfrm4_output_finish+0x18/0x28 [ 892.410113] [e7169bc0] [c050e8f4] xfrm4_output+0x48/0x98 [ 892.415427] [e7169bd0] [c04beac0] ip_local_out+0x48/0x98 [ 892.420740] [e7169be0] [c04bec7c] ip_queue_xmit+0x16c/0x490 [ 892.426314] [e7169c10] [c04d6128] tcp_transmit_skb+0x35c/0x9a4 [ 892.432147] [e7169c70] [c04d6f98] tcp_write_xmit+0x200/0xa04 [ 892.437808] [e7169cc0] [c04c8ccc] tcp_sendmsg+0x994/0xcec [ 892.443213] [e7169d40] [c04eebfc] inet_sendmsg+0xd0/0x164 [ 892.448617] [e7169d70] [c04792f8] sock_sendmsg+0x8c/0xbc [ 892.453931] [e7169e40] [c047aecc] sys_sendto+0xc0/0xfc [ 892.459069] [e7169f10] [c047b934] sys_socketcall+0x110/0x25c [ 892.464729] [e7169f40] [c000f480] ret_from_syscall+0x0/0x3c (b) since the caam_jr_dequeue lock is only used in bh context, then semantically it should use _bh spin_lock types. spin_lock_bh semantics are to disable back-halves, and used when a lock is shared between softirq (bh) context and process and/or h/w IRQ context. Since the lock is only used within softirq context, and this tasklet is atomic, there is no need to do the additional work to disable back halves. This patch adds back-half disabling protection to caam_jr_enqueue spin_locks to fix (a), and drops it from caam_jr_dequeue to fix (b). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>		2012-08-01 17:47:31 +08:00
..
accessibility
acpi	Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86	2012-07-30 11:54:53 -07:00
amba	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
ata	ata/pata_arasan: remove conditional compilation of clk code	2012-07-30 17:25:12 -07:00
atm
auxdisplay
base	mm: factor out memory isolate functions	2012-07-31 18:42:45 -07:00
bcma	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2012-07-27 11:15:03 -04:00
block	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
bluetooth
cdrom
char	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
clk	clk: validate pointer in __clk_disable()	2012-07-30 17:25:13 -07:00
clocksource	arm-soc: new SoC support	2012-07-23 16:31:31 -07:00
connector
cpufreq	ARM: arm-soc soc updates, take 2	2012-07-30 09:45:53 -07:00
cpuidle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-07-26 14:28:55 -07:00
crypto	crypto: caam - fix possible deadlock condition	2012-08-01 17:47:31 +08:00
dca
devfreq
dio
dma	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2012-07-24 17:12:54 -07:00
edac	Merge branch 'devel'	2012-07-29 21:11:05 -03:00
eisa
extcon	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
firewire	- Small fixes and optimizations.	2012-07-30 09:32:39 -07:00
firmware	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
gpio	MFD bits for the 3.6 merge window.	2012-07-30 12:41:17 -07:00
gpu	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-07-30 10:06:23 -07:00
hid	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
hsi
hv	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2012-07-30 10:10:26 -07:00
hwspinlock
i2c	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
ide
idle	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-07-26 14:28:55 -07:00
ieee802154
iio
infiniband	Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next	2012-07-30 07:47:27 -07:00
input	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
iommu	IOMMU Updates for Linux v3.6-rc1	2012-07-24 16:24:11 -07:00
isdn	mISDN: Bugfix only few bytes are transfered on a connection	2012-07-29 23:18:30 -07:00
leds	leds-lp8788: forgotten unlock at lp8788_led_work	2012-07-27 08:16:07 +08:00
lguest
macintosh
md	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
memory
memstick
message	drivers/message/i2o/i2o_config.c: bound allocation	2012-07-30 17:25:17 -07:00
mfd	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
misc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
mmc	ARM: SoC fixes	2012-07-26 20:29:52 -07:00
mtd	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
net	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
nfc
nubus
of	Devicetree updates for 3.6	2012-07-24 14:07:22 -07:00
oprofile
parisc	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
parport
pci	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
pcmcia	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
pinctrl	Pin control changes for v3.6:	2012-07-24 14:05:46 -07:00
platform	Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86	2012-07-30 11:54:53 -07:00
pnp
power	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
pps	pps: return PTR_ERR on error in device_create	2012-07-30 17:25:21 -07:00
ps3
ptp
pwm	pwm: pwm-tiehrpwm: PWM driver support for EHRPWM	2012-07-26 07:45:20 +02:00
rapidio
regulator	regulator: Fix an s5m8767 build failure	2012-07-31 00:51:09 +02:00
remoteproc	A batch of remoteproc patches for 3.6:	2012-07-26 16:19:08 -07:00
rpmsg	A batch of remoteproc patches for 3.6:	2012-07-26 16:19:08 -07:00
rtc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-26 18:09:01 -07:00
sbus
scsi	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sfi
sh
sn
spi	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-07-30 11:45:52 -07:00
ssb
staging	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-07-31 18:47:44 -07:00
target	iscsi-target: Drop bogus struct file usage for iSCSI/SCTP	2012-07-21 02:44:13 -07:00
tc
thermal	The tag contains just a few battery-related changes for v3.6. It's is	2012-07-31 18:08:25 -07:00
tty	This patch series contains a major revamp of how we collect entropy	2012-07-31 19:07:42 -07:00
uio
usb	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-31 19:25:39 -07:00
uwb
vfio	vfio: Add PCI device driver	2012-07-31 08:16:24 -06:00
vhost	vhost: make vhost work queue visible	2012-07-22 01:22:23 +03:00
video	Merge branch 'akpm' (Andrew's patch-bomb)	2012-07-30 17:25:34 -07:00
virt
virtio	[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning	2012-07-20 08:59:03 +01:00
vlynq
vme
w1	Driver core merge for 3.6-rc1	2012-07-26 11:25:33 -07:00
watchdog	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
xen	PCI changes for the 3.6 merge window:	2012-07-24 16:17:07 -07:00
zorro
Kconfig	vfio: VFIO core	2012-07-31 08:16:22 -06:00
Makefile	vfio: VFIO core	2012-07-31 08:16:22 -06:00