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

libvhost-user: handle removal of identical regions

Browse Source 
Today if QEMU (or any other VMM) has sent multiple copies of the same
region to a libvhost-user based backend and then attempts to remove the
region, only one instance of the region will be removed, leaving stale
copies of the region in dev->regions[].

This change resolves this by having vu_rem_mem_reg() iterate through all
regions in dev->regions[] and delete all matching regions.

Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <20220117041050.19718-7-raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
Raphael Norwitz 2022-01-17 04:12:35 +00:00 committed by Michael S. Tsirkin
parent b906a23c33
commit 4fafedc9da
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
subprojects/libvhost-user/libvhost-user.c
View File

@ -821,6 +821,7 @@ static bool
vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
VhostUserMemoryRegion m = vmsg->payload.memreg.region, *msg_region = &m; VhostUserMemoryRegion m = vmsg->payload.memreg.region, *msg_region = &m;
int i; int i;
bool found = false;
if (vmsg->fd_num != 1) { if (vmsg->fd_num != 1) {
vmsg_close_fds(vmsg); vmsg_close_fds(vmsg);
@ -856,21 +857,24 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
munmap(m, r->size + r->mmap_offset); munmap(m, r->size + r->mmap_offset);
} }
break;
}
}
if (i < dev->nregions) {
/* /*
* Shift all affected entries by 1 to close the hole at index i and * Shift all affected entries by 1 to close the hole at index i and
* zero out the last entry. * zero out the last entry.
*/ */
memmove(dev->regions + i, dev->regions + i + 1, memmove(dev->regions + i, dev->regions + i + 1,
sizeof(VuDevRegion) * (dev->nregions - i - 1)); sizeof(VuDevRegion) * (dev->nregions - i - 1));
memset(dev->regions + dev->nregions - 1, 0, memset(dev->regions + dev->nregions - 1, 0, sizeof(VuDevRegion));
sizeof(VuDevRegion));
DPRINT("Successfully removed a region\n"); DPRINT("Successfully removed a region\n");
dev->nregions--; dev->nregions--;
i--;
found = true;
/* Continue the search for eventual duplicates. */
}
}
if (found) {
vmsg_set_reply_u64(vmsg, 0); vmsg_set_reply_u64(vmsg, 0);
} else { } else {
vu_panic(dev, "Specified region not found\n"); vu_panic(dev, "Specified region not found\n");