Skip to content

Commit fe1d79d

Browse files
davidhildenbrandmstsirkin
authored andcommitted
virtio-mem: remember usable region size
Let's remember the usable region size, which will be helpful in kdump mode next. Signed-off-by: David Hildenbrand <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent a940342 commit fe1d79d

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/virtio/virtio_mem.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ struct virtio_mem {
133133
uint64_t addr;
134134
/* Maximum region size in bytes. */
135135
uint64_t region_size;
136+
/* Usable region size in bytes. */
137+
uint64_t usable_region_size;
136138

137139
/* The parent resource for all memory added via this device. */
138140
struct resource *parent_resource;
@@ -2368,7 +2370,7 @@ static int virtio_mem_cleanup_pending_mb(struct virtio_mem *vm)
23682370
static void virtio_mem_refresh_config(struct virtio_mem *vm)
23692371
{
23702372
const struct range pluggable_range = mhp_get_pluggable_range(true);
2371-
uint64_t new_plugged_size, usable_region_size, end_addr;
2373+
uint64_t new_plugged_size, end_addr;
23722374

23732375
/* the plugged_size is just a reflection of what _we_ did previously */
23742376
virtio_cread_le(vm->vdev, struct virtio_mem_config, plugged_size,
@@ -2378,8 +2380,8 @@ static void virtio_mem_refresh_config(struct virtio_mem *vm)
23782380

23792381
/* calculate the last usable memory block id */
23802382
virtio_cread_le(vm->vdev, struct virtio_mem_config,
2381-
usable_region_size, &usable_region_size);
2382-
end_addr = min(vm->addr + usable_region_size - 1,
2383+
usable_region_size, &vm->usable_region_size);
2384+
end_addr = min(vm->addr + vm->usable_region_size - 1,
23832385
pluggable_range.end);
23842386

23852387
if (vm->in_sbm) {
@@ -2763,6 +2765,8 @@ static int virtio_mem_init(struct virtio_mem *vm)
27632765
virtio_cread_le(vm->vdev, struct virtio_mem_config, addr, &vm->addr);
27642766
virtio_cread_le(vm->vdev, struct virtio_mem_config, region_size,
27652767
&vm->region_size);
2768+
virtio_cread_le(vm->vdev, struct virtio_mem_config, usable_region_size,
2769+
&vm->usable_region_size);
27662770

27672771
/* Determine the nid for the device based on the lowest address. */
27682772
if (vm->nid == NUMA_NO_NODE)

0 commit comments

Comments
 (0)