Revision ef78970ace74bb606e641a1f27ea36547716a775 authored by Chris Wilson on 22 November 2017, 17:26:21 UTC, committed by Joonas Lahtinen on 07 December 2017, 08:45:38 UTC
We don't need struct_mutex to initialise userptr (it just allocates a workqueue for itself etc), but we do need struct_mutex later on in i915_gem_init() in order to feed requests onto the HW. This should break the chain [ 385.697902] ====================================================== [ 385.697907] WARNING: possible circular locking dependency detected [ 385.697913] 4.14.0-CI-Patchwork_7234+ #1 Tainted: G U [ 385.697917] ------------------------------------------------------ [ 385.697922] perf_pmu/2631 is trying to acquire lock: [ 385.697927] (&mm->mmap_sem){++++}, at: [<ffffffff811bfe1e>] __might_fault+0x3e/0x90 [ 385.697941] but task is already holding lock: [ 385.697946] (&cpuctx_mutex){+.+.}, at: [<ffffffff8116fe8c>] perf_event_ctx_lock_nested+0xbc/0x1d0 [ 385.697957] which lock already depends on the new lock. [ 385.697963] the existing dependency chain (in reverse order) is: [ 385.697970] -> #4 (&cpuctx_mutex){+.+.}: [ 385.697980] __mutex_lock+0x86/0x9b0 [ 385.697985] perf_event_init_cpu+0x5a/0x90 [ 385.697991] perf_event_init+0x178/0x1a4 [ 385.697997] start_kernel+0x27f/0x3f1 [ 385.698003] verify_cpu+0x0/0xfb [ 385.698006] -> #3 (pmus_lock){+.+.}: [ 385.698015] __mutex_lock+0x86/0x9b0 [ 385.698020] perf_event_init_cpu+0x21/0x90 [ 385.698025] cpuhp_invoke_callback+0xca/0xc00 [ 385.698030] _cpu_up+0xa7/0x170 [ 385.698035] do_cpu_up+0x57/0x70 [ 385.698039] smp_init+0x62/0xa6 [ 385.698044] kernel_init_freeable+0x97/0x193 [ 385.698050] kernel_init+0xa/0x100 [ 385.698055] ret_from_fork+0x27/0x40 [ 385.698058] -> #2 (cpu_hotplug_lock.rw_sem){++++}: [ 385.698068] cpus_read_lock+0x39/0xa0 [ 385.698073] apply_workqueue_attrs+0x12/0x50 [ 385.698078] __alloc_workqueue_key+0x1d8/0x4d8 [ 385.698134] i915_gem_init_userptr+0x5f/0x80 [i915] [ 385.698176] i915_gem_init+0x7c/0x390 [i915] [ 385.698213] i915_driver_load+0x99e/0x15c0 [i915] [ 385.698250] i915_pci_probe+0x33/0x90 [i915] [ 385.698256] pci_device_probe+0xa1/0x130 [ 385.698262] driver_probe_device+0x293/0x440 [ 385.698267] __driver_attach+0xde/0xe0 [ 385.698272] bus_for_each_dev+0x5c/0x90 [ 385.698277] bus_add_driver+0x16d/0x260 [ 385.698282] driver_register+0x57/0xc0 [ 385.698287] do_one_initcall+0x3e/0x160 [ 385.698292] do_init_module+0x5b/0x1fa [ 385.698297] load_module+0x2374/0x2dc0 [ 385.698302] SyS_finit_module+0xaa/0xe0 [ 385.698307] entry_SYSCALL_64_fastpath+0x1c/0xb1 [ 385.698311] -> #1 (&dev->struct_mutex){+.+.}: [ 385.698320] __mutex_lock+0x86/0x9b0 [ 385.698361] i915_mutex_lock_interruptible+0x4c/0x130 [i915] [ 385.698403] i915_gem_fault+0x206/0x760 [i915] [ 385.698409] __do_fault+0x1a/0x70 [ 385.698413] __handle_mm_fault+0x7c4/0xdb0 [ 385.698417] handle_mm_fault+0x154/0x300 [ 385.698440] __do_page_fault+0x2d6/0x570 [ 385.698445] page_fault+0x22/0x30 [ 385.698449] -> #0 (&mm->mmap_sem){++++}: [ 385.698459] lock_acquire+0xaf/0x200 [ 385.698464] __might_fault+0x68/0x90 [ 385.698470] _copy_to_user+0x1e/0x70 [ 385.698475] perf_read+0x1aa/0x290 [ 385.698480] __vfs_read+0x23/0x120 [ 385.698484] vfs_read+0xa3/0x150 [ 385.698488] SyS_read+0x45/0xb0 [ 385.698493] entry_SYSCALL_64_fastpath+0x1c/0xb1 [ 385.698497] other info that might help us debug this: [ 385.698505] Chain exists of: &mm->mmap_sem --> pmus_lock --> &cpuctx_mutex [ 385.698517] Possible unsafe locking scenario: [ 385.698522] CPU0 CPU1 [ 385.698526] ---- ---- [ 385.698529] lock(&cpuctx_mutex); [ 385.698553] lock(pmus_lock); [ 385.698558] lock(&cpuctx_mutex); [ 385.698564] lock(&mm->mmap_sem); [ 385.698568] *** DEADLOCK *** [ 385.698574] 1 lock held by perf_pmu/2631: [ 385.698578] #0: (&cpuctx_mutex){+.+.}, at: [<ffffffff8116fe8c>] perf_event_ctx_lock_nested+0xbc/0x1d0 [ 385.698589] stack backtrace: [ 385.698595] CPU: 3 PID: 2631 Comm: perf_pmu Tainted: G U 4.14.0-CI-Patchwork_7234+ #1 [ 385.698602] Hardware name: /NUC6CAYB, BIOS AYAPLCEL.86A.0040.2017.0619.1722 06/19/2017 [ 385.698609] Call Trace: [ 385.698615] dump_stack+0x5f/0x86 [ 385.698621] print_circular_bug.isra.18+0x1d0/0x2c0 [ 385.698627] __lock_acquire+0x19c3/0x1b60 [ 385.698634] ? generic_exec_single+0x77/0xe0 [ 385.698640] ? lock_acquire+0xaf/0x200 [ 385.698644] lock_acquire+0xaf/0x200 [ 385.698650] ? __might_fault+0x3e/0x90 [ 385.698655] __might_fault+0x68/0x90 [ 385.698660] ? __might_fault+0x3e/0x90 [ 385.698665] _copy_to_user+0x1e/0x70 [ 385.698670] perf_read+0x1aa/0x290 [ 385.698675] __vfs_read+0x23/0x120 [ 385.698682] ? __fget+0x101/0x1f0 [ 385.698686] vfs_read+0xa3/0x150 [ 385.698691] SyS_read+0x45/0xb0 [ 385.698696] entry_SYSCALL_64_fastpath+0x1c/0xb1 [ 385.698701] RIP: 0033:0x7ff1c46876ed [ 385.698705] RSP: 002b:00007fff13552f90 EFLAGS: 00000293 ORIG_RAX: 0000000000000000 [ 385.698712] RAX: ffffffffffffffda RBX: ffffc90000647ff0 RCX: 00007ff1c46876ed [ 385.698718] RDX: 0000000000000010 RSI: 00007fff13552fa0 RDI: 0000000000000005 [ 385.698723] RBP: 000056063d300580 R08: 0000000000000000 R09: 0000000000000060 [ 385.698729] R10: 0000000000000000 R11: 0000000000000293 R12: 0000000000000046 [ 385.698734] R13: 00007fff13552c6f R14: 00007ff1c6279d00 R15: 00007ff1c6279a40 Testcase: igt/perf_pmu Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171122172621.16158-1-chris@chris-wilson.co.uk Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit ee48700dd57d9ce783ec40f035b324d0b75632e4) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent 46442be
File | Mode | Size |
---|---|---|
kasan | ||
Kconfig | -rw-r--r-- | 25.1 KB |
Kconfig.debug | -rw-r--r-- | 3.7 KB |
Makefile | -rw-r--r-- | 3.6 KB |
backing-dev.c | -rw-r--r-- | 27.3 KB |
balloon_compaction.c | -rw-r--r-- | 5.5 KB |
bootmem.c | -rw-r--r-- | 20.8 KB |
cleancache.c | -rw-r--r-- | 9.9 KB |
cma.c | -rw-r--r-- | 13.5 KB |
cma.h | -rw-r--r-- | 573 bytes |
cma_debug.c | -rw-r--r-- | 4.5 KB |
compaction.c | -rw-r--r-- | 58.4 KB |
debug.c | -rw-r--r-- | 4.1 KB |
debug_page_ref.c | -rw-r--r-- | 1.4 KB |
dmapool.c | -rw-r--r-- | 13.7 KB |
early_ioremap.c | -rw-r--r-- | 6.8 KB |
fadvise.c | -rw-r--r-- | 4.4 KB |
failslab.c | -rw-r--r-- | 1.5 KB |
filemap.c | -rw-r--r-- | 89.4 KB |
frame_vector.c | -rw-r--r-- | 6.4 KB |
frontswap.c | -rw-r--r-- | 14.3 KB |
gup.c | -rw-r--r-- | 50.1 KB |
gup_benchmark.c | -rw-r--r-- | 2.0 KB |
highmem.c | -rw-r--r-- | 11.7 KB |
hmm.c | -rw-r--r-- | 33.4 KB |
huge_memory.c | -rw-r--r-- | 81.2 KB |
hugetlb.c | -rw-r--r-- | 128.9 KB |
hugetlb_cgroup.c | -rw-r--r-- | 10.9 KB |
hwpoison-inject.c | -rw-r--r-- | 3.2 KB |
init-mm.c | -rw-r--r-- | 716 bytes |
internal.h | -rw-r--r-- | 16.7 KB |
interval_tree.c | -rw-r--r-- | 3.2 KB |
khugepaged.c | -rw-r--r-- | 48.5 KB |
kmemcheck.c | -rw-r--r-- | 36 bytes |
kmemleak-test.c | -rw-r--r-- | 3.2 KB |
kmemleak.c | -rw-r--r-- | 58.6 KB |
ksm.c | -rw-r--r-- | 85.9 KB |
list_lru.c | -rw-r--r-- | 12.6 KB |
maccess.c | -rw-r--r-- | 3.0 KB |
madvise.c | -rw-r--r-- | 22.6 KB |
memblock.c | -rw-r--r-- | 52.0 KB |
memcontrol.c | -rw-r--r-- | 159.4 KB |
memory-failure.c | -rw-r--r-- | 47.8 KB |
memory.c | -rw-r--r-- | 125.5 KB |
memory_hotplug.c | -rw-r--r-- | 48.9 KB |
mempolicy.c | -rw-r--r-- | 69.4 KB |
mempool.c | -rw-r--r-- | 14.0 KB |
memtest.c | -rw-r--r-- | 2.8 KB |
migrate.c | -rw-r--r-- | 77.1 KB |
mincore.c | -rw-r--r-- | 6.7 KB |
mlock.c | -rw-r--r-- | 22.4 KB |
mm_init.c | -rw-r--r-- | 4.8 KB |
mmap.c | -rw-r--r-- | 97.8 KB |
mmu_context.c | -rw-r--r-- | 1.3 KB |
mmu_notifier.c | -rw-r--r-- | 11.5 KB |
mmzone.c | -rw-r--r-- | 2.4 KB |
mprotect.c | -rw-r--r-- | 13.9 KB |
mremap.c | -rw-r--r-- | 17.1 KB |
msync.c | -rw-r--r-- | 2.6 KB |
nobootmem.c | -rw-r--r-- | 10.7 KB |
nommu.c | -rw-r--r-- | 48.5 KB |
oom_kill.c | -rw-r--r-- | 29.7 KB |
page-writeback.c | -rw-r--r-- | 84.3 KB |
page_alloc.c | -rw-r--r-- | 214.1 KB |
page_counter.c | -rw-r--r-- | 4.8 KB |
page_ext.c | -rw-r--r-- | 11.0 KB |
page_idle.c | -rw-r--r-- | 5.4 KB |
page_io.c | -rw-r--r-- | 10.4 KB |
page_isolation.c | -rw-r--r-- | 8.0 KB |
page_owner.c | -rw-r--r-- | 15.3 KB |
page_poison.c | -rw-r--r-- | 2.7 KB |
page_vma_mapped.c | -rw-r--r-- | 6.3 KB |
pagewalk.c | -rw-r--r-- | 8.5 KB |
percpu-internal.h | -rw-r--r-- | 5.9 KB |
percpu-km.c | -rw-r--r-- | 2.9 KB |
percpu-stats.c | -rw-r--r-- | 5.9 KB |
percpu-vm.c | -rw-r--r-- | 10.1 KB |
percpu.c | -rw-r--r-- | 82.4 KB |
pgtable-generic.c | -rw-r--r-- | 5.3 KB |
process_vm_access.c | -rw-r--r-- | 10.1 KB |
quicklist.c | -rw-r--r-- | 2.4 KB |
readahead.c | -rw-r--r-- | 16.1 KB |
rmap.c | -rw-r--r-- | 52.5 KB |
rodata_test.c | -rw-r--r-- | 1.4 KB |
shmem.c | -rw-r--r-- | 111.8 KB |
slab.c | -rw-r--r-- | 109.9 KB |
slab.h | -rw-r--r-- | 14.4 KB |
slab_common.c | -rw-r--r-- | 35.5 KB |
slob.c | -rw-r--r-- | 16.1 KB |
slub.c | -rw-r--r-- | 141.3 KB |
sparse-vmemmap.c | -rw-r--r-- | 8.4 KB |
sparse.c | -rw-r--r-- | 23.0 KB |
swap.c | -rw-r--r-- | 28.1 KB |
swap_cgroup.c | -rw-r--r-- | 5.2 KB |
swap_slots.c | -rw-r--r-- | 9.4 KB |
swap_state.c | -rw-r--r-- | 21.6 KB |
swapfile.c | -rw-r--r-- | 94.7 KB |
truncate.c | -rw-r--r-- | 26.7 KB |
usercopy.c | -rw-r--r-- | 7.5 KB |
userfaultfd.c | -rw-r--r-- | 14.7 KB |
util.c | -rw-r--r-- | 18.4 KB |
vmacache.c | -rw-r--r-- | 3.2 KB |
vmalloc.c | -rw-r--r-- | 70.2 KB |
vmpressure.c | -rw-r--r-- | 14.3 KB |
vmscan.c | -rw-r--r-- | 115.5 KB |
vmstat.c | -rw-r--r-- | 52.6 KB |
workingset.c | -rw-r--r-- | 18.1 KB |
z3fold.c | -rw-r--r-- | 29.4 KB |
zbud.c | -rw-r--r-- | 18.2 KB |
zpool.c | -rw-r--r-- | 10.0 KB |
zsmalloc.c | -rw-r--r-- | 59.4 KB |
zswap.c | -rw-r--r-- | 32.8 KB |
Computing file changes ...