Skip to content

block/accounting: fix unlocked latency histogram reconfiguration races

Denis V. Lunev qemu-devel 2 versions – Applied

Status from this message: Thanks, applied to the block branch.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 of 3 patches 2 repliesApplied
  2. v13 patches 2 repliesSuperseded

Changes in v2 from the cover letter

* patch 1, 2: WITH_QEMU_LOCK_GUARD -> plain lock()/unlock(), pure additions, nothing reindented or moved
* patch 3: writer thread now also calls block_latency_histograms_clear(), the other function patch 1 fixes
* patch 2: take stats->lock for bdrv_query_blk_stats()'s whole call instead of per-section, since the interval loop's timed_average_min/max/avg() calls race timed_average_account() the same way the already-locked fields did; block_acct_queue_depth() now requires the caller to hold the lock instead of taking it itself, since bdrv_query_blk_stats() is its only caller

2 of 3 patches are in this archive. The cover letter announces 3.

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/3block/accounting: take stats->lock in latency histogram settersblock/accounting.c+8 -00 replies
3/3tests/unit: add reproducer for BlockAcctStats histogram locking racetests/unit/meson.build tests/unit/test-block-accounting.c+116 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/3] block/accounting: fix unlocked latency histogram reconfiguration races

block_latency_histogram_set() and block_latency_histograms_clear() replace BlockLatencyHistogram's nbins/boundaries/bins without taking stats->lock, while block_account_one_io() reads those same fields under that lock from whatever iothread completes the I/O. A histogram reconfiguration (block-latency-histogram-set QMP command, monitor thread) racing an in-flight completion can therefore observe those fields torn, hitting assert(pos != NULL) in block_latency_histogram_account(), or corrupting the heap outright. This showed up as a qemu-kvm SIGABRT on a customer's virtio-blk guest.

Regression test is added for illustrative purpose but I am unsure that it is viable long term. Feel free to drop.

v1 -> v2
* patch 1, 2: WITH_QEMU_LOCK_GUARD -> plain lock()/unlock(), pure additions, nothing reindented or moved
* patch 3: writer thread now also calls block_latency_histograms_clear(), the other function patch 1 fixes
* patch 2: take stats->lock for bdrv_query_blk_stats()'s whole call instead of per-section, since the interval loop's timed_average_min/max/avg() calls race timed_average_account() the same way the already-locked fields did; block_acct_queue_depth() now requires the caller to hold the lock instead of taking it itself, since bdrv_query_blk_stats() is its only caller

CC Kevin Wolf <[email protected]>
CC Hanna Reitz <[email protected]>
CC Vladimir Sementsov-Ogievskiy <[email protected]>
CC Andrey Drobyshev <[email protected]>

Denis V. Lunev (3):
block/accounting: take stats->lock in latency histogram setters block/qapi: take stats->lock when reading BlockAcctStats for
query-blockstats
tests/unit: add reproducer for BlockAcctStats histogram locking race

 block/accounting.c                 |  11 ++-
 block/qapi.c                       |   3 +
 include/block/accounting.h         |   1 +
 tests/unit/meson.build             |   1 +
 tests/unit/test-block-accounting.c | 115 +++++++++++++++++++++++++++++
 5 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/test-block-accounting.c
Signature · 1 line
2.53.0