mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vhost: Simplify ring verification checks

Browse Source 
vhost_verify_ring_mappings() were used to verify that
rings are still accessible and related memory hasn't
been moved after flatview is updated.

It was doing checks by mapping ring's GPA+len and
checking that HVA hadn't changed with new memory map.
To avoid maybe expensive mapping call, we were
identifying address range that changed and were doing
mapping only if ring was in changed range.

However it's not neccessary to perform ring's GPA
mapping as we already have its current HVA and all
we need is to verify that ring's GPA translates to
the same HVA in updated flatview.

This will allow the following patches to simplify the range
comparison that was previously needed to avoid expensive
verify_ring_mapping calls.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
with modifications by:
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2018-01-19 10:39:19 +00:00 committed by Michael S. Tsirkin
parent c44317efec
commit 0ca1fd2d68
1 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
hw/virtio/vhost.c
View File

@ -455,35 +455,37 @@ static void vhost_memory_unmap(struct vhost_dev *dev, void *buffer,
} }
} }
static int vhost_verify_ring_part_mapping(struct vhost_dev *dev, static int vhost_verify_ring_part_mapping(void *ring_hva,
void *part, uint64_t ring_gpa,
uint64_t part_addr, uint64_t ring_size,
uint64_t part_size, void *reg_hva,
uint64_t start_addr, uint64_t reg_gpa,
uint64_t size) uint64_t reg_size)
{ {
hwaddr l; uint64_t hva_ring_offset;
void *p; uint64_t ring_last = range_get_last(ring_gpa, ring_size);
int r = 0; uint64_t reg_last = range_get_last(reg_gpa, reg_size);
if (!ranges_overlap(start_addr, size, part_addr, part_size)) { if (ring_last < reg_gpa || ring_gpa > reg_last) {
return 0; return 0;
} }
l = part_size; /* check that whole ring's is mapped */
p = vhost_memory_map(dev, part_addr, &l, 1); if (ring_last > reg_last) {
if (!p || l != part_size) { return -ENOMEM;
r = -ENOMEM;
} }
if (p != part) { /* check that ring's MemoryRegion wasn't replaced */
r = -EBUSY; hva_ring_offset = ring_gpa - reg_gpa;
if (ring_hva != reg_hva + hva_ring_offset) {
return -EBUSY;
} }
vhost_memory_unmap(dev, p, l, 0, 0);
return r; return 0;
} }
static int vhost_verify_ring_mappings(struct vhost_dev *dev, static int vhost_verify_ring_mappings(struct vhost_dev *dev,
uint64_t start_addr, void *reg_hva,
uint64_t size) uint64_t reg_gpa,
uint64_t reg_size)
{ {
int i, j; int i, j;
int r = 0; int r = 0;
@ -497,22 +499,25 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
struct vhost_virtqueue *vq = dev->vqs + i; struct vhost_virtqueue *vq = dev->vqs + i;
j = 0; j = 0;
r = vhost_verify_ring_part_mapping(dev, vq->desc, vq->desc_phys, r = vhost_verify_ring_part_mapping(
vq->desc_size, start_addr, size); vq->desc, vq->desc_phys, vq->desc_size,
reg_hva, reg_gpa, reg_size);
if (r) { if (r) {
break; break;
} }
j++; j++;
r = vhost_verify_ring_part_mapping(dev, vq->avail, vq->avail_phys, r = vhost_verify_ring_part_mapping(
vq->avail_size, start_addr, size); vq->desc, vq->desc_phys, vq->desc_size,
reg_hva, reg_gpa, reg_size);
if (r) { if (r) {
break; break;
} }
j++; j++;
r = vhost_verify_ring_part_mapping(dev, vq->used, vq->used_phys, r = vhost_verify_ring_part_mapping(
vq->used_size, start_addr, size); vq->desc, vq->desc_phys, vq->desc_size,
reg_hva, reg_gpa, reg_size);
if (r) { if (r) {
break; break;
} }
@ -635,13 +640,11 @@ static void vhost_commit(MemoryListener *listener)
{ {
struct vhost_dev *dev = container_of(listener, struct vhost_dev, struct vhost_dev *dev = container_of(listener, struct vhost_dev,
memory_listener); memory_listener);
hwaddr start_addr = 0;
ram_addr_t size = 0;
MemoryRegionSection *old_sections; MemoryRegionSection *old_sections;
int n_old_sections; int n_old_sections;
uint64_t log_size; uint64_t log_size;
int r; int r;
int i;
old_sections = dev->mem_sections; old_sections = dev->mem_sections;
n_old_sections = dev->n_mem_sections; n_old_sections = dev->n_mem_sections;
@ -658,12 +661,14 @@ static void vhost_commit(MemoryListener *listener)
goto out; goto out;
} }
if (dev->started) { for (i = 0; i < dev->mem->nregions; i++) {
start_addr = dev->mem_changed_start_addr; if (vhost_verify_ring_mappings(dev,
size = dev->mem_changed_end_addr - dev->mem_changed_start_addr + 1; (void *)(uintptr_t)dev->mem->regions[i].userspace_addr,
dev->mem->regions[i].guest_phys_addr,
r = vhost_verify_ring_mappings(dev, start_addr, size); dev->mem->regions[i].memory_size)) {
assert(r >= 0); error_report("Verify ring failure on region %d", i);
abort();
}
} }
if (!dev->log_enabled) { if (!dev->log_enabled) {