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

virtio-devices: mem: Use usize for block counts in internal bitmap APIs

Browse Source 
is_range_state() and set_range() took nb_blocks as u16 to match the
wire format, but unplug_all() computed the total block count from
region_size / block_size and cast to u16, silently truncating for
regions larger than 128 GiB. Widen the internal parameter to usize
so unplug_all() resets the full bitmap.

Signed-off-by: Rob Bradford <rbradford@meta.com>
Assisted-by: Claude:claude-opus-4-6
This commit is contained in:
Rob Bradford
2026-05-06 14:18:16 +01:00
parent 1dd588fa6d
commit dfee31a84c
1 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
virtio-devices/src/mem.rs
View File

@@ -347,13 +347,8 @@ impl BlocksState {
}
}
fn is_range_state(&self, first_block_index: usize, nb_blocks: u16, plug: bool) -> bool {
for state in self
.bitmap
.iter()
.skip(first_block_index)
.take(nb_blocks as usize)
{
fn is_range_state(&self, first_block_index: usize, nb_blocks: usize, plug: bool) -> bool {
for state in self.bitmap.iter().skip(first_block_index).take(nb_blocks) {
if *state != plug {
return false;
}
@@ -361,12 +356,12 @@ impl BlocksState {
true
}
fn set_range(&mut self, first_block_index: usize, nb_blocks: u16, plug: bool) {
fn set_range(&mut self, first_block_index: usize, nb_blocks: usize, plug: bool) {
for state in self
.bitmap
.iter_mut()
.skip(first_block_index)
.take(nb_blocks as usize)
.take(nb_blocks)
{
*state = plug;
}
@@ -509,12 +504,11 @@ impl MemEpollHandler {
let offset = addr - config.addr;
let first_block_index = (offset / config.block_size) as usize;
if !self
.blocks_state
.lock()
.unwrap()
.is_range_state(first_block_index, nb_blocks, !plug)
{
if !self.blocks_state.lock().unwrap().is_range_state(
first_block_index,
nb_blocks as usize,
!plug,
) {
return VIRTIO_MEM_RESP_ERROR;
}
@@ -526,7 +520,7 @@ impl MemEpollHandler {
self.blocks_state
.lock()
.unwrap()
.set_range(first_block_index, nb_blocks, plug);
.set_range(first_block_index, nb_blocks as usize, plug);
let handlers = self.dma_mapping_handlers.lock().unwrap();
if plug {
@@ -588,7 +582,7 @@ impl MemEpollHandler {
self.blocks_state.lock().unwrap().set_range(
0,
(config.region_size / config.block_size) as u16,
(config.region_size / config.block_size) as usize,
false,
);
@@ -607,23 +601,21 @@ impl MemEpollHandler {
let offset = addr - config.addr;
let first_block_index = (offset / config.block_size) as usize;
let resp_state =
if self
.blocks_state
.lock()
.unwrap()
.is_range_state(first_block_index, nb_blocks, true)
{
VIRTIO_MEM_STATE_PLUGGED
} else if self.blocks_state.lock().unwrap().is_range_state(
first_block_index,
nb_blocks,
false,
) {
VIRTIO_MEM_STATE_UNPLUGGED
} else {
VIRTIO_MEM_STATE_MIXED
};
let resp_state = if self.blocks_state.lock().unwrap().is_range_state(
first_block_index,
nb_blocks as usize,
true,
) {
VIRTIO_MEM_STATE_PLUGGED
} else if self.blocks_state.lock().unwrap().is_range_state(
first_block_index,
nb_blocks as usize,
false,
) {
VIRTIO_MEM_STATE_UNPLUGGED
} else {
VIRTIO_MEM_STATE_MIXED
};
(VIRTIO_MEM_RESP_ACK, resp_state)
}