Rakesh Pandit 82b057caef nvme-pci: fix multiple ctrl removal scheduling ... Commit c5f6ce97c1 tries to address multiple resets but fails as work_busy doesn't involve any synchronization and can fail. This is reproducible easily as can be seen by WARNING below which is triggered with line: WARN_ON(dev->ctrl.state == NVME_CTRL_RESETTING) Allowing multiple resets can result in multiple controller removal as well if different conditions inside nvme_reset_work fail and which might deadlock on device_release_driver. [ 480.327007] WARNING: CPU: 3 PID: 150 at drivers/nvme/host/pci.c:1900 nvme_reset_work+0x36c/0xec0 [ 480.327008] Modules linked in: rfcomm fuse nf_conntrack_netbios_ns nf_conntrack_broadcast... [ 480.327044] btusb videobuf2_core ghash_clmulni_intel snd_hwdep cfg80211 acer_wmi hci_uart.. [ 480.327065] CPU: 3 PID: 150 Comm: kworker/u16:2 Not tainted 4.12.0-rc1+ #13 [ 480.327065] Hardware name: Acer Predator G9-591/Mustang_SLS, BIOS V1.10 03/03/2016 [ 480.327066] Workqueue: nvme nvme_reset_work [ 480.327067] task: ffff880498ad8000 task.stack: ffffc90002218000 [ 480.327068] RIP: 0010:nvme_reset_work+0x36c/0xec0 [ 480.327069] RSP: 0018:ffffc9000221bdb8 EFLAGS: 00010246 [ 480.327070] RAX: 0000000000460000 RBX: ffff880498a98128 RCX: dead000000000200 [ 480.327070] RDX: 0000000000000001 RSI: ffff8804b1028020 RDI: ffff880498a98128 [ 480.327071] RBP: ffffc9000221be50 R08: 0000000000000000 R09: 0000000000000000 [ 480.327071] R10: ffffc90001963ce8 R11: 000000000000020d R12: ffff880498a98000 [ 480.327072] R13: ffff880498a53500 R14: ffff880498a98130 R15: ffff880498a98128 [ 480.327072] FS: 0000000000000000(0000) GS:ffff8804c1cc0000(0000) knlGS:0000000000000000 [ 480.327073] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 480.327074] CR2: 00007ffcf3c37f78 CR3: 0000000001e09000 CR4: 00000000003406e0 [ 480.327074] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 480.327075] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 480.327075] Call Trace: [ 480.327079] ? __switch_to+0x227/0x400 [ 480.327081] process_one_work+0x18c/0x3a0 [ 480.327082] worker_thread+0x4e/0x3b0 [ 480.327084] kthread+0x109/0x140 [ 480.327085] ? process_one_work+0x3a0/0x3a0 [ 480.327087] ? kthread_park+0x60/0x60 [ 480.327102] ret_from_fork+0x2c/0x40 [ 480.327103] Code: e8 5a dc ff ff 85 c0 41 89 c1 0f..... This patch addresses the problem by using state of controller to decide whether reset should be queued or not as state change is synchronizated using controller spinlock. Also cancel_work_sync is used to make sure remove cancels the reset_work and waits for it to finish. This patch also changes return value from -ENODEV to more appropriate -EBUSY if nvme_reset fails to change state. Fixes: c5f6ce97c1 ("nvme: don't schedule multiple resets") Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de>		2017-06-07 11:08:50 +02:00
..
accessibility	…
acpi	Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-27 09:06:43 -07:00
amba	…
android	…
ata	ARM: SoC driver updates	2017-05-09 10:01:15 -07:00
atm	…
auxdisplay	…
base	Merge branches 'pm-sleep' and 'powercap'	2017-05-22 20:32:05 +02:00
bcma	…
block	A small fix for rbd FALLOC_FL_ZERO_RANGE/PUNCH_HOLE handling breakage	2017-06-02 12:03:07 -07:00
bluetooth	Bluetooth: hci_ldisc: Add protocol check to hci_uart_tx_wakeup()	2017-04-30 12:22:14 +02:00
bus	…
cdrom	…
char	drivers: char: mem: Check for address space wraparound with mmap()	2017-05-18 16:53:55 +02:00
clk	Sort of on the quieter side this time, which is probably due more	2017-05-10 13:38:18 -07:00
clocksource	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-12 10:43:25 -07:00
connector	…
cpufreq	Merge branches 'intel_pstate', 'pm-cpufreq' and 'pm-cpufreq-sched'	2017-05-22 20:28:22 +02:00
cpuidle	Merge branches 'pm-domains', 'pm-cpuidle', 'pm-sleep' and 'powercap'	2017-05-09 23:21:46 +02:00
crypto	virtio: fixes, cleanups, performance	2017-05-10 11:33:08 -07:00
dax	dax: fix false CONFIG_BLOCK dependency	2017-05-13 16:18:21 -07:00
dca	…
devfreq	…
dio	…
dma	dmaengine: pl330: fix warning in pl330_remove	2017-06-02 11:49:44 +05:30
dma-buf	…
edac	EDAC, amd64: Fix reporting of Chip Select sizes on Fam17h	2017-05-03 16:27:36 +02:00
eisa	…
extcon	…
firewire	…
firmware	Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-06-02 08:51:53 -07:00
fmc	…
fpga	fpga fr br: update supported version numbers	2017-04-26 11:38:56 +02:00
fsi	…
gpio	Annotation of module parameters that specify device settings	2017-05-10 19:13:03 -07:00
gpu	DP quirk for usb c dongles	2017-06-02 11:32:38 -07:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2017-06-02 09:23:56 -07:00
hsi	…
hv	char/misc patches for 4.12-rc1	2017-05-04 19:15:35 -07:00
hwmon	hwmon: (coretemp) Handle frozen hotplug state correctly	2017-05-14 07:49:32 -07:00
hwspinlock	…
hwtracing	drivers/hwtracing/intel_th/msu.c: use set_memory.h header	2017-05-08 17:15:14 -07:00
i2c	i2c: designware: Fix bogus sda_hold_time due to uninitialized vars	2017-05-22 19:22:19 -07:00
ide	ide: don't call memcpy with the same source and destination	2017-05-08 17:36:39 -04:00
idle	x86/intel_idle: add Gemini Lake support	2017-05-01 23:17:37 +02:00
iio	Annotation of module parameters that specify device settings	2017-05-10 19:13:03 -07:00
infiniband	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2017-05-12 11:44:13 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2017-05-26 16:45:13 -07:00
iommu	iommu/mediatek: Include linux/dma-mapping.h	2017-05-17 14:51:54 +02:00
ipack	…
irqchip	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-21 11:45:26 -07:00
isdn	Annotation of module parameters that specify device settings	2017-05-10 19:13:03 -07:00
leds	leds: pca955x: Correct I2C Functionality	2017-05-22 21:12:44 +02:00
lguest	…
lightnvm	lightnvm: fix bad back free on error path	2017-05-04 07:53:04 -06:00
macintosh	DeviceTree for 4.12:	2017-05-05 19:33:07 -07:00
mailbox	mailbox: handle empty message in tx_tick	2017-04-27 16:20:04 +05:30
mcb	…
md	- a DM verity fix for a mode when no salt is used	2017-06-02 11:50:37 -07:00
media	mtk-vcodec: Use designated initializers	2017-05-28 10:23:02 -07:00
memory	memory: omap-gpmc: Fix debug output for access width	2017-05-16 08:12:47 -07:00
memstick	…
message	scsi: mpt: Move scsi_remove_host() out of mptscsih_remove_host()	2017-04-24 18:21:17 -04:00
mfd	mfd: axp20x: Support AXP803 variant	2017-04-27 11:54:49 +01:00
misc	sgi-xp: Use designated initializers	2017-05-28 10:22:42 -07:00
mmc	This pull request contains fixes to make the WiFi work again for the ARM64	2017-05-26 09:05:35 -07:00
mtd	This pull request contains updates for both UBI and UBIFS:	2017-05-13 10:23:12 -07:00
net	net: ethernet: ax88796: don't call free_irq without request_irq first	2017-05-26 14:55:38 -04:00
nfc	…
ntb	…
nubus	…
nvdimm	Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm	2017-05-12 15:43:10 -07:00
nvme	nvme-pci: fix multiple ctrl removal scheduling	2017-06-07 11:08:50 +02:00
nvmem	ARM: SoC driver updates	2017-05-09 10:01:15 -07:00
of	MMC host:	2017-05-24 08:21:56 -07:00
oprofile	…
parisc	…
parport	…
pci	PCI/PM: Add needs_resume flag to avoid suspend complete optimization	2017-05-23 14:18:17 -05:00
pcmcia	Annotation of module parameters that specify device settings	2017-05-10 19:13:03 -07:00
perf	drivers/perf: arm_pmu_acpi: avoid perf IRQ init when guest PMU is off	2017-05-30 12:40:03 +01:00
phy	…
pinctrl	pinctrl: sunxi: Fix SPDIF function name for A83T	2017-05-23 11:31:27 +02:00
platform	char/misc patches for 4.12-rc1	2017-05-04 19:15:35 -07:00
pnp	…
power	power supply and reset changes for the v4.12 series (part 2)	2017-05-12 12:02:21 -07:00
powercap	PowerCap: Fix an error code in powercap_register_zone()	2017-05-14 13:30:05 +02:00
pps	…
ps3	…
ptp	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-01 16:15:18 -07:00
pwm	…
rapidio	char/misc patches for 4.12-rc1	2017-05-04 19:15:35 -07:00
ras	…
regulator	Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next	2017-04-30 22:17:44 +09:00
remoteproc	virtio: fixes, cleanups, performance	2017-05-10 11:33:08 -07:00
reset	ARM: SoC driver updates	2017-05-09 10:01:15 -07:00
rpmsg	virtio: fixes, cleanups, performance	2017-05-10 11:33:08 -07:00
rtc	Merge branches 'pm-sleep' and 'powercap'	2017-05-22 20:32:05 +02:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-05-16 09:24:44 -07:00
sbus	…
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2017-06-01 10:40:41 -07:00
sfi	…
sh	…
sn	…
soc	ARM: SoC fixes (and a cross-arch dt-include fix)	2017-05-19 13:36:56 -07:00
spi	Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next	2017-04-26 15:58:22 +01:00
spmi	…
ssb	…
staging	staging: fsl-dpaa2/eth: add ETHERNET dependency	2017-05-16 14:23:31 +02:00
target	iscsi-target: Always wait for kthread_should_stop() before kthread exit	2017-05-31 15:12:57 -07:00
tc	…
tee	Linux 4.12-rc1	2017-05-18 23:54:47 -07:00
thermal	thermal: broadcom: ns-thermal: default on iProc SoCs	2017-05-23 20:09:34 -07:00
thunderbolt	…
tty	serial: altera_uart: call iounmap() at driver remove	2017-05-25 14:36:37 +02:00
uio	uio: fix incorrect memory leak cleanup	2017-05-16 23:06:41 +02:00
usb	USB-serial fixes for v4.12-rc2	2017-05-19 10:10:07 +02:00
uwb	uwb: fix device quirk on big-endian hosts	2017-05-17 11:27:41 +02:00
vfio	powerpc updates for 4.12 part 1.	2017-05-05 11:36:44 -07:00
vhost	mm: support __GFP_REPEAT in kvmalloc_node for >32kB	2017-05-08 17:15:12 -07:00
video	fbdev changes for v4.12:	2017-05-11 11:12:26 -07:00
virt	drivers/virt/fsl_hypervisor.c: use get_user_pages_unlocked()	2017-05-08 17:15:10 -07:00
virtio	virtio: allow extra context per descriptor	2017-05-02 23:41:43 +03:00
vlynq	…
vme	…
w1	…
watchdog	watchdog: bcm281xx: Fix use of uninitialized spinlock.	2017-05-19 10:42:25 +02:00
xen	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-05-09 09:12:53 -07:00
zorro	…
Kconfig	…
Makefile	Merge branch 'tee/initial-merge' into fixes	2017-05-10 21:03:31 +02:00