kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: Propagate QCOW dealloc action errors to the guest

Browse Source 
apply_dealloc_action() discarded the result of the host punch-hole
and write-zeroes operations, so a guest DISCARD or WRITE ZEROES
request completed successfully even when the host operation failed.

Return the error to the per-queue engine and complete the request
with an error instead, in both the synchronous and io_uring QCOW
engines. A failure does not abort the remaining actions of the
request: they are still applied, and the first error is reported.

Signed-off-by: doge <me@crackerben.com>
This commit is contained in:
doge
2026-07-23 00:26:01 +08:00
committed by Rob Bradford
parent d3d83dcbd8
commit e737d61a0a
2 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
block/src/formats/qcow/engine_sync.rs
View File

@@ -5,6 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
use std::cmp::min;
use std::io;
use std::os::unix::fs::FileExt;
use std::sync::Arc;
@@ -50,23 +51,20 @@ impl QcowSync {
}
}
fn apply_dealloc_action(&mut self, action: &DeallocAction) {
fn apply_dealloc_action(&mut self, action: &DeallocAction) -> io::Result<()> {
match action {
DeallocAction::PunchHole {
host_offset,
length,
} => {
let _ = self.data_file.file_mut().punch_hole(*host_offset, *length);
}
} => self.data_file.file_mut().punch_hole(*host_offset, *length),
DeallocAction::WriteZeroes {
host_offset,
length,
} => {
let _ = self
.data_file
.file_mut()
.write_zeroes_at(*host_offset, *length);
}
} => self
.data_file
.file_mut()
.write_zeroes_at(*host_offset, *length)
.map(|_| ()),
}
}
@@ -236,13 +234,19 @@ impl AsyncIo for QcowSync {
false,
self.backing_file.as_deref(),
)
.and_then(|actions| {
let mut first_error = None;
for action in &actions {
if let Err(e) = self.apply_dealloc_action(action) {
first_error.get_or_insert(e);
}
}
first_error.map_or(Ok(()), Err)
})
.map_err(AsyncIoError::PunchHole);
match result {
Ok(actions) => {
for action in &actions {
self.apply_dealloc_action(action);
}
Ok(()) => {
self.completions
.complete(AsyncIoCompletion::new(user_data, 0, None));
Ok(())
@@ -270,13 +274,19 @@ impl AsyncIo for QcowSync {
true,
self.backing_file.as_deref(),
)
.and_then(|actions| {
let mut first_error = None;
for action in &actions {
if let Err(e) = self.apply_dealloc_action(action) {
first_error.get_or_insert(e);
}
}
first_error.map_or(Ok(()), Err)
})
.map_err(AsyncIoError::WriteZeroes);
match result {
Ok(actions) => {
for action in &actions {
self.apply_dealloc_action(action);
}
Ok(()) => {
self.completions
.complete(AsyncIoCompletion::new(user_data, 0, None));
Ok(())

45
block/src/formats/qcow/engine_uring.rs
View File

@@ -66,23 +66,20 @@ impl QcowAsync {
})
}
fn apply_dealloc_action(&mut self, action: &DeallocAction) {
fn apply_dealloc_action(&mut self, action: &DeallocAction) -> io::Result<()> {
match action {
DeallocAction::PunchHole {
host_offset,
length,
} => {
let _ = self.data_file.file_mut().punch_hole(*host_offset, *length);
}
} => self.data_file.file_mut().punch_hole(*host_offset, *length),
DeallocAction::WriteZeroes {
host_offset,
length,
} => {
let _ = self
.data_file
.file_mut()
.write_zeroes_at(*host_offset, *length);
}
} => self
.data_file
.file_mut()
.write_zeroes_at(*host_offset, *length)
.map(|_| ()),
}
}
@@ -202,13 +199,19 @@ impl AsyncIo for QcowAsync {
false,
self.backing_file.as_deref(),
)
.and_then(|actions| {
let mut first_error = None;
for action in &actions {
if let Err(e) = self.apply_dealloc_action(action) {
first_error.get_or_insert(e);
}
}
first_error.map_or(Ok(()), Err)
})
.map_err(AsyncIoError::PunchHole);
match result {
Ok(actions) => {
for action in &actions {
self.apply_dealloc_action(action);
}
Ok(()) => {
self.data_io
.inject_completion(AsyncIoCompletion::new(user_data, 0, None));
Ok(())
@@ -236,13 +239,19 @@ impl AsyncIo for QcowAsync {
true,
self.backing_file.as_deref(),
)
.and_then(|actions| {
let mut first_error = None;
for action in &actions {
if let Err(e) = self.apply_dealloc_action(action) {
first_error.get_or_insert(e);
}
}
first_error.map_or(Ok(()), Err)
})
.map_err(AsyncIoError::WriteZeroes);
match result {
Ok(actions) => {
for action in &actions {
self.apply_dealloc_action(action);
}
Ok(()) => {
self.data_io
.inject_completion(AsyncIoCompletion::new(user_data, 0, None));
Ok(())