mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
virtio_balloon: initialize wakeup_lock before virtqueues are set up
Sincec578123e63("virtio_balloon: Treat stats requests as wakeup events") the stats_request() virtqueue callback takes vb->wakeup_lock via start_wakeup_event(). init_vqs() registers that callback and even primes and kicks the stats queue, so the lock is reachable from irq context as soon as init_vqs() returns, long before the driver sets DRIVER_OK: vring_interrupt() dispatches to the callback without any DRIVER_OK check unless CONFIG_VIRTIO_HARDEN_NOTIFICATION is set, and that option depends on BROKEN. syzbot hit it from a threaded irq: INFO: trying to register non-static key in stats_request ... assign_lock_key register_lock_class lock_acquire rt_spin_lock start_wakeup_event drivers/virtio/virtio_balloon.c:150 [inline] stats_request drivers/virtio/virtio_balloon.c:435 The lock is only initialized near the end of virtballoon_probe(), after init_vqs() and several steps that can still fail and unwind through del_vqs(), where a racing interrupt still finds the callback registered. Until then it is whatever kzalloc() left in vb: lockdep complains about the unregistered lock class, and wakeup_signal_mask and processing_wakeup_event get updated from irq context while probe is still running. The rt_spin_lock() in the report is just spin_lock() on PREEMPT_RT; any PROVE_LOCKING build takes the same path. stop_update_lock(), which the same callback also acquires, is already initialized before init_vqs(); do the same for wakeup_lock. Fixes:c578123e63("virtio_balloon: Treat stats requests as wakeup events") Reported-by: syzbot+13df72e0dc4be5c62215@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=13df72e0dc4be5c62215 Signed-off-by: Mingbing Zhai <zhaimingbing@cmss.chinamobile.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-ID: <20261016025429.901-1-zhaimingbing@cmss.chinamobile.com>
This commit is contained in:
parent
7a2609bcb8
commit
161aa708b0
|
|
@ -942,6 +942,7 @@ static int virtballoon_probe(struct virtio_device *vdev)
|
|||
INIT_WORK(&vb->update_balloon_stats_work, update_balloon_stats_func);
|
||||
INIT_WORK(&vb->update_balloon_size_work, update_balloon_size_func);
|
||||
spin_lock_init(&vb->stop_update_lock);
|
||||
spin_lock_init(&vb->wakeup_lock);
|
||||
mutex_init(&vb->balloon_lock);
|
||||
init_waitqueue_head(&vb->acked);
|
||||
vb->vdev = vdev;
|
||||
|
|
@ -1049,8 +1050,6 @@ static int virtballoon_probe(struct virtio_device *vdev)
|
|||
goto out_unregister_oom;
|
||||
}
|
||||
|
||||
spin_lock_init(&vb->wakeup_lock);
|
||||
|
||||
/*
|
||||
* The virtio balloon itself can't wake up the device, but it is
|
||||
* responsible for processing wakeup events passed up from the transport
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user