mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-06 13:23:18 +00:00
56199bb956
There is a possibility to deadlock with an recursive
lock of the AP bus scan mutex ap_scan_bus_mutex:
... kernel: ============================================
... kernel: WARNING: possible recursive locking detected
... kernel: 5.14.0-496.el9.s390x #3 Not tainted
... kernel: --------------------------------------------
... kernel: kworker/12:1/130 is trying to acquire lock:
... kernel: 0000000358bc1510 (ap_scan_bus_mutex){+.+.}-{3:3}, at: ap_bus_force_rescan+0x92/0x108
... kernel:
but task is already holding lock:
... kernel: 0000000358bc1510 (ap_scan_bus_mutex){+.+.}-{3:3}, at: ap_scan_bus_wq_callback+0x28/0x60
... kernel:
other info that might help us debug this:
... kernel: Possible unsafe locking scenario:
... kernel: CPU0
... kernel: ----
... kernel: lock(ap_scan_bus_mutex);
... kernel: lock(ap_scan_bus_mutex);
... kernel:
*** DEADLOCK ***
Here is how the callstack looks like:
... [<00000003576fe9ce>] process_one_work+0x2a6/0x748
... [<0000000358150c00>] ap_scan_bus_wq_callback+0x40/0x60 <- mutex locked
... [<00000003581506e2>] ap_scan_bus+0x5a/0x3b0
... [<000000035815037c>] ap_scan_adapter+0x5b4/0x8c0
... [<000000035814fa34>] ap_scan_domains+0x2d4/0x668
... [<0000000357d989b4>] device_add+0x4a4/0x6b8
... [<0000000357d9bb54>] bus_probe_device+0xb4/0xc8
... [<0000000357d9daa8>] __device_attach+0x120/0x1b0
... [<0000000357d9a632>] bus_for_each_drv+0x8a/0xd0
... [<0000000357d9d548>] __device_attach_driver+0xc0/0x140
... [<0000000357d9d3d8>] driver_probe_device+0x40/0xf0
... [<0000000357d9cec2>] really_probe+0xd2/0x460
... [<000000035814d7b0>] ap_device_probe+0x150/0x208
... [<000003ff802a5c46>] zcrypt_cex4_queue_probe+0xb6/0x1c0 [zcrypt_cex4]
... [<000003ff7fb2d36e>] zcrypt_queue_register+0xe6/0x1b0 [zcrypt]
... [<000003ff7fb2c8ac>] zcrypt_rng_device_add+0x94/0xd8 [zcrypt]
... [<0000000357d7bc52>] hwrng_register+0x212/0x228
... [<0000000357d7b8c2>] add_early_randomness+0x102/0x110
... [<000003ff7fb29c94>] zcrypt_rng_data_read+0x94/0xb8 [zcrypt]
... [<0000000358150aca>] ap_bus_force_rescan+0x92/0x108
... [<0000000358177572>] mutex_lock_interruptible_nested+0x32/0x40 <- lock again
Note this only happens when the very first random data providing
crypto card appears via hot plug in the system AND is in disabled
state ("deconfig"). Then the initial pull of random data fails and
a re-scan of the AP bus is triggered while already in the middle
of an AP bus scan caused by the appearing new hardware.
The fix is relatively simple once the scenario us understood:
The AP bus force rescan function will immediately return if there
is currently an AP bus scan running with the very same thread id.
Fixes:
|
||
|---|---|---|
| .. | ||
| ap_bus.c | ||
| ap_bus.h | ||
| ap_card.c | ||
| ap_debug.h | ||
| ap_queue.c | ||
| Makefile | ||
| pkey_api.c | ||
| pkey_base.c | ||
| pkey_base.h | ||
| pkey_cca.c | ||
| pkey_ep11.c | ||
| pkey_pckmo.c | ||
| pkey_sysfs.c | ||
| vfio_ap_debug.h | ||
| vfio_ap_drv.c | ||
| vfio_ap_ops.c | ||
| vfio_ap_private.h | ||
| zcrypt_api.c | ||
| zcrypt_api.h | ||
| zcrypt_card.c | ||
| zcrypt_cca_key.h | ||
| zcrypt_ccamisc.c | ||
| zcrypt_ccamisc.h | ||
| zcrypt_cex2a.c | ||
| zcrypt_cex2a.h | ||
| zcrypt_cex2c.c | ||
| zcrypt_cex2c.h | ||
| zcrypt_cex4.c | ||
| zcrypt_cex4.h | ||
| zcrypt_debug.h | ||
| zcrypt_ep11misc.c | ||
| zcrypt_ep11misc.h | ||
| zcrypt_error.h | ||
| zcrypt_msgtype6.c | ||
| zcrypt_msgtype6.h | ||
| zcrypt_msgtype50.c | ||
| zcrypt_msgtype50.h | ||
| zcrypt_queue.c | ||