]> www.infradead.org Git - users/dwmw2/qemu.git/commit
icount: Take iothread lock when running QEMU timers
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 9 Aug 2022 09:55:14 +0000 (10:55 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 9 Aug 2022 09:55:14 +0000 (10:55 +0100)
commitc7f26ded6d5065e4116f630f6a490b55f6c5f58e
treefd61cf34b851f0634b7779c7d9e564f41f8b9069
parentca5f3d4df1b47d7f66a109cdb504e83dfd7ec433
icount: Take iothread lock when running QEMU timers

The function icount_prepare_for_run() is called with the iothread
unlocked, but it can call icount_notify_aio_contexts() which will
run qemu timer handlers. Those are supposed to be run only with
the iothread lock held, so take the lock while we do that.

Since icount mode runs everything on a single thread anyway,
not holding the lock is likely mostly not going to introduce
races, but it can cause us to trip over assertions that we
do hold the lock, such as the one reported in issue 1130.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1130
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Message-id: 20220801164527.3134765-1-peter.maydell@linaro.org
accel/tcg/tcg-accel-ops-icount.c