#include <palacios/vmm.h>
#include <palacios/vmm_dev_mgr.h>
-#include <devices/lnx_virtio_blk.h>
#include <palacios/vmm_sym_swap.h>
+#include <palacios/vm_guest.h>
-#define SWAP_CAPACITY (150 * 1024 * 1024)
#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
#include <palacios/vmm_telemetry.h>
struct swap_state {
int active;
- struct vm_device * blk_dev;
-
uint_t swapped_pages;
uint_t unswapped_pages;
uint8_t * swap_space;
addr_t swap_base_addr;
+ struct guest_info * vm;
+
uint8_t usage_map[0]; // This must be the last structure member
};
static inline void * get_swap_entry(uint32_t pg_index, void * private_data) {
- struct vm_device * dev = (struct vm_device *)private_data;
- struct swap_state * swap = (struct swap_state *)(dev->private_data);
+ struct swap_state * swap = (struct swap_state *)private_data;
void * pg_addr = NULL;
// int ret = 0;
static uint64_t swap_get_capacity(void * private_data) {
- struct vm_device * dev = (struct vm_device *)private_data;
- struct swap_state * swap = (struct swap_state *)(dev->private_data);
+ struct swap_state * swap = (struct swap_state *)private_data;
PrintDebug("SymSwap: Getting Capacity %d\n", (uint32_t)(swap->capacity));
- return swap->capacity / HD_SECTOR_SIZE;
+ return swap->capacity;
}
-static int swap_read(uint8_t * buf, int sector_count, uint64_t lba, void * private_data) {
- struct vm_device * dev = (struct vm_device *)private_data;
- struct swap_state * swap = (struct swap_state *)(dev->private_data);
- uint32_t offset = lba * HD_SECTOR_SIZE;
- uint32_t length = sector_count * HD_SECTOR_SIZE;
+static int swap_read(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) {
+ struct swap_state * swap = (struct swap_state *)private_data;
+ uint32_t offset = lba;
+ uint32_t length = num_bytes;
- /*
- PrintDebug("SymSwap: Reading %d bytes to %p from %p\n", length,
- buf, (void *)(swap->swap_space + offset));
- */
+
+ PrintDebug("SymSwap: Reading %d bytes to %p from %p\n", length,
+ buf, (void *)(swap->swap_space + offset));
+
if (length % 4096) {
PrintError("Swapping in length that is not a page multiple\n");
for (i = 0; i < length; i += 4096) {
set_index_usage(swap, get_swap_index_from_offset(offset + i), 0);
- v3_swap_in_notify(dev->vm, get_swap_index_from_offset(offset + i), swap->hdr->info.type);
+ v3_swap_in_notify(swap->vm, get_swap_index_from_offset(offset + i), swap->hdr->info.type);
}
}
-static int swap_write(uint8_t * buf, int sector_count, uint64_t lba, void * private_data) {
- struct vm_device * dev = (struct vm_device *)private_data;
- struct swap_state * swap = (struct swap_state *)(dev->private_data);
- uint32_t offset = lba * HD_SECTOR_SIZE;
- uint32_t length = sector_count * HD_SECTOR_SIZE;
+static int swap_write(uint8_t * buf, uint64_t lba, uint64_t num_bytes, void * private_data) {
+ struct swap_state * swap = (struct swap_state *)private_data;
+ uint32_t offset = lba;
+ uint32_t length = num_bytes;
/*
PrintDebug("SymSwap: Writing %d bytes to %p from %p\n", length,
PrintDebug("Swap Type=%d (magic=%s)\n", swap->hdr->info.type, swap->hdr->magic.magic);
- if (v3_register_swap_disk(dev->vm, swap->hdr->info.type, &swap_ops, dev) == -1) {
+ if (v3_register_swap_disk(swap->vm, swap->hdr->info.type, &swap_ops, swap) == -1) {
PrintError("Error registering symbiotic swap disk\n");
return -1;
}
}
-static struct v3_hd_ops hd_ops = {
+static struct v3_dev_blk_ops blk_ops = {
.read = swap_read,
.write = swap_write,
.get_capacity = swap_get_capacity,
-static int swap_init(struct guest_info * vm, void * cfg_data) {
+static int swap_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
struct swap_state * swap = NULL;
- struct vm_device * virtio_blk = v3_find_dev(vm, (char *)cfg_data);
+ v3_cfg_tree_t * frontend_cfg = v3_cfg_subtree(cfg, "frontend");
+ uint32_t capacity = atoi(v3_cfg_val(cfg, "size")) * 1024 * 1024;
+ char * name = v3_cfg_val(cfg, "name");
- if (!virtio_blk) {
- PrintError("could not find Virtio backend\n");
+ if (!frontend_cfg) {
+ PrintError("Initializing sym swap without a frontend device\n");
return -1;
}
- PrintDebug("Creating Swap Device\n");
+ PrintDebug("Creating Swap Device (size=%dMB)\n", capacity / (1024 * 1024));
- if (virtio_blk == NULL) {
- PrintError("Swap device requires a virtio block device\n");
- return -1;
- }
+ swap = (struct swap_state *)V3_Malloc(sizeof(struct swap_state) + ((capacity / 4096) / 8));
- swap = (struct swap_state *)V3_Malloc(sizeof(struct swap_state) + ((SWAP_CAPACITY / 4096) / 8));
+ swap->vm = vm;
- swap->blk_dev = virtio_blk;
- swap->capacity = SWAP_CAPACITY;
+ swap->capacity = capacity;
swap->swapped_pages = 0;
swap->unswapped_pages = 0;
swap->active = 0;
swap->hdr = (union swap_header *)swap;
-
swap->swap_base_addr = (addr_t)V3_AllocPages(swap->capacity / 4096);
swap->swap_space = (uint8_t *)V3_VAddr((void *)(swap->swap_base_addr));
- memset(swap->swap_space, 0, SWAP_CAPACITY);
+ memset(swap->swap_space, 0, swap->capacity);
- memset(swap->usage_map, 0, ((SWAP_CAPACITY / 4096) / 8));
+ memset(swap->usage_map, 0, ((swap->capacity / 4096) / 8));
- struct vm_device * dev = v3_allocate_device("SYM_SWAP", &dev_ops, swap);
+ struct vm_device * dev = v3_allocate_device(name, &dev_ops, swap);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", "SYM_SWAP");
+ PrintError("Could not attach device %s\n", name);
return -1;
}
-
- v3_virtio_register_harddisk(virtio_blk, &hd_ops, dev);
+ if (v3_dev_connect_blk(vm, v3_cfg_val(frontend_cfg, "tag"),
+ &blk_ops, frontend_cfg, swap) == -1) {
+ PrintError("Could not connect %s to frontend %s\n",
+ name, v3_cfg_val(frontend_cfg, "tag"));
+ return -1;
+ }
#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
- if (vm->enable_telemetry) {
+ if (vm->enable_telemetry == 1) {
v3_add_telemetry_cb(vm, telemetry_cb, dev);
}
#endif
