vmm: config: Add DiskConfig check for device serial length #7124
Conversation
virtio-devices/src/block.rs
Outdated
| let mut s = Vec::from(s); | ||
| if s.len() > VIRTIO_BLK_ID_BYTES as usize { | ||
| s.truncate(VIRTIO_BLK_ID_BYTES as usize); | ||
| warn!("Serial truncated to {} bytes", VIRTIO_BLK_ID_BYTES); |
There was a problem hiding this comment.
Please clarify that it's the block device serial - warn!("Block device serial truncated to {} bytes", VIRTIO_BLK_ID_BYTES)
ljrcore
force-pushed
the
fix_blk_serial_len
branch
from
80c03ff to
48139a0
Compare
virtio-devices/src/block.rs
Outdated
| let serial = serial | ||
| .map(Vec::from) | ||
| .unwrap_or_else(|| build_serial(&disk_path)); | ||
| let serial = if let Some(s) = serial { |
There was a problem hiding this comment.
Looking at this PR again - I think the commit message is a bit confusing. Something like:
virtio-devices: block: Truncate device serial to maximum supported length
Truncate the device serial to the maximum supported length to ensure that it is correctly matched during guest boot disk discovery.
|
The other option would be to refuse to create the block device if the serial is too long? |
ljrcore
force-pushed
the
fix_blk_serial_len
branch
from
48139a0 to
e1d3a5b
Compare
If we decide to refuse to create the block device if the serial is too long, would it be better to do the check in DiskConfig? |
Yes - do you want to give it a go? |
virtio-devices/src/block.rs
Outdated
| .unwrap_or_else(|| build_serial(&disk_path)); | ||
| let serial = if let Some(s) = serial { | ||
| let mut s = Vec::from(s); | ||
| if s.len() > VIRTIO_BLK_ID_BYTES as usize { |
There was a problem hiding this comment.
May be we should not let user create the device, we are modifying the content provided by the user, Who knows user might use this value to track something?
Yes, I would love to and will update this PR. |
ljrcore
force-pushed
the
fix_blk_serial_len
branch
from
e1d3a5b to
c635c01
Compare
Signed-off-by: Jinrong Liang <[email protected]>
Signed-off-by: Jinrong Liang <[email protected]>
ljrcore
force-pushed
the
fix_blk_serial_len
branch
from
c635c01 to
7f49963
Compare
rbradford
left a comment
rbradford
left a comment
There was a problem hiding this comment.
Very happy with this version.
rbradford
changed the title
f151fdb
4 participants
When starting a VM with a disk serial specified, for example:
The VM fails to boot and the following log is observed:
This patch adds support for checking and truncating disk custom serial to avoid VM startup failures.