virtio: restore elem->in/out_sg after iov_discard_front/back()
Status from this message: Thanks, applied to my block tree:
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest3 patches 2 repliesApplied
- v13 patches 7 repliesSuperseded
Changes in v2 from the cover letter
* Add missing undo in virtio-blk write zeroes error path [Li Qiang]
Patches in v2 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | util/iov: add iov_discard_undo()include/ tests/ util/ | +234 | 0 replies | |
| 2/3 | virtio-blk: undo destructive iov_discard_*() operationshw/ include/ | +11 | 1 reply | |
| 3/3 | virtio-crypto: don't modify elem->in/out_sghw/ | +14 | 0 replies |
Reviews trailers per patch
All 3 patches have a Reviewed-by or Acked-by.
| Patch | Li Qiang |
|---|---|
| 1/3 | R-b |
| 2/3 | R-b |
| 3/3 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/3] virtio: restore elem->in/out_sg after iov_discard_front/back()
v2:
* Add missing undo in virtio-blk write zeroes error path [Li Qiang]
Both virtio-blk and virtio-crypto use destructive iov_discard_front/back() operations on elem->in/out_sg. virtqueue_push() calls dma_memory_unmap() on the modified iovec arrays. The memory addresses may not match those originally mapped with dma_memory_map().
This raises several issues:
1. MemoryRegion references can be leaked.
2. Dirty memory may not be tracked.
3. The non-RAM bounce buffer can be leaked.
This patch series solves the issue in two ways:
1. virtio-blk uses a new iov_discard_undo() API to restore iovec arrays.
2. virtio-crypto uses g_memdup() to avoid modifying the original iovec arrays.
The g_memdup() approach is slower than iov_discard_undo() but less complex/fragile. I am less familiar with the virtio-crypto code and it uses more complex sequences of iov_discard_front/back() calls than virtio-blk. If anyone feels like optimizing virtio-crypto, please go ahead.
The virtio-blk bug was found by Alexander Bulekov's fuzzing effort. I found the virtio-crypto bug through code inspection.
Stefan Hajnoczi (3):
util/iov: add iov_discard_undo()
virtio-blk: undo destructive iov_discard_*() operations
virtio-crypto: don't modify elem->in/out_sg
include/hw/virtio/virtio-blk.h | 2 + include/qemu/iov.h | 23 +++++ hw/block/virtio-blk.c | 11 ++- hw/virtio/virtio-crypto.c | 17 +++- tests/test-iov.c | 165 +++++++++++++++++++++++++++++++++ util/iov.c | 50 +++++++++- 6 files changed, 259 insertions(+), 9 deletions(-)
Signature · 1 line
2.26.2