block: fix blk_aio_*() segfault when blk->root == NULL
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
- v3 Latest5 patches 5 repliesApplied
- v24 patches 9 repliesSuperseded
- v13 patches 9 repliesSuperseded
Changes in v3 from the cover letter
* Add Patch 1 to rename aio_context_in_iothread() to in_aio_context_home_thread() [Eric]
Patches in v3 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | aio: rename aio_context_in_iothread() to in_aio_context_home_thread()include/ include/ | +6 | 1 reply | |
| 2/5 | block: extract AIO_WAIT_WHILE() from BlockDriverStateblock.c block/ include/ +4 more | +174 | 1 reply | |
| 3/5 | block: add BlockBackend->in_flight counterblock.c block/ | +54 | 0 replies | |
| 4/5 | block: test blk_aio_flush() with blk->root == NULLtests/ tests/ | +84 | 0 replies | |
| 5/5 | Revert "IDE: Do not flush empty CDROM drives"hw/ | +1 | 0 replies |
Reviews trailers per patch
4 of 5 patches have a Reviewed-by or Acked-by.
| Patch | Eric Blake |
|---|---|
| 1/5 | R-b |
| 2/5 | R-b |
| 3/5 | |
| 4/5 | R-b |
| 5/5 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [Qemu-devel] [PATCH v3 0/5] block: fix blk_aio_*() segfault when blk->root == NULL
v3:
* Add Patch 1 to rename aio_context_in_iothread() to in_aio_context_home_thread() [Eric]
v2:
* Introduce AIO_WAIT_WHILE() since aio_poll(ctx, true) is not allowed [Paolo]
Using bdrv_inc_in_flight(blk_bs(blk)) doesn't work since BlockBackend->root may be NULL.
This patch series solves the issue by adding an BlockBackend->in_flight counter so requests can be tracked even when there is no BlockDriverState.
This should fix the IDE and virtio-blk segfaults that have been encountered when there is no BlockDriverState.
The patch is based on work by Kevin Wolf.
Kevin Wolf (1):
block: test blk_aio_flush() with blk->root == NULL
Stefan Hajnoczi (4):
aio: rename aio_context_in_iothread() to in_aio_context_home_thread()
block: extract AIO_WAIT_WHILE() from BlockDriverState
block: add BlockBackend->in_flight counter
Revert "IDE: Do not flush empty CDROM drives"
tests/Makefile.include | 2 + util/Makefile.objs | 2 +- include/block/aio-wait.h | 116 +++++++++++++++++++++++++++++++++++++++++++++ include/block/aio.h | 7 ++- include/block/block.h | 40 +++------------- include/block/block_int.h | 7 ++- block.c | 7 ++- block/block-backend.c | 60 ++++++++++++++++++++--- block/io.c | 10 +--- hw/ide/core.c | 10 +--- tests/test-block-backend.c | 82 ++++++++++++++++++++++++++++++++ util/aio-wait.c | 40 ++++++++++++++++ 12 files changed, 318 insertions(+), 65 deletions(-) create mode 100644 include/block/aio-wait.h create mode 100644 tests/test-block-backend.c create mode 100644 util/aio-wait.c
Signature · 1 line
2.14.3