Chris Wilson d7dc4131eb drm/i915: Don't check #active_requests from i915_gem_wait_for_idle() ... i915_gem_wait_for_idle() is called from inside the shrinker, to ensure that we drain the last resources from the GPU in dire circumstances (OOM). As we may allocate whilst building a request, it is then possible to hit the shrinker with a request under construction, and so we must account for the incomplete request whilst waiting. In particular, we preincrement (in reserve_engine) the i915->gt.active_requests counter and mark the GPU as busy, therefore we can not use that counter for shortcircuiting the wait-for-idle. [ 950.859024] GEM_BUG_ON(i915->gt.active_requests) [ 950.859041] WARNING: CPU: 2 PID: 2178 at drivers/gpu/drm/i915/i915_gem.c:3615 i915_gem_wait_for_idle.part.56+0x166/0x4e0 [ 950.859041] Modules linked in: ccm tun fuse nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 nf_conntrack_ipv6 nf_defrag_ipv6 nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack libcrc32c ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_mangle iptable_security iptable_raw arc4 iwldvm mac80211 snd_hda_codec_hdmi snd_hda_codec_idt snd_hda_codec_generic snd_hda_intel snd_hda_codec btusb snd_hda_core btrtl btbcm iwlwifi snd_hwdep btintel bluetooth snd_seq snd_seq_device snd_pcm ecdh_generic x86_pkg_temp_thermal tpm_infineon coretemp tpm_tis crc32_pclmul wmi_bmof crc32c_intel iTCO_wdt hp_wmi snd_timer iTCO_vendor_support sparse_keymap tpm_tis_core mei_me cfg80211 [ 950.859082] snd joydev tpm mei rfkill pcspkr wmi soundcore lpc_ich hp_accel lis3lv02d input_polldev binfmt_misc e1000e ptp serio_raw pps_core [ 950.859094] CPU: 2 PID: 2178 Comm: gem_exec_nop Tainted: G U 4.15.0-rc2+ #900 [ 950.859102] Hardware name: Hewlett-Packard HP ProBook 6360b/1620, BIOS 68SCF Ver. B.42 12/29/2010 [ 950.859107] task: c5119cb4 task.stack: f3ccb8d8 [ 950.859112] EIP: i915_gem_wait_for_idle.part.56+0x166/0x4e0 [ 950.859113] EFLAGS: 00010296 CPU: 2 [ 950.859114] EAX: 00000024 EBX: f36c1888 ECX: f777a044 EDX: 00000007 [ 950.859115] ESI: f36c1888 EDI: edd53958 EBP: edd53970 ESP: edd53938 [ 950.859116] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 950.859117] CR0: 80050033 CR2: b7f39000 CR3: 2f2b3000 CR4: 000406d0 [ 950.859118] Call Trace: [ 950.859125] ? drm_printk+0x70/0x70 [ 950.859129] i915_gem_wait_for_idle+0x18/0x30 [ 950.859133] i915_gem_shrink+0x360/0x410 [ 950.859138] ? vmpressure+0xa8/0xf0 [ 950.859142] ? ktime_get+0x4a/0x100 [ 950.859147] i915_gem_shrink_all+0x21/0x40 [ 950.859151] i915_gem_shrinker_oom+0x23/0x130 [ 950.859156] notifier_call_chain+0x4e/0x70 [ 950.859160] __blocking_notifier_call_chain+0x2f/0x60 [ 950.859164] blocking_notifier_call_chain+0x11/0x20 [ 950.859169] out_of_memory+0x207/0x280 [ 950.859174] __alloc_pages_nodemask+0xd47/0xe60 [ 950.859179] new_slab+0x32d/0x450 [ 950.859183] ___slab_alloc.constprop.81+0x358/0x4e0 [ 950.859189] ? i915_sw_fence_await_dma_fence+0x53/0x160 [ 950.859193] ? __slab_free+0x1fe/0x310 [ 950.859197] ? native_sched_clock+0x1e/0xc0 [ 950.859201] ? i915_gem_request_alloc+0xcf/0x510 [ 950.859205] ? sched_clock+0x9/0x10 [ 950.859209] __slab_alloc.constprop.80+0x29/0x40 [ 950.859212] ? __slab_alloc.constprop.80+0x29/0x40 [ 950.859216] kmem_cache_alloc_trace+0x160/0x1a0 [ 950.859220] ? i915_sw_fence_await_dma_fence+0x53/0x160 [ 950.859224] i915_sw_fence_await_dma_fence+0x53/0x160 [ 950.859229] i915_gem_request_await_dma_fence+0x1eb/0x390 [ 950.859233] i915_gem_request_await_object+0xee/0x230 [ 950.859239] i915_gem_do_execbuffer+0xc16/0x1200 [ 950.859246] ? irqtime_account_irq+0x3e/0xc0 [ 950.859251] ? irq_exit+0x4f/0xb0 [ 950.859257] ? smp_apic_timer_interrupt+0x5f/0x110 [ 950.859261] ? apic_timer_interrupt+0x35/0x3c [ 950.859266] i915_gem_execbuffer2_ioctl+0x212/0x440 [ 950.859270] ? apic_timer_interrupt+0x35/0x3c [ 950.859274] ? i915_gem_do_execbuffer+0x1200/0x1200 [ 950.859279] ? insn_get_seg_base+0x1b/0x50 [ 950.859283] ? i915_gem_do_execbuffer+0x1200/0x1200 [ 950.859287] drm_ioctl_kernel+0x51/0xa0 [ 950.859291] drm_ioctl+0x2a3/0x350 [ 950.859294] ? i915_gem_do_execbuffer+0x1200/0x1200 [ 950.859300] ? sched_clock+0x9/0x10 [ 950.859303] ? drm_getunique+0x70/0x70 [ 950.859308] do_vfs_ioctl+0x7d/0x640 [ 950.859311] ? native_sched_clock+0x1e/0xc0 [ 950.859315] ? sched_clock+0x9/0x10 [ 950.859319] ? sched_clock_cpu+0x13/0x120 [ 950.859323] SyS_ioctl+0x4e/0x80 [ 950.859326] do_fast_syscall_32+0x75/0x250 [ 950.859331] ? irq_exit+0x4f/0xb0 [ 950.859334] entry_SYSENTER_32+0x47/0x71 [ 950.859338] EIP: 0xb7f81d11 [ 950.859339] EFLAGS: 00000296 CPU: 2 [ 950.859340] EAX: ffffffda EBX: 00000003 ECX: 40406469 EDX: bfde4c20 [ 950.859340] ESI: 00000003 EDI: 40406469 EBP: 00000003 ESP: bfde4b38 [ 950.859341] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b [ 950.859343] Code: e8 30 60 01 00 83 c4 10 83 c3 04 39 f3 75 e0 8b 45 d8 8b 80 14 37 00 00 85 c0 74 13 68 dd 33 e4 c0 68 49 6f e3 c0 e8 4a 55 be ff <0f> ff 5e 5f b8 fe ff ff 3f bb 0a 00 00 00 e8 b7 14 c4 ff 8b 15 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171212132148.8124-1-chris@chris-wilson.co.uk Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>		2017-12-13 11:15:38 +00:00
..
accessibility	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
acpi	Merge branch 'acpi-ec' into acpi	2017-11-30 13:37:29 +01:00
amba	A couple of dma-mapping updates:	2017-11-14 16:54:12 -08:00
android	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
ata	Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata	2017-11-15 14:11:41 -08:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00
auxdisplay	auxdisplay: img-ascii-lcd: Only build on archs that have IOMEM	2017-11-27 12:36:45 -08:00
base	Merge tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next	2017-12-04 05:42:49 +10:00
bcma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-11-15 11:56:19 -08:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2017-12-01 08:05:45 -05:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
bus	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
cdrom	Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block	2017-11-14 15:32:19 -08:00
char	drm/i915: prefer resource_size_t for everything stolen	2017-12-12 12:30:22 +02:00
clk	We have two changes to the core framework this time around. The first being a	2017-11-17 20:04:24 -08:00
clocksource	- final batch of "non trivial" timer conversions (multi-tree dependencies,	2017-11-23 16:29:05 +01:00
connector
cpufreq	cpufreq: mediatek: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE	2017-11-22 00:00:14 +01:00
cpuidle	powerpc updates for 4.15	2017-11-16 12:47:46 -08:00
crypto	powerpc updates for 4.15	2017-11-16 12:47:46 -08:00
dax	device-dax: implement ->split() to catch invalid munmap attempts	2017-11-29 18:40:42 -08:00
dca
devfreq	Merge branches 'pm-devfreq' and 'pm-tools'	2017-11-13 01:41:39 +01:00
dio	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
dma	dmaengine updates for 4.15-rc1	2017-11-14 16:49:31 -08:00
dma-buf	Merge tag 'drm-misc-next-2017-11-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-next	2017-12-04 05:42:49 +10:00
edac	Modules updates for v4.15	2017-11-15 13:46:33 -08:00
eisa	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
extcon	USB/PHY patches for 4.15-rc1	2017-11-13 21:14:07 -08:00
firewire	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-13 17:56:58 -08:00
firmware	drivers/firmware: psci: Convert timers to use timer_setup()	2017-11-21 15:46:44 -08:00
fmc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
fpga	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
fsi
gpio	This is the bulk of pin control changes for the v4.15	2017-11-16 10:57:11 -08:00
gpu	drm/i915: Don't check #active_requests from i915_gem_wait_for_idle()	2017-12-13 11:15:38 +00:00
hid	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
hsi	HSI changes for the v4.15 series	2017-11-15 13:35:43 -08:00
hv	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
hwmon	hwmon: (jc42) optionally try to disable the SMBUS timeout	2017-11-30 13:12:44 -08:00
hwspinlock	hwspinlock update for v4.15	2017-11-17 20:16:20 -08:00
hwtracing	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
i2c	i2c: i2c-boardinfo: fix memory leaks on devinfo	2017-11-27 19:14:29 +01:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide	2017-11-19 08:04:41 -10:00
idle	Merge branch 'pm-cpuidle'	2017-11-13 01:34:14 +01:00
iio	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
infiniband	IB/core: disable memory registration of filesystem-dax vmas	2017-11-29 18:40:42 -08:00
input	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
iommu	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
ipack
irqchip	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-26 14:39:20 -08:00
isdn	treewide: setup_timer() -> timer_setup() (2 field)	2017-11-21 15:57:09 -08:00
leds	LED updates for 4.15rc1	2017-11-14 18:09:31 -08:00
lightnvm	lightnvm: Convert timers to use timer_setup()	2017-11-21 15:46:44 -08:00
macintosh	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-13 17:56:58 -08:00
mailbox	Change to POLL api and fixes for FlexRM and OMAP driver	2017-11-15 13:39:18 -08:00
mcb	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
md	bcache: check return value of register_shrinker	2017-11-24 16:23:01 -07:00
media	v4l: vsp1: Start and stop DRM pipeline independently of planes	2017-12-04 13:04:11 +02:00
memory	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
memstick	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
message	Modules updates for v4.15	2017-11-15 13:46:33 -08:00
mfd	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
misc	Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2017-12-03 10:48:24 -05:00
mmc	MMC core:	2017-12-01 08:14:22 -05:00
mtd	Rename superblock flags (MS_xyz -> SB_xyz)	2017-11-27 13:05:09 -08:00
mux
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-29 13:10:25 -08:00
nfc	treewide: setup_timer() -> timer_setup() (2 field)	2017-11-21 15:57:09 -08:00
ntb	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
nubus	m68k updates for 4.15	2017-11-13 12:10:24 -08:00
nvdimm	libnvdimm for 4.15	2017-11-17 09:51:57 -08:00
nvme	nvme-pci: fix NULL pointer dereference in nvme_free_host_mem()	2017-11-28 08:49:26 -08:00
nvmem	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
of	DeviceTree fixes for 4.15:	2017-11-20 21:38:41 -10:00
opp
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
parisc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
parport	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
pci	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-26 14:11:54 -08:00
pcmcia	drivers/pcmcia/sa1111_badge4.c: avoid unused function warning	2017-11-17 16:10:04 -08:00
perf	arm64 updates for 4.15	2017-11-15 10:56:56 -08:00
phy	USB/PHY patches for 4.15-rc1	2017-11-13 21:14:07 -08:00
pinctrl	This is the bulk of pin control changes for the v4.15	2017-11-16 10:57:11 -08:00
platform	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-25 08:37:16 -10:00
pnp	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
power	power supply and reset changes for the v4.15 series	2017-11-15 13:37:15 -08:00
powercap
pps	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
ps3
ptp	xen: features and fixes for v4.15-rc1	2017-11-16 13:06:27 -08:00
pwm	pwm: Changes for v4.15-rc1	2017-11-22 21:09:18 -10:00
rapidio	Merge branch 'akpm' (patches from Andrew)	2017-11-17 16:56:17 -08:00
ras	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-13 17:56:58 -08:00
regulator	- New Drivers	2017-11-16 09:15:57 -08:00
remoteproc	remoteproc updates for v4.15	2017-11-17 20:14:10 -08:00
reset	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
rpmsg	rpmsg updates for v4.15	2017-11-17 20:12:08 -08:00
rtc	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-25 08:37:16 -10:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2017-11-30 08:13:36 -08:00
sbus	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2017-11-17 20:21:44 -08:00
scsi	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-25 08:37:16 -10:00
sfi
sh	A couple of dma-mapping updates:	2017-11-14 16:54:12 -08:00
sn
soc	ARM: SoC driver updates for v4.15	2017-11-16 16:05:01 -08:00
spi	Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next	2017-11-10 21:33:51 +00:00
spmi
ssb	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
staging	staging: vboxvideo: adapt to new TTM interface	2017-12-06 12:48:03 -05:00
target	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-11-25 08:37:16 -10:00
tc
tee	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
thermal	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2017-11-17 14:31:27 -08:00
thunderbolt	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
tty	treewide: Remove TIMER_FUNC_TYPE and TIMER_DATA_TYPE casts	2017-11-21 16:35:54 -08:00
uio	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
usb	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
uwb	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
vfio	VFIO Updates for Linux v4.15	2017-11-14 16:47:47 -08:00
vhost	Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2017-11-17 12:08:18 -08:00
video	fbcon: Remove dmi quirk table	2017-12-04 23:03:22 +01:00
virt
virtio	virtio_balloon: fix deadlock on OOM	2017-11-14 23:57:38 +02:00
vlynq
vme	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
w1	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -08:00
watchdog	treewide: setup_timer() -> timer_setup()	2017-11-21 15:57:07 -08:00
xen	treewide: Switch DEFINE_TIMER callbacks to struct timer_list *	2017-11-21 15:57:05 -08:00
zorro	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig	Merge branches 'pm-cpufreq-sched' and 'pm-opp'	2017-11-13 01:40:52 +01:00
Makefile	Merge branches 'pm-cpufreq-sched' and 'pm-opp'	2017-11-13 01:40:52 +01:00