Skip to content

Commit ae2667c

Browse files
brettcreeleyawilliam
authored andcommitted
vfio/pds: Fix possible sleep while in atomic context
The driver could possibly sleep while in atomic context resulting in the following call trace while CONFIG_DEBUG_ATOMIC_SLEEP=y is set: BUG: sleeping function called from invalid context at kernel/locking/mutex.c:283 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 2817, name: bash preempt_count: 1, expected: 0 RCU nest depth: 0, expected: 0 Call Trace: <TASK> dump_stack_lvl+0x36/0x50 __might_resched+0x123/0x170 mutex_lock+0x1e/0x50 pds_vfio_put_lm_file+0x1e/0xa0 [pds_vfio_pci] pds_vfio_put_save_file+0x19/0x30 [pds_vfio_pci] pds_vfio_state_mutex_unlock+0x2e/0x80 [pds_vfio_pci] pci_reset_function+0x4b/0x70 reset_store+0x5b/0xa0 kernfs_fop_write_iter+0x137/0x1d0 vfs_write+0x2de/0x410 ksys_write+0x5d/0xd0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 This can happen if pds_vfio_put_restore_file() and/or pds_vfio_put_save_file() grab the mutex_lock(&lm_file->lock) while the spin_lock(&pds_vfio->reset_lock) is held, which can happen during while calling pds_vfio_state_mutex_unlock(). Fix this by changing the reset_lock to reset_mutex so there are no such conerns. Also, make sure to destroy the reset_mutex in the driver specific VFIO device release function. This also fixes a spinlock bad magic BUG that was caused by not calling spinlock_init() on the reset_lock. Since, the lock is being changed to a mutex, make sure to call mutex_init() on it. Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/kvm/1f9bc27b-3de9-4891-9687-ba2820c1b390@moroto.mountain/ Fixes: bb500db ("vfio/pds: Add VFIO live migration support") Signed-off-by: Brett Creeley <brett.creeley@amd.com> Reviewed-by: Shannon Nelson <shannon.nelson@amd.com> Link: https://lore.kernel.org/r/20231122192532.25791-3-brett.creeley@amd.com Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
1 parent 91aeb56 commit ae2667c

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

drivers/vfio/pci/pds/pci_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ static void pds_vfio_recovery(struct pds_vfio_pci_device *pds_vfio)
5555
* VFIO_DEVICE_STATE_RUNNING.
5656
*/
5757
if (deferred_reset_needed) {
58-
spin_lock(&pds_vfio->reset_lock);
58+
mutex_lock(&pds_vfio->reset_mutex);
5959
pds_vfio->deferred_reset = true;
6060
pds_vfio->deferred_reset_state = VFIO_DEVICE_STATE_ERROR;
61-
spin_unlock(&pds_vfio->reset_lock);
61+
mutex_unlock(&pds_vfio->reset_mutex);
6262
}
6363
}
6464

drivers/vfio/pci/pds/vfio_dev.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ struct pds_vfio_pci_device *pds_vfio_pci_drvdata(struct pci_dev *pdev)
2929
void pds_vfio_state_mutex_unlock(struct pds_vfio_pci_device *pds_vfio)
3030
{
3131
again:
32-
spin_lock(&pds_vfio->reset_lock);
32+
mutex_lock(&pds_vfio->reset_mutex);
3333
if (pds_vfio->deferred_reset) {
3434
pds_vfio->deferred_reset = false;
3535
if (pds_vfio->state == VFIO_DEVICE_STATE_ERROR) {
@@ -39,23 +39,23 @@ void pds_vfio_state_mutex_unlock(struct pds_vfio_pci_device *pds_vfio)
3939
}
4040
pds_vfio->state = pds_vfio->deferred_reset_state;
4141
pds_vfio->deferred_reset_state = VFIO_DEVICE_STATE_RUNNING;
42-
spin_unlock(&pds_vfio->reset_lock);
42+
mutex_unlock(&pds_vfio->reset_mutex);
4343
goto again;
4444
}
4545
mutex_unlock(&pds_vfio->state_mutex);
46-
spin_unlock(&pds_vfio->reset_lock);
46+
mutex_unlock(&pds_vfio->reset_mutex);
4747
}
4848

4949
void pds_vfio_reset(struct pds_vfio_pci_device *pds_vfio)
5050
{
51-
spin_lock(&pds_vfio->reset_lock);
51+
mutex_lock(&pds_vfio->reset_mutex);
5252
pds_vfio->deferred_reset = true;
5353
pds_vfio->deferred_reset_state = VFIO_DEVICE_STATE_RUNNING;
5454
if (!mutex_trylock(&pds_vfio->state_mutex)) {
55-
spin_unlock(&pds_vfio->reset_lock);
55+
mutex_unlock(&pds_vfio->reset_mutex);
5656
return;
5757
}
58-
spin_unlock(&pds_vfio->reset_lock);
58+
mutex_unlock(&pds_vfio->reset_mutex);
5959
pds_vfio_state_mutex_unlock(pds_vfio);
6060
}
6161

@@ -156,6 +156,7 @@ static int pds_vfio_init_device(struct vfio_device *vdev)
156156
pds_vfio->vf_id = vf_id;
157157

158158
mutex_init(&pds_vfio->state_mutex);
159+
mutex_init(&pds_vfio->reset_mutex);
159160

160161
vdev->migration_flags = VFIO_MIGRATION_STOP_COPY | VFIO_MIGRATION_P2P;
161162
vdev->mig_ops = &pds_vfio_lm_ops;
@@ -177,6 +178,7 @@ static void pds_vfio_release_device(struct vfio_device *vdev)
177178
vfio_coredev.vdev);
178179

179180
mutex_destroy(&pds_vfio->state_mutex);
181+
mutex_destroy(&pds_vfio->reset_mutex);
180182
vfio_pci_core_release_dev(vdev);
181183
}
182184

drivers/vfio/pci/pds/vfio_dev.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct pds_vfio_pci_device {
1818
struct pds_vfio_dirty dirty;
1919
struct mutex state_mutex; /* protect migration state */
2020
enum vfio_device_mig_state state;
21-
spinlock_t reset_lock; /* protect reset_done flow */
21+
struct mutex reset_mutex; /* protect reset_done flow */
2222
u8 deferred_reset;
2323
enum vfio_device_mig_state deferred_reset_state;
2424
struct notifier_block nb;

0 commit comments

Comments
 (0)