https://github.com/torvalds/linux
Revision 0a66d6f90cf7d704c6a0f663f7058099eb8c97b0 authored by Marc Zyngier on 06 April 2020, 07:52:07 UTC, committed by Marc Zyngier on 17 April 2020, 07:59:29 UTC
Running a lockedp-enabled kernel on a vim3l board (Amlogic SM1)
leads to the following splat:

[   13.557138] WARNING: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected
[   13.587485] ip/456 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
[   13.625922] ffff000059908cf0 (&irq_desc_lock_class){-.-.}-{2:2}, at: __setup_irq+0xf8/0x8d8
[   13.632273] which would create a new lock dependency:
[   13.637272]  (&irq_desc_lock_class){-.-.}-{2:2} -> (&ctl->lock){+.+.}-{2:2}
[   13.644209]
[   13.644209] but this new dependency connects a HARDIRQ-irq-safe lock:
[   13.654122]  (&irq_desc_lock_class){-.-.}-{2:2}
[   13.654125]
[   13.654125] ... which became HARDIRQ-irq-safe at:
[   13.664759]   lock_acquire+0xec/0x368
[   13.666926]   _raw_spin_lock+0x60/0x88
[   13.669979]   handle_fasteoi_irq+0x30/0x178
[   13.674082]   generic_handle_irq+0x38/0x50
[   13.678098]   __handle_domain_irq+0x6c/0xc8
[   13.682209]   gic_handle_irq+0x5c/0xb0
[   13.685872]   el1_irq+0xd0/0x180
[   13.689010]   arch_cpu_idle+0x40/0x220
[   13.692732]   default_idle_call+0x54/0x60
[   13.696677]   do_idle+0x23c/0x2e8
[   13.699903]   cpu_startup_entry+0x30/0x50
[   13.703852]   rest_init+0x1e0/0x2b4
[   13.707301]   arch_call_rest_init+0x18/0x24
[   13.711449]   start_kernel+0x4ec/0x51c
[   13.715167]
[   13.715167] to a HARDIRQ-irq-unsafe lock:
[   13.722426]  (&ctl->lock){+.+.}-{2:2}
[   13.722430]
[   13.722430] ... which became HARDIRQ-irq-unsafe at:
[   13.732319] ...
[   13.732324]   lock_acquire+0xec/0x368
[   13.735985]   _raw_spin_lock+0x60/0x88
[   13.739452]   meson_gpio_irq_domain_alloc+0xcc/0x290
[   13.744392]   irq_domain_alloc_irqs_hierarchy+0x24/0x60
[   13.749586]   __irq_domain_alloc_irqs+0x160/0x2f0
[   13.754254]   irq_create_fwspec_mapping+0x118/0x320
[   13.759073]   irq_create_of_mapping+0x78/0xa0
[   13.763360]   of_irq_get+0x6c/0x80
[   13.766701]   of_mdiobus_register_phy+0x10c/0x238 [of_mdio]
[   13.772227]   of_mdiobus_register+0x158/0x380 [of_mdio]
[   13.777388]   mdio_mux_init+0x180/0x2e8 [mdio_mux]
[   13.782128]   g12a_mdio_mux_probe+0x290/0x398 [mdio_mux_meson_g12a]
[   13.788349]   platform_drv_probe+0x5c/0xb0
[   13.792379]   really_probe+0xe4/0x448
[   13.795979]   driver_probe_device+0xe8/0x140
[   13.800189]   __device_attach_driver+0x94/0x120
[   13.804639]   bus_for_each_drv+0x84/0xd8
[   13.808474]   __device_attach+0xe4/0x168
[   13.812361]   device_initial_probe+0x1c/0x28
[   13.816592]   bus_probe_device+0xa4/0xb0
[   13.820430]   deferred_probe_work_func+0xa8/0x100
[   13.825064]   process_one_work+0x264/0x688
[   13.829088]   worker_thread+0x4c/0x458
[   13.832768]   kthread+0x154/0x158
[   13.836018]   ret_from_fork+0x10/0x18
[   13.839612]
[   13.839612] other info that might help us debug this:
[   13.839612]
[   13.850354]  Possible interrupt unsafe locking scenario:
[   13.850354]
[   13.855720]        CPU0                    CPU1
[   13.858774]        ----                    ----
[   13.863242]   lock(&ctl->lock);
[   13.866330]                                local_irq_disable();
[   13.872233]                                lock(&irq_desc_lock_class);
[   13.878705]                                lock(&ctl->lock);
[   13.884297]   <Interrupt>
[   13.886857]     lock(&irq_desc_lock_class);
[   13.891014]
[   13.891014]  *** DEADLOCK ***

The issue can occur when CPU1 is doing something like irq_set_type()
and CPU0 performing an interrupt allocation, for example. Taking
an interrupt (like the one being reconfigured) would lead to a deadlock.

A solution to this is:

- Reorder the locking so that meson_gpio_irq_update_bits takes the lock
  itself at all times, instead of relying on the caller to lock or not,
  hence making the RMW sequence atomic,

- Rework the critical section in meson_gpio_irq_request_channel to only
  cover the allocation itself, and let the gpio_irq_sel_pin callback
  deal with its own locking if required,

- Take the private spin-lock with interrupts disabled at all times

Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent d727be7
History
Tip revision: 0a66d6f90cf7d704c6a0f663f7058099eb8c97b0 authored by Marc Zyngier on 06 April 2020, 07:52:07 UTC
irqchip/meson-gpio: Fix HARDIRQ-safe -> HARDIRQ-unsafe lock order
Tip revision: 0a66d6f
File Mode Size
kasan
Kconfig -rw-r--r-- 27.7 KB
Kconfig.debug -rw-r--r-- 5.3 KB
Makefile -rw-r--r-- 4.0 KB
backing-dev.c -rw-r--r-- 28.5 KB
balloon_compaction.c -rw-r--r-- 8.2 KB
cleancache.c -rw-r--r-- 9.8 KB
cma.c -rw-r--r-- 14.4 KB
cma.h -rw-r--r-- 573 bytes
cma_debug.c -rw-r--r-- 4.5 KB
compaction.c -rw-r--r-- 75.2 KB
debug.c -rw-r--r-- 7.2 KB
debug_page_ref.c -rw-r--r-- 1.4 KB
dmapool.c -rw-r--r-- 13.8 KB
early_ioremap.c -rw-r--r-- 6.8 KB
fadvise.c -rw-r--r-- 5.4 KB
failslab.c -rw-r--r-- 1.4 KB
filemap.c -rw-r--r-- 96.8 KB
frame_vector.c -rw-r--r-- 6.5 KB
frontswap.c -rw-r--r-- 14.2 KB
gup.c -rw-r--r-- 81.6 KB
gup_benchmark.c -rw-r--r-- 4.3 KB
highmem.c -rw-r--r-- 11.7 KB
hmm.c -rw-r--r-- 16.9 KB
huge_memory.c -rw-r--r-- 87.3 KB
hugetlb.c -rw-r--r-- 152.6 KB
hugetlb_cgroup.c -rw-r--r-- 21.4 KB
hwpoison-inject.c -rw-r--r-- 2.8 KB
init-mm.c -rw-r--r-- 1.2 KB
internal.h -rw-r--r-- 18.5 KB
interval_tree.c -rw-r--r-- 3.1 KB
khugepaged.c -rw-r--r-- 55.5 KB
kmemleak-test.c -rw-r--r-- 2.6 KB
kmemleak.c -rw-r--r-- 56.2 KB
ksm.c -rw-r--r-- 89.2 KB
list_lru.c -rw-r--r-- 14.3 KB
maccess.c -rw-r--r-- 7.9 KB
madvise.c -rw-r--r-- 29.0 KB
mapping_dirty_helpers.c -rw-r--r-- 10.3 KB
memblock.c -rw-r--r-- 58.3 KB
memcontrol.c -rw-r--r-- 188.0 KB
memfd.c -rw-r--r-- 7.9 KB
memory-failure.c -rw-r--r-- 52.3 KB
memory.c -rw-r--r-- 135.5 KB
memory_hotplug.c -rw-r--r-- 47.5 KB
mempolicy.c -rw-r--r-- 76.7 KB
mempool.c -rw-r--r-- 15.8 KB
memremap.c -rw-r--r-- 13.2 KB
memtest.c -rw-r--r-- 2.8 KB
migrate.c -rw-r--r-- 78.0 KB
mincore.c -rw-r--r-- 7.6 KB
mlock.c -rw-r--r-- 22.7 KB
mm_init.c -rw-r--r-- 4.8 KB
mmap.c -rw-r--r-- 100.6 KB
mmu_context.c -rw-r--r-- 1.3 KB
mmu_gather.c -rw-r--r-- 8.4 KB
mmu_notifier.c -rw-r--r-- 34.5 KB
mmzone.c -rw-r--r-- 2.4 KB
mprotect.c -rw-r--r-- 17.0 KB
mremap.c -rw-r--r-- 21.0 KB
msync.c -rw-r--r-- 2.7 KB
nommu.c -rw-r--r-- 45.7 KB
oom_kill.c -rw-r--r-- 30.2 KB
page-writeback.c -rw-r--r-- 85.0 KB
page_alloc.c -rw-r--r-- 243.6 KB
page_counter.c -rw-r--r-- 6.6 KB
page_ext.c -rw-r--r-- 10.8 KB
page_idle.c -rw-r--r-- 5.5 KB
page_io.c -rw-r--r-- 10.8 KB
page_isolation.c -rw-r--r-- 8.5 KB
page_owner.c -rw-r--r-- 16.0 KB
page_poison.c -rw-r--r-- 3.0 KB
page_reporting.c -rw-r--r-- 9.9 KB
page_reporting.h -rw-r--r-- 1.6 KB
page_vma_mapped.c -rw-r--r-- 7.7 KB
pagewalk.c -rw-r--r-- 14.2 KB
percpu-internal.h -rw-r--r-- 6.3 KB
percpu-km.c -rw-r--r-- 3.0 KB
percpu-stats.c -rw-r--r-- 5.7 KB
percpu-vm.c -rw-r--r-- 10.3 KB
percpu.c -rw-r--r-- 91.3 KB
pgtable-generic.c -rw-r--r-- 5.6 KB
process_vm_access.c -rw-r--r-- 9.9 KB
ptdump.c -rw-r--r-- 3.4 KB
readahead.c -rw-r--r-- 16.5 KB
rmap.c -rw-r--r-- 55.4 KB
rodata_test.c -rw-r--r-- 1.3 KB
shmem.c -rw-r--r-- 107.6 KB
shuffle.c -rw-r--r-- 5.5 KB
shuffle.h -rw-r--r-- 1.6 KB
slab.c -rw-r--r-- 105.5 KB
slab.h -rw-r--r-- 19.3 KB
slab_common.c -rw-r--r-- 44.0 KB
slob.c -rw-r--r-- 18.0 KB
slub.c -rw-r--r-- 144.2 KB
sparse-vmemmap.c -rw-r--r-- 6.9 KB
sparse.c -rw-r--r-- 26.3 KB
swap.c -rw-r--r-- 31.2 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-- 22.4 KB
swapfile.c -rw-r--r-- 95.2 KB
truncate.c -rw-r--r-- 26.7 KB
usercopy.c -rw-r--r-- 9.5 KB
userfaultfd.c -rw-r--r-- 17.8 KB
util.c -rw-r--r-- 22.2 KB
vmacache.c -rw-r--r-- 2.7 KB
vmalloc.c -rw-r--r-- 93.5 KB
vmpressure.c -rw-r--r-- 13.9 KB
vmscan.c -rw-r--r-- 123.4 KB
vmstat.c -rw-r--r-- 52.0 KB
workingset.c -rw-r--r-- 20.5 KB
z3fold.c -rw-r--r-- 46.6 KB
zbud.c -rw-r--r-- 18.2 KB
zpool.c -rw-r--r-- 11.2 KB
zsmalloc.c -rw-r--r-- 62.1 KB
zswap.c -rw-r--r-- 35.1 KB

back to top