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: Add UnsupportedFlags error variant for flag validation

Browse Source 
Introduce ExecuteError::UnsupportedFlags to carry both the
request type and the rejected flags value, replacing the
generic ExecuteError::Unsupported at discard and write zeroes
flag validation sites. This provides structured context for
debugging without changing the returned VIRTIO_BLK_S_UNSUPP
status.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
This commit is contained in:
Anatol Belski
2026-03-31 22:50:25 +02:00
committed by Bo Chen
parent e4e2a37afa
commit 9f980969fc
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/src/lib.rs
+11 -2
View File
@@ -169,6 +169,8 @@ pub enum ExecuteError {
WriteAll(#[source] io::Error), WriteAll(#[source] io::Error),
#[error("Unsupported request: {0}")] #[error("Unsupported request: {0}")]
Unsupported(u32), Unsupported(u32),
#[error("Unsupported flags {flags:#x} for request type {request_type}")]
UnsupportedFlags { request_type: u32, flags: u32 },
#[error("Failed to submit io uring")] #[error("Failed to submit io uring")]
SubmitIoUring(#[source] io::Error), SubmitIoUring(#[source] io::Error),
#[error("Failed to get guest address")] #[error("Failed to get guest address")]
@@ -199,6 +201,7 @@ impl ExecuteError {
ExecuteError::Write(_) => VIRTIO_BLK_S_IOERR, ExecuteError::Write(_) => VIRTIO_BLK_S_IOERR,
ExecuteError::WriteAll(_) => VIRTIO_BLK_S_IOERR, ExecuteError::WriteAll(_) => VIRTIO_BLK_S_IOERR,
ExecuteError::Unsupported(_) => VIRTIO_BLK_S_UNSUPP, ExecuteError::Unsupported(_) => VIRTIO_BLK_S_UNSUPP,
ExecuteError::UnsupportedFlags { .. } => VIRTIO_BLK_S_UNSUPP,
ExecuteError::SubmitIoUring(_) => VIRTIO_BLK_S_IOERR, ExecuteError::SubmitIoUring(_) => VIRTIO_BLK_S_IOERR,
ExecuteError::GetHostAddress(_) => VIRTIO_BLK_S_IOERR, ExecuteError::GetHostAddress(_) => VIRTIO_BLK_S_IOERR,
ExecuteError::AsyncRead(_) => VIRTIO_BLK_S_IOERR, ExecuteError::AsyncRead(_) => VIRTIO_BLK_S_IOERR,
@@ -630,7 +633,10 @@ impl Request {
// Per virtio spec v1.2 reject discard if any flag is set, including unmap. // Per virtio spec v1.2 reject discard if any flag is set, including unmap.
if discard_flags != 0 { if discard_flags != 0 {
warn!("Unsupported flags {discard_flags:#x} in discard request"); warn!("Unsupported flags {discard_flags:#x} in discard request");
return Err(ExecuteError::Unsupported(VIRTIO_BLK_T_DISCARD)); return Err(ExecuteError::UnsupportedFlags {
request_type: VIRTIO_BLK_T_DISCARD,
flags: discard_flags,
});
} }
let discard_sector = u64::from_le_bytes(discard_sector); let discard_sector = u64::from_le_bytes(discard_sector);
@@ -696,7 +702,10 @@ impl Request {
// Per virtio spec v1.2 reject write zeroes if any unknown flag is set. // Per virtio spec v1.2 reject write zeroes if any unknown flag is set.
if (wz_flags & !VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP) != 0 { if (wz_flags & !VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP) != 0 {
warn!("Unsupported flags {wz_flags:#x} in write zeroes request"); warn!("Unsupported flags {wz_flags:#x} in write zeroes request");
return Err(ExecuteError::Unsupported(VIRTIO_BLK_T_WRITE_ZEROES)); return Err(ExecuteError::UnsupportedFlags {
request_type: VIRTIO_BLK_T_WRITE_ZEROES,
flags: wz_flags,
});
} }
let wz_offset = wz_sector * SECTOR_SIZE; let wz_offset = wz_sector * SECTOR_SIZE;