Hello,
syzbot has tested the proposed patch but the reproducer is still triggering an issue:
possible deadlock in cx25840_ir_rx_shutdown
======================================================
WARNING: possible circular locking dependency detected
5.12.0-rc4-next-20210329-syzkaller #0 Not tainted
------------------------------------------------------
kworker/0:6/10077 is trying to acquire lock:
ffff888023b998c8 (&ir_state->rx_params_lock){+.+.}-{3:3}, at: cx25840_ir_rx_shutdown+0x88/0x1f0 drivers/media/i2c/cx25840/cx25840-ir.c:730
but task is already holding lock:
ffff8880342d9670 (&hdw->ctl_lock_mutex){+.+.}-{3:3}, at: pvr2_hdw_disconnect+0xc2/0x610 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2706
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&hdw->ctl_lock_mutex){+.+.}-{3:3}:
__mutex_lock_common kernel/locking/mutex.c:949 [inline]
__mutex_lock+0x139/0x1120 kernel/locking/mutex.c:1096
pvr2_i2c_read drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c:116 [inline]
pvr2_i2c_basic_op+0x34e/0x900 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c:172
i2c_hack_cx25840+0x2a1/0x510 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c:332
pvr2_i2c_xfer+0x375/0xb90 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c:445
__i2c_transfer+0x52b/0x17d0 drivers/i2c/i2c-core-base.c:2052
i2c_transfer+0x1e6/0x3e0 drivers/i2c/i2c-core-base.c:2113
cx25840_read+0x125/0x1b0 drivers/media/i2c/cx25840/cx25840-core.c:118
cx25840_probe+0x11b/0x560 drivers/media/i2c/cx25840/cx25840-core.c:5848
i2c_device_probe+0x916/0xae0 drivers/i2c/i2c-core-base.c:529
really_probe+0x291/0xf60 drivers/base/dd.c:561
driver_probe_device+0x298/0x410 drivers/base/dd.c:748
__device_attach_driver+0x203/0x2c0 drivers/base/dd.c:855
bus_for_each_drv+0x15f/0x1e0 drivers/base/bus.c:431
__device_attach+0x228/0x4b0 drivers/base/dd.c:923
bus_probe_device+0x1e4/0x290 drivers/base/bus.c:491
device_add+0xbdb/0x1db0 drivers/base/core.c:3277
i2c_new_client_device+0x617/0xb00 drivers/i2c/i2c-core-base.c:923
v4l2_i2c_new_subdev_board+0xaf/0x2c0 drivers/media/v4l2-core/v4l2-i2c.c:80
v4l2_i2c_new_subdev+0x102/0x170 drivers/media/v4l2-core/v4l2-i2c.c:135
pvr2_hdw_load_subdev drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2022 [inline]
pvr2_hdw_load_modules drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2074 [inline]
pvr2_hdw_setup_low drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2155 [inline]
pvr2_hdw_setup drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2261 [inline]
pvr2_hdw_initialize+0xc97/0x37d0 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2338
pvr2_context_check drivers/media/usb/pvrusb2/pvrusb2-context.c:109 [inline]
pvr2_context_thread_func+0x250/0x850 drivers/media/usb/pvrusb2/pvrusb2-context.c:158
kthread+0x3b1/0x4a0 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294
-> #1 (i2c_register_adapter){+.+.}-{0:0}:
__rt_mutex_lock kernel/locking/rtmutex.c:1451 [inline]
rt_mutex_lock_nested+0x41/0x60 kernel/locking/rtmutex.c:1464
i2c_lock_bus include/linux/i2c.h:765 [inline]
__i2c_lock_bus_helper drivers/i2c/i2c-core.h:44 [inline]
i2c_transfer+0x1d3/0x3e0 drivers/i2c/i2c-core-base.c:2109
cx25840_read4+0x11f/0x1b0 drivers/media/i2c/cx25840/cx25840-core.c:143
cx25840_and_or4+0x76/0xd0 drivers/media/i2c/cx25840/cx25840-core.c:162
irqenable_rx drivers/media/i2c/cx25840/cx25840-ir.c:491 [inline]
cx25840_ir_rx_shutdown+0x105/0x1f0 drivers/media/i2c/cx25840/cx25840-ir.c:733
cx25840_ir_rx_s_parameters+0xe57/0x1120 drivers/media/i2c/cx25840/cx25840-ir.c:758
cx25840_ir_probe+0x55d/0x680 drivers/media/i2c/cx25840/cx25840-ir.c:1236
cx25840_probe.cold+0x10eb/0x14b9 drivers/media/i2c/cx25840/cx25840-core.c:6025
i2c_device_probe+0x916/0xae0 drivers/i2c/i2c-core-base.c:529
really_probe+0x291/0xf60 drivers/base/dd.c:561
driver_probe_device+0x298/0x410 drivers/base/dd.c:748
__device_attach_driver+0x203/0x2c0 drivers/base/dd.c:855
bus_for_each_drv+0x15f/0x1e0 drivers/base/bus.c:431
__device_attach+0x228/0x4b0 drivers/base/dd.c:923
bus_probe_device+0x1e4/0x290 drivers/base/bus.c:491
device_add+0xbdb/0x1db0 drivers/base/core.c:3277
i2c_new_client_device+0x617/0xb00 drivers/i2c/i2c-core-base.c:923
v4l2_i2c_new_subdev_board+0xaf/0x2c0 drivers/media/v4l2-core/v4l2-i2c.c:80
v4l2_i2c_new_subdev+0x102/0x170 drivers/media/v4l2-core/v4l2-i2c.c:135
pvr2_hdw_load_subdev drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2022 [inline]
pvr2_hdw_load_modules drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2074 [inline]
pvr2_hdw_setup_low drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2155 [inline]
pvr2_hdw_setup drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2261 [inline]
pvr2_hdw_initialize+0xc97/0x37d0 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2338
pvr2_context_check drivers/media/usb/pvrusb2/pvrusb2-context.c:109 [inline]
pvr2_context_thread_func+0x250/0x850 drivers/media/usb/pvrusb2/pvrusb2-context.c:158
kthread+0x3b1/0x4a0 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294
-> #0 (&ir_state->rx_params_lock){+.+.}-{3:3}:
check_prev_add kernel/locking/lockdep.c:2938 [inline]
check_prevs_add kernel/locking/lockdep.c:3061 [inline]
validate_chain kernel/locking/lockdep.c:3676 [inline]
__lock_acquire+0x2a17/0x5230 kernel/locking/lockdep.c:4902
lock_acquire kernel/locking/lockdep.c:5512 [inline]
lock_acquire+0x1ab/0x740 kernel/locking/lockdep.c:5477
__mutex_lock_common kernel/locking/mutex.c:949 [inline]
__mutex_lock+0x139/0x1120 kernel/locking/mutex.c:1096
cx25840_ir_rx_shutdown+0x88/0x1f0 drivers/media/i2c/cx25840/cx25840-ir.c:730
cx25840_ir_remove+0x52/0xc0 drivers/media/i2c/cx25840/cx25840-ir.c:1253
cx25840_remove+0x36/0x60 drivers/media/i2c/cx25840/cx25840-core.c:6034
i2c_device_remove+0x7b/0x200 drivers/i2c/i2c-core-base.c:562
__device_release_driver+0x3bd/0x6f0 drivers/base/dd.c:1166
device_release_driver_internal drivers/base/dd.c:1197 [inline]
device_release_driver+0x26/0x40 drivers/base/dd.c:1220
bus_remove_device+0x2eb/0x5a0 drivers/base/bus.c:533
device_del+0x502/0xd40 drivers/base/core.c:3456
device_unregister+0x22/0xc0 drivers/base/core.c:3489
i2c_unregister_device include/linux/err.h:41 [inline]
__unregister_client drivers/i2c/i2c-core-base.c:1607 [inline]
__unregister_client+0x95/0xa0 drivers/i2c/i2c-core-base.c:1603
device_for_each_child+0xf9/0x170 drivers/base/core.c:3589
i2c_del_adapter+0x37b/0x680 drivers/i2c/i2c-core-base.c:1670
pvr2_i2c_core_done+0x69/0xc0 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c:652
pvr2_hdw_disconnect+0x105/0x610 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2707
pvr2_context_disconnect+0x2d/0x80 drivers/media/usb/pvrusb2/pvrusb2-context.c:269
pvr_disconnect+0x7c/0xc0 drivers/media/usb/pvrusb2/pvrusb2-main.c:87
usb_unbind_interface+0x1d8/0x8d0 drivers/usb/core/driver.c:458
__device_release_driver+0x3bd/0x6f0 drivers/base/dd.c:1166
device_release_driver_internal drivers/base/dd.c:1197 [inline]
device_release_driver+0x26/0x40 drivers/base/dd.c:1220
bus_remove_device+0x2eb/0x5a0 drivers/base/bus.c:533
device_del+0x502/0xd40 drivers/base/core.c:3456
usb_disable_device+0x35b/0x7b0 drivers/usb/core/message.c:1413
usb_disconnect.cold+0x27d/0x791 drivers/usb/core/hub.c:2219
hub_port_connect drivers/usb/core/hub.c:5127 [inline]
hub_port_connect_change drivers/usb/core/hub.c:5416 [inline]
port_event drivers/usb/core/hub.c:5562 [inline]
hub_event+0x1c9c/0x4320 drivers/usb/core/hub.c:5644
process_one_work+0x98d/0x1600 kernel/workqueue.c:2275
process_scheduled_works kernel/workqueue.c:2337 [inline]
worker_thread+0x82b/0x1120 kernel/workqueue.c:2423
kthread+0x3b1/0x4a0 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294
other info that might help us debug this:
Chain exists of:
&ir_state->rx_params_lock --> i2c_register_adapter --> &hdw->ctl_lock_mutex
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&hdw->ctl_lock_mutex);
lock(i2c_register_adapter);
lock(&hdw->ctl_lock_mutex);
lock(&ir_state->rx_params_lock);
*** DEADLOCK ***
8 locks held by kworker/0:6/10077:
#0: ffff888015431d38 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: arch_atomic64_set arch/x86/include/asm/atomic64_64.h:34 [inline]
#0: ffff888015431d38 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: atomic64_set include/asm-generic/atomic-instrumented.h:856 [inline]
#0: ffff888015431d38 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: atomic_long_set include/asm-generic/atomic-long.h:41 [inline]
#0: ffff888015431d38 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: set_work_data kernel/workqueue.c:616 [inline]
#0: ffff888015431d38 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: set_work_pool_and_clear_pending kernel/workqueue.c:643 [inline]
#0: ffff888015431d38 ((wq_completion)usb_hub_wq){+.+.}-{0:0}, at: process_one_work+0x871/0x1600 kernel/workqueue.c:2246
#1: ffffc9000b2ffda8 ((work_completion)(&hub->events)){+.+.}-{0:0}, at: process_one_work+0x8a5/0x1600 kernel/workqueue.c:2250
#2: ffff88801cdca220 (&dev->mutex){....}-{3:3}, at: device_lock include/linux/device.h:744 [inline]
#2: ffff88801cdca220 (&dev->mutex){....}-{3:3}, at: hub_event+0x1c1/0x4320 drivers/usb/core/hub.c:5590
#3: ffff888012516220 (&dev->mutex){....}-{3:3}, at: device_lock include/linux/device.h:744 [inline]
#3: ffff888012516220 (&dev->mutex){....}-{3:3}, at: usb_disconnect.cold+0x43/0x791 drivers/usb/core/hub.c:2210
#4: ffff8880440c11a8 (&dev->mutex){....}-{3:3}, at: device_lock include/linux/device.h:744 [inline]
#4: ffff8880440c11a8 (&dev->mutex){....}-{3:3}, at: __device_driver_lock drivers/base/dd.c:986 [inline]
#4: ffff8880440c11a8 (&dev->mutex){....}-{3:3}, at: device_release_driver_internal drivers/base/dd.c:1194 [inline]
#4: ffff8880440c11a8 (&dev->mutex){....}-{3:3}, at: device_release_driver+0x1c/0x40 drivers/base/dd.c:1220
#5: ffff8880342d8188 (&hdw->big_lock_mutex){+.+.}-{3:3}, at: pvr2_hdw_disconnect+0x7b/0x610 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2705
#6: ffff8880342d9670 (&hdw->ctl_lock_mutex){+.+.}-{3:3}, at: pvr2_hdw_disconnect+0xc2/0x610 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2706
#7: ffff888037b93198 (&dev->mutex){....}-{3:3}, at: device_lock include/linux/device.h:744 [inline]
#7: ffff888037b93198 (&dev->mutex){....}-{3:3}, at: __device_driver_lock drivers/base/dd.c:986 [inline]
#7: ffff888037b93198 (&dev->mutex){....}-{3:3}, at: device_release_driver_internal drivers/base/dd.c:1194 [inline]
#7: ffff888037b93198 (&dev->mutex){....}-{3:3}, at: device_release_driver+0x1c/0x40 drivers/base/dd.c:1220
stack backtrace:
CPU: 0 PID: 10077 Comm: kworker/0:6 Not tainted 5.12.0-rc4-next-20210329-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Workqueue: usb_hub_wq hub_event
Call Trace:
__dump_stack lib/dump_stack.c:79 [inline]
dump_stack+0x141/0x1d7 lib/dump_stack.c:120
check_noncircular+0x25f/0x2e0 kernel/locking/lockdep.c:2129
check_prev_add kernel/locking/lockdep.c:2938 [inline]
check_prevs_add kernel/locking/lockdep.c:3061 [inline]
validate_chain kernel/locking/lockdep.c:3676 [inline]
__lock_acquire+0x2a17/0x5230 kernel/locking/lockdep.c:4902
lock_acquire kernel/locking/lockdep.c:5512 [inline]
lock_acquire+0x1ab/0x740 kernel/locking/lockdep.c:5477
__mutex_lock_common kernel/locking/mutex.c:949 [inline]
__mutex_lock+0x139/0x1120 kernel/locking/mutex.c:1096
cx25840_ir_rx_shutdown+0x88/0x1f0 drivers/media/i2c/cx25840/cx25840-ir.c:730
cx25840_ir_remove+0x52/0xc0 drivers/media/i2c/cx25840/cx25840-ir.c:1253
cx25840_remove+0x36/0x60 drivers/media/i2c/cx25840/cx25840-core.c:6034
i2c_device_remove+0x7b/0x200 drivers/i2c/i2c-core-base.c:562
__device_release_driver+0x3bd/0x6f0 drivers/base/dd.c:1166
device_release_driver_internal drivers/base/dd.c:1197 [inline]
device_release_driver+0x26/0x40 drivers/base/dd.c:1220
bus_remove_device+0x2eb/0x5a0 drivers/base/bus.c:533
device_del+0x502/0xd40 drivers/base/core.c:3456
device_unregister+0x22/0xc0 drivers/base/core.c:3489
i2c_unregister_device include/linux/err.h:41 [inline]
__unregister_client drivers/i2c/i2c-core-base.c:1607 [inline]
__unregister_client+0x95/0xa0 drivers/i2c/i2c-core-base.c:1603
device_for_each_child+0xf9/0x170 drivers/base/core.c:3589
i2c_del_adapter+0x37b/0x680 drivers/i2c/i2c-core-base.c:1670
pvr2_i2c_core_done+0x69/0xc0 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c:652
pvr2_hdw_disconnect+0x105/0x610 drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2707
pvr2_context_disconnect+0x2d/0x80 drivers/media/usb/pvrusb2/pvrusb2-context.c:269
pvr_disconnect+0x7c/0xc0 drivers/media/usb/pvrusb2/pvrusb2-main.c:87
usb_unbind_interface+0x1d8/0x8d0 drivers/usb/core/driver.c:458
__device_release_driver+0x3bd/0x6f0 drivers/base/dd.c:1166
device_release_driver_internal drivers/base/dd.c:1197 [inline]
device_release_driver+0x26/0x40 drivers/base/dd.c:1220
bus_remove_device+0x2eb/0x5a0 drivers/base/bus.c:533
device_del+0x502/0xd40 drivers/base/core.c:3456
usb_disable_device+0x35b/0x7b0 drivers/usb/core/message.c:1413
usb_disconnect.cold+0x27d/0x791 drivers/usb/core/hub.c:2219
hub_port_connect drivers/usb/core/hub.c:5127 [inline]
hub_port_connect_change drivers/usb/core/hub.c:5416 [inline]
port_event drivers/usb/core/hub.c:5562 [inline]
hub_event+0x1c9c/0x4320 drivers/usb/core/hub.c:5644
process_one_work+0x98d/0x1600 kernel/workqueue.c:2275
process_scheduled_works kernel/workqueue.c:2337 [inline]
worker_thread+0x82b/0x1120 kernel/workqueue.c:2423
kthread+0x3b1/0x4a0 kernel/kthread.c:292
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294
usb 5-1: new high-speed USB device number 3 using dummy_hcd
usb 5-1: Using ep0 maxpacket: 16
usb 5-1: config 0 has an invalid interface number: 121 but max is 0
usb 5-1: config 0 has no interface number 0
usb 5-1: config 0 interface 121 altsetting 0 has a duplicate endpoint with address 0xF, skipping
usb 5-1: New USB device found, idVendor=1164, idProduct=0622, bcdDevice=8e.9f
usb 5-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
usb 5-1: Product: syz
usb 5-1: Manufacturer: syz
usb 5-1: SerialNumber: syz
usb 5-1: config 0 descriptor??
pvrusb2: Hardware description: Gotview USB 2.0 DVD 2
usb 5-1: USB disconnect, device number 3
usb 5-1: new high-speed USB device number 4 using dummy_hcd
usb 5-1: Using ep0 maxpacket: 16
usb 5-1: config 0 has an invalid interface number: 121 but max is 0
usb 5-1: config 0 has no interface number 0
usb 5-1: config 0 interface 121 altsetting 0 has a duplicate endpoint with address 0xF, skipping
usb 5-1: New USB device found, idVendor=1164, idProduct=0622, bcdDevice=8e.9f
usb 5-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
usb 5-1: Product: syz
usb 5-1: Manufacturer: syz
usb 5-1: SerialNumber: syz
usb 5-1: config 0 descriptor??
usb 5-1: can't set config #0, error -71
usb 5-1: USB disconnect, device number 4
usb 5-1: new high-speed USB device number 5 using dummy_hcd
usb 5-1: Using ep0 maxpacket: 16
usb 5-1: config 0 has an invalid interface number: 121 but max is 0
usb 5-1: config 0 has no interface number 0
usb 5-1: config 0 interface 121 altsetting 0 has a duplicate endpoint with address 0xF, skipping
usb 5-1: New USB device found, idVendor=1164, idProduct=0622, bcdDevice=8e.9f
usb 5-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
usb 5-1: Product: syz
usb 5-1: Manufacturer: syz
usb 5-1: SerialNumber: syz
usb 5-1: config 0 descriptor??
pvrusb2: Hardware description: Gotview USB 2.0 DVD 2
usb 5-1: USB disconnect, device number 5
pvrusb2: Device being rendered inoperable
usb 2-1: new high-speed USB device number 6 using dummy_hcd
usb 2-1: Using ep0 maxpacket: 16
usb 2-1: device descriptor read/all, error -71
usb 2-1: new high-speed USB device number 7 using dummy_hcd
usb 2-1: Using ep0 maxpacket: 16
usb 2-1: config 0 has an invalid interface number: 121 but max is 0
usb 2-1: config 0 has no interface number 0
usb 2-1: config 0 interface 121 altsetting 0 has a duplicate endpoint with address 0xF, skipping
usb 2-1: New USB device found, idVendor=1164, idProduct=0622, bcdDevice=8e.9f
usb 2-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
usb 2-1: Product: syz
usb 2-1: Manufacturer: syz
usb 2-1: SerialNumber: syz
usb 2-1: config 0 descriptor??
pvrusb2: Hardware description: Gotview USB 2.0 DVD 2
usb 2-1: USB disconnect, device number 7
Tested on:
commit: 9d49ed9c Add linux-next specific files for 20210329
git tree: linux-next
console output:
https://syzkaller.appspot.com/x/log.txt?x=16101c0ed00000
kernel config:
https://syzkaller.appspot.com/x/.config?x=596ba934e35ca65f
patch:
https://syzkaller.appspot.com/x/patch.diff?x=1653a94ed00000